From 93120db30ea3e87bf60caba56ec70d5c38bdb1e3 Mon Sep 17 00:00:00 2001
From: Dominique Marcadet <Dominique.Marcadet@centralesupelec.fr>
Date: Wed, 10 Jul 2019 09:18:01 +0200
Subject: [PATCH] apply formatter after code generation

---
 ...stractConductingEquipmentItemProvider.java |   86 +-
 .../AbstractDataAttributeItemProvider.java    |  469 ++-
 .../AbstractDataObjectItemProvider.java       |  165 +-
 .../AbstractEqFuncSubFuncItemProvider.java    |  114 +-
 .../provider/AccessControlItemProvider.java   |   35 +-
 .../scl/provider/AccessPointItemProvider.java |  333 +-
 .../scl/provider/AddressItemProvider.java     |   62 +-
 .../AgAuthenticationItemProvider.java         |  207 +-
 .../scl/provider/AgDATrgOpItemProvider.java   |  141 +-
 .../scl/provider/AgDescItemProvider.java      |   74 +-
 .../scl/provider/AgLDRefItemProvider.java     |  103 +-
 .../scl/provider/AgLNRefItemProvider.java     |  139 +-
 .../scl/provider/AgOptFieldsItemProvider.java |  331 +-
 .../scl/provider/AgSmvOptsItemProvider.java   |  299 +-
 .../scl/provider/AgVirtualItemProvider.java   |   75 +-
 ...ContentFromOtherNamespaceItemProvider.java |  143 +-
 .../scl/provider/AnyLNItemProvider.java       |  390 +-
 .../scl/provider/AssociationItemProvider.java |  326 +-
 .../provider/AuthenticationItemProvider.java  |  206 +-
 .../scl/provider/BDAItemProvider.java         |   34 +-
 .../scl/provider/BaseElementItemProvider.java |   86 +-
 .../scl/provider/BayItemProvider.java         |   89 +-
 .../BitRateInMbPerSecItemProvider.java        |  138 +-
 .../scl/provider/BitRateItemProvider.java     |   31 +-
 .../scl/provider/CertItemProvider.java        |  107 +-
 .../scl/provider/CertificateItemProvider.java |  145 +-
 .../scl/provider/ClientLNItemProvider.java    |  294 +-
 .../provider/ClientServicesItemProvider.java  |  527 ++-
 .../scl/provider/CommProtItemProvider.java    |   74 +-
 .../provider/CommunicationItemProvider.java   |   58 +-
 .../ConductingEquipmentItemProvider.java      |   99 +-
 .../scl/provider/ConfDataSetItemProvider.java |   31 +-
 .../scl/provider/ConfLNsItemProvider.java     |  106 +-
 .../scl/provider/ConfLdNameItemProvider.java  |   35 +-
 .../provider/ConfLogControlItemProvider.java  |   31 +-
 .../ConfReportControlItemProvider.java        |   31 +-
 .../scl/provider/ConfSGItemProvider.java      |   74 +-
 .../scl/provider/ConfSigRefItemProvider.java  |   31 +-
 .../scl/provider/ConnectedAPItemProvider.java |  225 +-
 .../ConnectivityNodeItemProvider.java         |  117 +-
 .../provider/ControlBlockItemProvider.java    |  161 +-
 .../scl/provider/ControlItemProvider.java     |  169 +-
 .../ControlWithIEDNameItemProvider.java       |  143 +-
 .../ControlWithTriggerOptItemProvider.java    |   99 +-
 .../scl/provider/DAIItemProvider.java         |  250 +-
 .../iec61850/scl/provider/DAItemProvider.java |  196 +-
 .../scl/provider/DATypeItemProvider.java      |  143 +-
 .../scl/provider/DOIItemProvider.java         |  198 +-
 .../iec61850/scl/provider/DOItemProvider.java |  134 +-
 .../scl/provider/DOTypeItemProvider.java      |  174 +-
 .../DataObjectDirectoryItemProvider.java      |   35 +-
 .../DataSetDirectoryItemProvider.java         |   35 +-
 .../scl/provider/DataSetItemProvider.java     |  129 +-
 .../DataTypeTemplatesItemProvider.java        |  102 +-
 .../DurationInMilliSecItemProvider.java       |  138 +-
 .../provider/DurationInSecItemProvider.java   |   31 +-
 .../provider/DynAssociationItemProvider.java  |   35 +-
 .../scl/provider/DynDataSetItemProvider.java  |   31 +-
 .../scl/provider/EnumTypeItemProvider.java    |   91 +-
 .../scl/provider/EnumValItemProvider.java     |  159 +-
 .../scl/provider/EqFunctionItemProvider.java  |   34 +-
 .../provider/EqSubFunctionItemProvider.java   |   34 +-
 .../EquipmentContainerItemProvider.java       |   77 +-
 .../scl/provider/EquipmentItemProvider.java   |   73 +-
 .../scl/provider/ExtRefItemProvider.java      |  739 ++--
 .../scl/provider/FCDAItemProvider.java        |  323 +-
 .../provider/FileHandlingItemProvider.java    |  138 +-
 .../scl/provider/FunctionItemProvider.java    |  125 +-
 .../scl/provider/GOOSEItemProvider.java       |  132 +-
 .../provider/GOOSESecurityItemProvider.java   |   34 +-
 .../scl/provider/GSEControlItemProvider.java  |  173 +-
 .../scl/provider/GSEDirItemProvider.java      |   35 +-
 .../scl/provider/GSEItemProvider.java         |   77 +-
 .../scl/provider/GSESettingsItemProvider.java |  163 +-
 .../scl/provider/GSSEItemProvider.java        |   31 +-
 ...GeneralEquipmentContainerItemProvider.java |   78 +-
 .../GeneralEquipmentItemProvider.java         |   99 +-
 .../scl/provider/GetCBValuesItemProvider.java |   35 +-
 .../GetDataObjectDefinitionItemProvider.java  |   35 +-
 .../provider/GetDataSetValueItemProvider.java |   35 +-
 .../provider/GetDirectoryItemProvider.java    |   35 +-
 .../scl/provider/HeaderItemProvider.java      |  238 +-
 .../scl/provider/HistoryItemProvider.java     |   62 +-
 .../scl/provider/HitemItemProvider.java       |  230 +-
 .../scl/provider/IDNamingItemProvider.java    |  104 +-
 .../scl/provider/IEDItemProvider.java         |  399 +-
 .../scl/provider/IEDNameItemProvider.java     |  324 +-
 .../scl/provider/InputsItemProvider.java      |   58 +-
 .../scl/provider/IssuerNameItemProvider.java  |   38 +-
 .../scl/provider/KDCItemProvider.java         |  137 +-
 .../scl/provider/LDeviceItemProvider.java     |  187 +-
 .../scl/provider/LN0ItemProvider.java         |   86 +-
 .../iec61850/scl/provider/LNItemProvider.java |   69 +-
 .../provider/LNodeContainerItemProvider.java  |   61 +-
 .../scl/provider/LNodeItemProvider.java       |  289 +-
 .../scl/provider/LNodeTypeItemProvider.java   |  193 +-
 .../scl/provider/LineItemProvider.java        |  187 +-
 .../scl/provider/LogControlItemProvider.java  |  357 +-
 .../scl/provider/LogItemProvider.java         |  102 +-
 .../scl/provider/LogSettingsItemProvider.java |  137 +-
 .../scl/provider/MaxTimeItemProvider.java     |   31 +-
 .../scl/provider/McSecurityItemProvider.java  |  104 +-
 .../scl/provider/MinTimeItemProvider.java     |   31 +-
 .../scl/provider/NamingItemProvider.java      |  103 +-
 .../provider/NeutralPointItemProvider.java    |   34 +-
 .../scl/provider/OptFieldsItemProvider.java   |  330 +-
 .../scl/provider/PAddrItemProvider.java       |  104 +-
 .../iec61850/scl/provider/PItemProvider.java  |   31 +-
 .../scl/provider/P_PhysConnItemProvider.java  |   31 +-
 .../scl/provider/PhysConnItemProvider.java    |   96 +-
 .../PowerSystemResourceItemProvider.java      |   34 +-
 .../PowerTransformerItemProvider.java         |  125 +-
 .../scl/provider/PrivateItemProvider.java     |  106 +-
 .../scl/provider/ProcessItemProvider.java     |  137 +-
 .../scl/provider/ProtNsItemProvider.java      |  105 +-
 .../scl/provider/ProtocolItemProvider.java    |   74 +-
 .../scl/provider/ReadWriteItemProvider.java   |   35 +-
 .../scl/provider/RedProtItemProvider.java     |  138 +-
 .../provider/ReportControlItemProvider.java   |  235 +-
 .../provider/ReportSettingsItemProvider.java  |  265 +-
 .../scl/provider/RptEnabledItemProvider.java  |   96 +-
 .../iec61850/scl/provider/SCLEditPlugin.java  |    5 +-
 .../scl/provider/SCLItemProvider.java         |  215 +-
 .../scl/provider/SDIItemProvider.java         |  228 +-
 .../scl/provider/SDOItemProvider.java         |  102 +-
 .../scl/provider/SGEditItemProvider.java      |   74 +-
 .../scl/provider/SMVItemProvider.java         |   34 +-
 .../scl/provider/SMVSecurityItemProvider.java |   34 +-
 .../scl/provider/SMVSettingsItemProvider.java |  351 +-
 .../scl/provider/SMVscItemProvider.java       |  168 +-
 .../SampledValueControlItemProvider.java      |  257 +-
 .../provider/SamplesPerSecItemProvider.java   |   70 +-
 .../SclItemProviderAdapterFactory.java        |  961 ++---
 .../scl/provider/SclObjectItemProvider.java   |  156 +-
 .../provider/SecPerSamplesItemProvider.java   |   70 +-
 .../scl/provider/ServerAtItemProvider.java    |  103 +-
 .../scl/provider/ServerItemProvider.java      |  122 +-
 .../ServiceConfReportControlItemProvider.java |  136 +-
 .../ServiceForConfDataSetItemProvider.java    |   70 +-
 .../provider/ServiceSettingsItemProvider.java |  109 +-
 ...ceWithMaxAndMaxAttributesItemProvider.java |   72 +-
 .../ServiceWithMaxAndModifyItemProvider.java  |   70 +-
 .../provider/ServiceWithMaxItemProvider.java  |   74 +-
 .../ServiceWithMaxNonZeroItemProvider.java    |   70 +-
 .../ServiceWithOptionalMaxItemProvider.java   |   70 +-
 .../provider/ServiceYesNoItemProvider.java    |   31 +-
 .../scl/provider/ServicesItemProvider.java    |  489 +--
 .../provider/SetDataSetValueItemProvider.java |   35 +-
 .../provider/SettingControlItemProvider.java  |  134 +-
 .../provider/SettingGroupsItemProvider.java   |   78 +-
 .../scl/provider/SmpRateItemProvider.java     |   70 +-
 .../scl/provider/SmvOptsItemProvider.java     |  298 +-
 .../provider/SubEquipmentItemProvider.java    |  131 +-
 .../scl/provider/SubFunctionItemProvider.java |  125 +-
 .../scl/provider/SubNetworkItemProvider.java  |  113 +-
 .../scl/provider/SubjectItemProvider.java     |   38 +-
 .../scl/provider/SubstationItemProvider.java  |   77 +-
 .../provider/SupSubscriptionItemProvider.java |  106 +-
 .../scl/provider/TapChangerItemProvider.java  |  145 +-
 .../scl/provider/TerminalItemProvider.java    |  351 +-
 .../scl/provider/TextItemProvider.java        |  104 +-
 .../provider/TimeSyncProtItemProvider.java    |  174 +-
 .../TimerActivatedControlItemProvider.java    |   35 +-
 .../TransformerWindingItemProvider.java       |  146 +-
 .../scl/provider/TrgOpsItemProvider.java      |  202 +-
 .../scl/provider/UnNamingItemProvider.java    |   65 +-
 .../scl/provider/ValItemProvider.java         |  118 +-
 .../provider/ValueHandlingItemProvider.java   |   74 +-
 .../provider/ValueWithUnitItemProvider.java   |  136 +-
 .../scl/provider/VoltageItemProvider.java     |   35 +-
 .../provider/VoltageLevelItemProvider.java    |  157 +-
 .../model/SCL.genmodel                        |    5 +-
 .../scl/AbstractConductingEquipment.java      |    4 +-
 .../iec61850/scl/AbstractDataAttribute.java   |   18 +-
 .../iec61850/scl/AbstractDataObject.java      |    8 +-
 .../iec61850/scl/AbstractEqFuncSubFunc.java   |    4 +-
 .../iec61850/scl/AccessControl.java           |    2 +-
 .../riseclipse/iec61850/scl/AccessPoint.java  |   16 +-
 .../edf/riseclipse/iec61850/scl/Address.java  |    6 +-
 .../iec61850/scl/AgAuthentication.java        |   10 +-
 .../riseclipse/iec61850/scl/AgDATrgOp.java    |    6 +-
 .../edf/riseclipse/iec61850/scl/AgDesc.java   |    2 +-
 .../edf/riseclipse/iec61850/scl/AgLDRef.java  |    5 +-
 .../edf/riseclipse/iec61850/scl/AgLNRef.java  |    7 +-
 .../riseclipse/iec61850/scl/AgOptFields.java  |   18 +-
 .../riseclipse/iec61850/scl/AgSmvOpts.java    |   16 +-
 .../riseclipse/iec61850/scl/AgVirtual.java    |    2 +-
 .../edf/riseclipse/iec61850/scl/AnyLN.java    |   22 +-
 .../riseclipse/iec61850/scl/Association.java  |    4 +-
 .../iec61850/scl/AssociationKindEnum.java     |   27 +-
 .../iec61850/scl/Authentication.java          |    2 +-
 .../edf/riseclipse/iec61850/scl/BDA.java      |    2 +-
 .../riseclipse/iec61850/scl/BaseElement.java  |    2 +-
 .../edf/riseclipse/iec61850/scl/Bay.java      |    8 +-
 .../edf/riseclipse/iec61850/scl/BitRate.java  |    3 +-
 .../iec61850/scl/BitRateInMbPerSec.java       |    7 +-
 .../edf/riseclipse/iec61850/scl/Cert.java     |    5 +-
 .../edf/riseclipse/iec61850/scl/ClientLN.java |    4 +-
 .../iec61850/scl/ClientServices.java          |   10 +-
 .../edf/riseclipse/iec61850/scl/CommProt.java |    2 +-
 .../iec61850/scl/Communication.java           |    4 +-
 .../iec61850/scl/ConductingEquipment.java     |   12 +-
 .../riseclipse/iec61850/scl/ConfDataSet.java  |    2 +-
 .../edf/riseclipse/iec61850/scl/ConfLNs.java  |    2 +-
 .../riseclipse/iec61850/scl/ConfLdName.java   |    2 +-
 .../iec61850/scl/ConfLogControl.java          |    2 +-
 .../iec61850/scl/ConfReportControl.java       |    2 +-
 .../edf/riseclipse/iec61850/scl/ConfSG.java   |    2 +-
 .../riseclipse/iec61850/scl/ConfSigRef.java   |    2 +-
 .../riseclipse/iec61850/scl/ConnectedAP.java  |   12 +-
 .../iec61850/scl/ConnectivityNode.java        |    6 +-
 .../edf/riseclipse/iec61850/scl/Control.java  |    6 +-
 .../riseclipse/iec61850/scl/ControlBlock.java |    2 +-
 .../iec61850/scl/ControlWithIEDName.java      |    4 +-
 .../edf/riseclipse/iec61850/scl/DA.java       |    4 +-
 .../edf/riseclipse/iec61850/scl/DAI.java      |   10 +-
 .../edf/riseclipse/iec61850/scl/DAType.java   |    8 +-
 .../edf/riseclipse/iec61850/scl/DO.java       |    6 +-
 .../edf/riseclipse/iec61850/scl/DOI.java      |   12 +-
 .../edf/riseclipse/iec61850/scl/DOType.java   |    8 +-
 .../iec61850/scl/DataObjectDirectory.java     |    2 +-
 .../edf/riseclipse/iec61850/scl/DataSet.java  |    8 +-
 .../iec61850/scl/DataSetDirectory.java        |    2 +-
 .../iec61850/scl/DataTypeTemplates.java       |   10 +-
 .../iec61850/scl/DurationInMilliSec.java      |    6 +-
 .../iec61850/scl/DurationInSec.java           |    1 -
 .../iec61850/scl/DynAssociation.java          |    2 +-
 .../riseclipse/iec61850/scl/DynDataSet.java   |    2 +-
 .../edf/riseclipse/iec61850/scl/EnumType.java |    6 +-
 .../edf/riseclipse/iec61850/scl/EnumVal.java  |    2 +-
 .../riseclipse/iec61850/scl/EqFunction.java   |   12 +-
 .../iec61850/scl/EqSubFunction.java           |    2 +-
 .../iec61850/scl/EquipmentContainer.java      |    4 +-
 .../edf/riseclipse/iec61850/scl/ExtRef.java   |   16 +-
 .../edf/riseclipse/iec61850/scl/FCDA.java     |    4 +-
 .../edf/riseclipse/iec61850/scl/FCEnum.java   |   59 +-
 .../riseclipse/iec61850/scl/FileHandling.java |    2 +-
 .../edf/riseclipse/iec61850/scl/Function.java |   14 +-
 .../edf/riseclipse/iec61850/scl/GOOSE.java    |    6 +-
 .../iec61850/scl/GOOSESecurity.java           |    2 +-
 .../edf/riseclipse/iec61850/scl/GSE.java      |    7 +-
 .../riseclipse/iec61850/scl/GSEControl.java   |    2 +-
 .../iec61850/scl/GSEControlTypeEnum.java      |   27 +-
 .../edf/riseclipse/iec61850/scl/GSEDir.java   |    2 +-
 .../riseclipse/iec61850/scl/GSESettings.java  |    6 +-
 .../edf/riseclipse/iec61850/scl/GSSE.java     |    2 +-
 .../iec61850/scl/GeneralEquipment.java        |   12 +-
 .../scl/GeneralEquipmentContainer.java        |    4 +-
 .../riseclipse/iec61850/scl/GetCBValues.java  |    2 +-
 .../iec61850/scl/GetDataObjectDefinition.java |    2 +-
 .../iec61850/scl/GetDataSetValue.java         |    2 +-
 .../riseclipse/iec61850/scl/GetDirectory.java |    2 +-
 .../edf/riseclipse/iec61850/scl/Header.java   |    2 +-
 .../edf/riseclipse/iec61850/scl/History.java  |    4 +-
 .../edf/riseclipse/iec61850/scl/Hitem.java    |    2 +-
 .../edf/riseclipse/iec61850/scl/IED.java      |   18 +-
 .../edf/riseclipse/iec61850/scl/IEDName.java  |   10 +-
 .../edf/riseclipse/iec61850/scl/Inputs.java   |    4 +-
 .../riseclipse/iec61850/scl/IssuerName.java   |    2 +-
 .../edf/riseclipse/iec61850/scl/KDC.java      |    4 +-
 .../edf/riseclipse/iec61850/scl/LDevice.java  |    6 +-
 .../edf/riseclipse/iec61850/scl/LN.java       |    5 +-
 .../edf/riseclipse/iec61850/scl/LN0.java      |    7 +-
 .../edf/riseclipse/iec61850/scl/LNode.java    |    6 +-
 .../iec61850/scl/LNodeContainer.java          |    2 +-
 .../riseclipse/iec61850/scl/LNodeType.java    |    8 +-
 .../edf/riseclipse/iec61850/scl/Line.java     |   14 +-
 .../edf/riseclipse/iec61850/scl/Log.java      |    6 +-
 .../riseclipse/iec61850/scl/LogControl.java   |    7 +-
 .../riseclipse/iec61850/scl/LogSettings.java  |    2 +-
 .../edf/riseclipse/iec61850/scl/MaxTime.java  |    1 -
 .../riseclipse/iec61850/scl/McSecurity.java   |   11 +-
 .../edf/riseclipse/iec61850/scl/MinTime.java  |    1 -
 .../riseclipse/iec61850/scl/NeutralPoint.java |    2 +-
 .../riseclipse/iec61850/scl/OptFields.java    |    2 +-
 .../edf/riseclipse/iec61850/scl/P.java        |    2 +-
 .../riseclipse/iec61850/scl/P_PhysConn.java   |    2 +-
 .../riseclipse/iec61850/scl/PhaseEnum.java    |   47 +-
 .../edf/riseclipse/iec61850/scl/PhysConn.java |    4 +-
 .../iec61850/scl/PowerTransformer.java        |    8 +-
 .../scl/PredefinedTypeOfSecurityEnum.java     |   30 +-
 .../edf/riseclipse/iec61850/scl/Private.java  |    2 +-
 .../edf/riseclipse/iec61850/scl/Process.java  |   10 +-
 .../edf/riseclipse/iec61850/scl/ProtNs.java   |    6 +-
 .../edf/riseclipse/iec61850/scl/Protocol.java |    2 +-
 .../riseclipse/iec61850/scl/ReadWrite.java    |    2 +-
 .../edf/riseclipse/iec61850/scl/RedProt.java  |    2 +-
 .../iec61850/scl/ReportControl.java           |    3 +-
 .../iec61850/scl/ReportSettings.java          |    2 +-
 .../riseclipse/iec61850/scl/RptEnabled.java   |    4 +-
 .../edf/riseclipse/iec61850/scl/SCL.java      |   10 +-
 .../edf/riseclipse/iec61850/scl/SDI.java      |   12 +-
 .../edf/riseclipse/iec61850/scl/SDO.java      |    6 +-
 .../edf/riseclipse/iec61850/scl/SGEdit.java   |    2 +-
 .../edf/riseclipse/iec61850/scl/SMV.java      |    3 +-
 .../iec61850/scl/SMVDeliveryEnum.java         |   29 +-
 .../riseclipse/iec61850/scl/SMVSecurity.java  |    2 +-
 .../riseclipse/iec61850/scl/SMVSettings.java  |   26 +-
 .../edf/riseclipse/iec61850/scl/SMVsc.java    |    6 +-
 .../iec61850/scl/SampledValueControl.java     |    2 +-
 .../iec61850/scl/SamplesPerSec.java           |    5 +-
 .../riseclipse/iec61850/scl/SclObject.java    |    4 +-
 .../iec61850/scl/SecPerSamples.java           |    5 +-
 .../edf/riseclipse/iec61850/scl/Server.java   |    6 +-
 .../edf/riseclipse/iec61850/scl/ServerAt.java |    4 +-
 .../scl/ServiceConfReportControl.java         |    7 +-
 .../iec61850/scl/ServiceForConfDataSet.java   |    3 +-
 .../iec61850/scl/ServiceSettingsEnum.java     |   30 +-
 .../scl/ServiceSettingsNoDynEnum.java         |   27 +-
 .../riseclipse/iec61850/scl/ServiceType.java  |   32 +-
 .../scl/ServiceWithMaxAndMaxAttributes.java   |    3 +-
 .../iec61850/scl/ServiceWithMaxAndModify.java |    3 +-
 .../iec61850/scl/ServiceWithMaxNonZero.java   |    3 +-
 .../iec61850/scl/ServiceWithOptionalMax.java  |    3 +-
 .../riseclipse/iec61850/scl/ServiceYesNo.java |    1 -
 .../edf/riseclipse/iec61850/scl/Services.java |    8 +-
 .../iec61850/scl/SetDataSetValue.java         |    2 +-
 .../iec61850/scl/SettingControl.java          |    2 +-
 .../iec61850/scl/SettingGroups.java           |    2 +-
 .../edf/riseclipse/iec61850/scl/SmpMod.java   |   29 +-
 .../edf/riseclipse/iec61850/scl/SmpRate.java  |    5 +-
 .../edf/riseclipse/iec61850/scl/SmvOpts.java  |    2 +-
 .../riseclipse/iec61850/scl/SubEquipment.java |    8 +-
 .../riseclipse/iec61850/scl/SubFunction.java  |   10 +-
 .../riseclipse/iec61850/scl/SubNetwork.java   |    6 +-
 .../edf/riseclipse/iec61850/scl/Subject.java  |    2 +-
 .../riseclipse/iec61850/scl/Substation.java   |    8 +-
 .../iec61850/scl/SupSubscription.java         |    2 +-
 .../riseclipse/iec61850/scl/TapChanger.java   |    6 +-
 .../edf/riseclipse/iec61850/scl/Terminal.java |    8 +-
 .../edf/riseclipse/iec61850/scl/Text.java     |    4 +-
 .../riseclipse/iec61850/scl/TimeSyncProt.java |    6 +-
 .../iec61850/scl/TimerActivatedControl.java   |    2 +-
 .../iec61850/scl/TransformerWinding.java      |    4 +-
 .../edf/riseclipse/iec61850/scl/TrgOps.java   |    2 +-
 .../edf/riseclipse/iec61850/scl/UnNaming.java |    1 -
 .../iec61850/scl/UnitMultiplierEnum.java      |   84 +-
 .../edf/riseclipse/iec61850/scl/Val.java      |    4 +-
 .../riseclipse/iec61850/scl/ValKindEnum.java  |   32 +-
 .../iec61850/scl/ValueHandling.java           |    2 +-
 .../iec61850/scl/ValueWithUnit.java           |    6 +-
 .../edf/riseclipse/iec61850/scl/Voltage.java  |    4 +-
 .../riseclipse/iec61850/scl/VoltageLevel.java |    8 +-
 .../riseclipse/iec61850/scl/bufModeEnum.java  |   29 +-
 .../impl/AbstractConductingEquipmentImpl.java |  114 +-
 .../scl/impl/AbstractDataAttributeImpl.java   |  744 ++--
 .../scl/impl/AbstractDataObjectImpl.java      |  268 +-
 .../scl/impl/AbstractEqFuncSubFuncImpl.java   |  159 +-
 .../iec61850/scl/impl/AccessControlImpl.java  |  101 +-
 .../iec61850/scl/impl/AccessPointImpl.java    |  785 ++--
 .../iec61850/scl/impl/AddressImpl.java        |  219 +-
 .../scl/impl/AgAuthenticationImpl.java        |  227 +-
 .../iec61850/scl/impl/AgDATrgOpImpl.java      |  149 +-
 .../iec61850/scl/impl/AgDescImpl.java         |   71 +-
 .../iec61850/scl/impl/AgLDRefImpl.java        |  108 +-
 .../iec61850/scl/impl/AgLNRefImpl.java        |  149 +-
 .../iec61850/scl/impl/AgOptFieldsImpl.java    |  415 +-
 .../iec61850/scl/impl/AgSmvOptsImpl.java      |  344 +-
 .../iec61850/scl/impl/AgVirtualImpl.java      |   71 +-
 .../AnyContentFromOtherNamespaceImpl.java     |  152 +-
 .../iec61850/scl/impl/AnyLNImpl.java          |  945 +++--
 .../iec61850/scl/impl/AssociationImpl.java    |  594 +--
 .../iec61850/scl/impl/AuthenticationImpl.java |  345 +-
 .../riseclipse/iec61850/scl/impl/BDAImpl.java |   99 +-
 .../iec61850/scl/impl/BaseElementImpl.java    |  230 +-
 .../riseclipse/iec61850/scl/impl/BayImpl.java |  235 +-
 .../iec61850/scl/impl/BitRateImpl.java        |  116 +-
 .../scl/impl/BitRateInMbPerSecImpl.java       |  139 +-
 .../iec61850/scl/impl/CertImpl.java           |  108 +-
 .../iec61850/scl/impl/CertificateImpl.java    |  282 +-
 .../iec61850/scl/impl/ClientLNImpl.java       |  579 +--
 .../iec61850/scl/impl/ClientServicesImpl.java |  817 ++--
 .../iec61850/scl/impl/CommProtImpl.java       |  142 +-
 .../iec61850/scl/impl/CommunicationImpl.java  |  143 +-
 .../scl/impl/ConductingEquipmentImpl.java     |  487 ++-
 .../iec61850/scl/impl/ConfDataSetImpl.java    |  102 +-
 .../iec61850/scl/impl/ConfLNsImpl.java        |  179 +-
 .../iec61850/scl/impl/ConfLdNameImpl.java     |  101 +-
 .../iec61850/scl/impl/ConfLogControlImpl.java |  102 +-
 .../scl/impl/ConfReportControlImpl.java       |  102 +-
 .../iec61850/scl/impl/ConfSGImpl.java         |  146 +-
 .../iec61850/scl/impl/ConfSigRefImpl.java     |  101 +-
 .../iec61850/scl/impl/ConnectedAPImpl.java    |  562 +--
 .../scl/impl/ConnectivityNodeImpl.java        |  258 +-
 .../iec61850/scl/impl/ControlBlockImpl.java   |  316 +-
 .../iec61850/scl/impl/ControlImpl.java        |  277 +-
 .../scl/impl/ControlWithIEDNameImpl.java      |  246 +-
 .../scl/impl/ControlWithTriggerOptImpl.java   |  155 +-
 .../riseclipse/iec61850/scl/impl/DAIImpl.java |  540 +--
 .../riseclipse/iec61850/scl/impl/DAImpl.java  |  339 +-
 .../iec61850/scl/impl/DATypeImpl.java         |  282 +-
 .../riseclipse/iec61850/scl/impl/DOIImpl.java |  472 ++-
 .../riseclipse/iec61850/scl/impl/DOImpl.java  |  247 +-
 .../iec61850/scl/impl/DOTypeImpl.java         |  318 +-
 .../scl/impl/DataObjectDirectoryImpl.java     |  102 +-
 .../scl/impl/DataSetDirectoryImpl.java        |  102 +-
 .../iec61850/scl/impl/DataSetImpl.java        |  233 +-
 .../scl/impl/DataTypeTemplatesImpl.java       |  275 +-
 .../scl/impl/DurationInMilliSecImpl.java      |  139 +-
 .../iec61850/scl/impl/DynAssociationImpl.java |  102 +-
 .../iec61850/scl/impl/DynDataSetImpl.java     |  101 +-
 .../iec61850/scl/impl/EnumTypeImpl.java       |  194 +-
 .../iec61850/scl/impl/EnumValImpl.java        |  239 +-
 .../iec61850/scl/impl/EqFunctionImpl.java     |  476 ++-
 .../iec61850/scl/impl/EqSubFunctionImpl.java  |  104 +-
 .../scl/impl/EquipmentContainerImpl.java      |  114 +-
 .../iec61850/scl/impl/EquipmentImpl.java      |   87 +-
 .../iec61850/scl/impl/ExtRefImpl.java         | 1224 +++---
 .../iec61850/scl/impl/FCDAImpl.java           |  549 +--
 .../iec61850/scl/impl/FileHandlingImpl.java   |  221 +-
 .../iec61850/scl/impl/FunctionImpl.java       |  501 +--
 .../iec61850/scl/impl/GOOSEImpl.java          |  222 +-
 .../iec61850/scl/impl/GOOSESecurityImpl.java  |  102 +-
 .../iec61850/scl/impl/GSEControlImpl.java     |  255 +-
 .../iec61850/scl/impl/GSEDirImpl.java         |   99 +-
 .../riseclipse/iec61850/scl/impl/GSEImpl.java |  270 +-
 .../iec61850/scl/impl/GSESettingsImpl.java    |  316 +-
 .../iec61850/scl/impl/GSSEImpl.java           |   99 +-
 .../impl/GeneralEquipmentContainerImpl.java   |  114 +-
 .../scl/impl/GeneralEquipmentImpl.java        |  495 ++-
 .../iec61850/scl/impl/GetCBValuesImpl.java    |  102 +-
 .../scl/impl/GetDataObjectDefinitionImpl.java |  102 +-
 .../scl/impl/GetDataSetValueImpl.java         |  102 +-
 .../iec61850/scl/impl/GetDirectoryImpl.java   |  102 +-
 .../iec61850/scl/impl/HeaderImpl.java         |  467 ++-
 .../iec61850/scl/impl/HistoryImpl.java        |  143 +-
 .../iec61850/scl/impl/HitemImpl.java          |  327 +-
 .../iec61850/scl/impl/IDNamingImpl.java       |  125 +-
 .../riseclipse/iec61850/scl/impl/IEDImpl.java |  719 ++--
 .../iec61850/scl/impl/IEDNameImpl.java        |  660 +--
 .../iec61850/scl/impl/InputsImpl.java         |  143 +-
 .../iec61850/scl/impl/IssuerNameImpl.java     |  102 +-
 .../riseclipse/iec61850/scl/impl/KDCImpl.java |  286 +-
 .../iec61850/scl/impl/LDeviceImpl.java        |  541 +--
 .../riseclipse/iec61850/scl/impl/LN0Impl.java |  301 +-
 .../riseclipse/iec61850/scl/impl/LNImpl.java  |  213 +-
 .../iec61850/scl/impl/LNodeContainerImpl.java |   68 +-
 .../iec61850/scl/impl/LNodeImpl.java          |  563 +--
 .../iec61850/scl/impl/LNodeTypeImpl.java      |  316 +-
 .../iec61850/scl/impl/LineImpl.java           |  478 ++-
 .../iec61850/scl/impl/LogControlImpl.java     |  609 +--
 .../riseclipse/iec61850/scl/impl/LogImpl.java |  192 +-
 .../iec61850/scl/impl/LogSettingsImpl.java    |  220 +-
 .../iec61850/scl/impl/McSecurityImpl.java     |  351 +-
 .../iec61850/scl/impl/NamingImpl.java         |  126 +-
 .../iec61850/scl/impl/NeutralPointImpl.java   |  104 +-
 .../iec61850/scl/impl/OptFieldsImpl.java      |  522 ++-
 .../iec61850/scl/impl/PAddrImpl.java          |   96 +-
 .../riseclipse/iec61850/scl/impl/PImpl.java   |   99 +-
 .../iec61850/scl/impl/P_PhysConnImpl.java     |  100 +-
 .../iec61850/scl/impl/PhysConnImpl.java       |  188 +-
 .../scl/impl/PowerTransformerImpl.java        |  282 +-
 .../iec61850/scl/impl/PrivateImpl.java        |  182 +-
 .../iec61850/scl/impl/ProcessImpl.java        |  390 +-
 .../iec61850/scl/impl/ProtNsImpl.java         |  242 +-
 .../iec61850/scl/impl/ProtocolImpl.java       |  146 +-
 .../iec61850/scl/impl/ReadWriteImpl.java      |  100 +-
 .../iec61850/scl/impl/RedProtImpl.java        |  218 +-
 .../iec61850/scl/impl/ReportControlImpl.java  |  470 ++-
 .../iec61850/scl/impl/ReportSettingsImpl.java |  369 +-
 .../iec61850/scl/impl/RptEnabledImpl.java     |  190 +-
 .../riseclipse/iec61850/scl/impl/SCLImpl.java |  589 +--
 .../riseclipse/iec61850/scl/impl/SDIImpl.java |  641 +--
 .../riseclipse/iec61850/scl/impl/SDOImpl.java |  210 +-
 .../iec61850/scl/impl/SGEditImpl.java         |  146 +-
 .../riseclipse/iec61850/scl/impl/SMVImpl.java |  100 +-
 .../iec61850/scl/impl/SMVSecurityImpl.java    |  102 +-
 .../iec61850/scl/impl/SMVSettingsImpl.java    |  666 +--
 .../iec61850/scl/impl/SMVscImpl.java          |  258 +-
 .../scl/impl/SampledValueControlImpl.java     |  418 +-
 .../iec61850/scl/impl/SamplesPerSecImpl.java  |  153 +-
 .../iec61850/scl/impl/SclFactoryImpl.java     |  658 +--
 .../iec61850/scl/impl/SclObjectImpl.java      |  100 +-
 .../iec61850/scl/impl/SclPackageImpl.java     | 2366 ++++++-----
 .../iec61850/scl/impl/SecPerSamplesImpl.java  |  153 +-
 .../iec61850/scl/impl/ServerAtImpl.java       |  252 +-
 .../iec61850/scl/impl/ServerImpl.java         |  323 +-
 .../impl/ServiceConfReportControlImpl.java    |  149 +-
 .../scl/impl/ServiceForConfDataSetImpl.java   |   71 +-
 .../scl/impl/ServiceSettingsImpl.java         |   96 +-
 .../ServiceWithMaxAndMaxAttributesImpl.java   |   73 +-
 .../scl/impl/ServiceWithMaxAndModifyImpl.java |   71 +-
 .../iec61850/scl/impl/ServiceWithMaxImpl.java |   61 +-
 .../scl/impl/ServiceWithMaxNonZeroImpl.java   |   71 +-
 .../scl/impl/ServiceWithOptionalMaxImpl.java  |   71 +-
 .../iec61850/scl/impl/ServicesImpl.java       | 3160 +++++++++------
 .../scl/impl/SetDataSetValueImpl.java         |  102 +-
 .../iec61850/scl/impl/SettingControlImpl.java |  220 +-
 .../iec61850/scl/impl/SettingGroupsImpl.java  |  278 +-
 .../iec61850/scl/impl/SmpRateImpl.java        |  152 +-
 .../iec61850/scl/impl/SmvOptsImpl.java        |  481 ++-
 .../iec61850/scl/impl/SubEquipmentImpl.java   |  409 +-
 .../iec61850/scl/impl/SubFunctionImpl.java    |  354 +-
 .../iec61850/scl/impl/SubNetworkImpl.java     |  284 +-
 .../iec61850/scl/impl/SubjectImpl.java        |  102 +-
 .../iec61850/scl/impl/SubstationImpl.java     |  260 +-
 .../scl/impl/SupSubscriptionImpl.java         |  182 +-
 .../iec61850/scl/impl/TapChangerImpl.java     |  301 +-
 .../iec61850/scl/impl/TerminalImpl.java       |  581 +--
 .../iec61850/scl/impl/TextImpl.java           |  242 +-
 .../iec61850/scl/impl/TimeSyncProtImpl.java   |  335 +-
 .../scl/impl/TimerActivatedControlImpl.java   |  102 +-
 .../scl/impl/TransformerWindingImpl.java      |  370 +-
 .../iec61850/scl/impl/TrgOpsImpl.java         |  295 +-
 .../iec61850/scl/impl/UnNamingImpl.java       |   97 +-
 .../riseclipse/iec61850/scl/impl/ValImpl.java |  244 +-
 .../iec61850/scl/impl/ValueHandlingImpl.java  |  145 +-
 .../iec61850/scl/impl/ValueWithUnitImpl.java  |  141 +-
 .../iec61850/scl/impl/VoltageImpl.java        |  187 +-
 .../iec61850/scl/impl/VoltageLevelImpl.java   |  361 +-
 .../iec61850/scl/util/SclAdapterFactory.java  | 1552 +++----
 .../scl/util/SclResourceFactoryImpl.java      |    2 +-
 .../iec61850/scl/util/SclResourceImpl.java    |    2 +-
 .../iec61850/scl/util/SclSwitch.java          | 3603 +++++++++--------
 .../iec61850/scl/util/SclXMLProcessor.java    |   10 +-
 515 files changed, 41712 insertions(+), 37564 deletions(-)

diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractConductingEquipmentItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractConductingEquipmentItemProvider.java
index d3fb446..42477a9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractConductingEquipmentItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractConductingEquipmentItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
      * <!-- end-user-doc -->
      * @generated
      */
-    public AbstractConductingEquipmentItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AbstractConductingEquipmentItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,9 +56,9 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -74,11 +73,11 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getAbstractConductingEquipment_SubEquipment());
-            childrenFeatures.add(SclPackage.eINSTANCE.getAbstractConductingEquipment_Terminal());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAbstractConductingEquipment_SubEquipment() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAbstractConductingEquipment_Terminal() );
         }
         return childrenFeatures;
     }
@@ -89,11 +88,11 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -103,8 +102,8 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AbstractConductingEquipment"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/AbstractConductingEquipment" ) );
     }
 
     /**
@@ -114,13 +113,11 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((AbstractConductingEquipment)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_AbstractConductingEquipment_type") :
-            getString("_UI_AbstractConductingEquipment_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( AbstractConductingEquipment ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_AbstractConductingEquipment_type" )
+                : getString( "_UI_AbstractConductingEquipment_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -130,16 +127,16 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(AbstractConductingEquipment.class)) {
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( AbstractConductingEquipment.class ) ) {
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -150,23 +147,18 @@ public class AbstractConductingEquipmentItemProvider extends EquipmentItemProvid
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAbstractConductingEquipment_SubEquipment(),
-                 SclFactory.eINSTANCE.createSubEquipment()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAbstractConductingEquipment_Terminal(),
-                 SclFactory.eINSTANCE.createTerminal()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAbstractConductingEquipment_Terminal(),
-                 SclFactory.eINSTANCE.createNeutralPoint()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors
+                .add( createChildParameter( SclPackage.eINSTANCE.getAbstractConductingEquipment_SubEquipment(),
+                        SclFactory.eINSTANCE.createSubEquipment() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAbstractConductingEquipment_Terminal(),
+                SclFactory.eINSTANCE.createTerminal() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAbstractConductingEquipment_Terminal(),
+                SclFactory.eINSTANCE.createNeutralPoint() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractDataAttributeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractDataAttributeItemProvider.java
index c6888be..39284aa 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractDataAttributeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractDataAttributeItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public AbstractDataAttributeItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AbstractDataAttributeItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,23 +58,23 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addBTypePropertyDescriptor(object);
-            addCountPropertyDescriptor(object);
-            addSAddrPropertyDescriptor(object);
-            addTypePropertyDescriptor(object);
-            addValImportPropertyDescriptor(object);
-            addValKindPropertyDescriptor(object);
-            addRefersToEnumTypePropertyDescriptor(object);
-            addRefersToDATypePropertyDescriptor(object);
-            addReferredByFCDAPropertyDescriptor(object);
-            addReferredByExtRefPropertyDescriptor(object);
-            addNamePropertyDescriptor(object);
-            addReferredByDAIPropertyDescriptor(object);
-            addReferredBySDIPropertyDescriptor(object);
+            addBTypePropertyDescriptor( object );
+            addCountPropertyDescriptor( object );
+            addSAddrPropertyDescriptor( object );
+            addTypePropertyDescriptor( object );
+            addValImportPropertyDescriptor( object );
+            addValKindPropertyDescriptor( object );
+            addRefersToEnumTypePropertyDescriptor( object );
+            addRefersToDATypePropertyDescriptor( object );
+            addReferredByFCDAPropertyDescriptor( object );
+            addReferredByExtRefPropertyDescriptor( object );
+            addNamePropertyDescriptor( object );
+            addReferredByDAIPropertyDescriptor( object );
+            addReferredBySDIPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -86,20 +85,20 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addBTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataAttribute_bType_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_bType_feature", "_UI_AbstractDataAttribute_type"),
-                 SclPackage.eINSTANCE.getAbstractDataAttribute_BType(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addBTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataAttribute_bType_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_bType_feature",
+                                "_UI_AbstractDataAttribute_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataAttribute_BType(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -108,20 +107,20 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addCountPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataAttribute_count_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_count_feature", "_UI_AbstractDataAttribute_type"),
-                 SclPackage.eINSTANCE.getAbstractDataAttribute_Count(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addCountPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataAttribute_count_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_count_feature",
+                                "_UI_AbstractDataAttribute_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataAttribute_Count(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -130,20 +129,20 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSAddrPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataAttribute_sAddr_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_sAddr_feature", "_UI_AbstractDataAttribute_type"),
-                 SclPackage.eINSTANCE.getAbstractDataAttribute_SAddr(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSAddrPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataAttribute_sAddr_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_sAddr_feature",
+                                "_UI_AbstractDataAttribute_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataAttribute_SAddr(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -152,20 +151,20 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataAttribute_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_type_feature", "_UI_AbstractDataAttribute_type"),
-                 SclPackage.eINSTANCE.getAbstractDataAttribute_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataAttribute_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_type_feature",
+                                "_UI_AbstractDataAttribute_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataAttribute_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -174,20 +173,20 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addValImportPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataAttribute_valImport_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_valImport_feature", "_UI_AbstractDataAttribute_type"),
-                 SclPackage.eINSTANCE.getAbstractDataAttribute_ValImport(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValImportPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataAttribute_valImport_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_valImport_feature",
+                                "_UI_AbstractDataAttribute_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataAttribute_ValImport(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -196,20 +195,20 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addValKindPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataAttribute_valKind_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_valKind_feature", "_UI_AbstractDataAttribute_type"),
-                 SclPackage.eINSTANCE.getAbstractDataAttribute_ValKind(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValKindPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataAttribute_valKind_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_valKind_feature",
+                                "_UI_AbstractDataAttribute_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataAttribute_ValKind(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -218,20 +217,20 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToEnumTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataAttribute_RefersToEnumType_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_RefersToEnumType_feature", "_UI_AbstractDataAttribute_type"),
-                 SclPackage.eINSTANCE.getAbstractDataAttribute_RefersToEnumType(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToEnumTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add( createItemPropertyDescriptor(
+                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString( "_UI_AbstractDataAttribute_RefersToEnumType_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_RefersToEnumType_feature",
+                        "_UI_AbstractDataAttribute_type" ),
+                SclPackage.eINSTANCE.getAbstractDataAttribute_RefersToEnumType(),
+                true,
+                false,
+                true,
+                null,
+                null,
+                null ) );
     }
 
     /**
@@ -240,20 +239,20 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToDATypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataAttribute_RefersToDAType_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_RefersToDAType_feature", "_UI_AbstractDataAttribute_type"),
-                 SclPackage.eINSTANCE.getAbstractDataAttribute_RefersToDAType(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToDATypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataAttribute_RefersToDAType_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_AbstractDataAttribute_RefersToDAType_feature", "_UI_AbstractDataAttribute_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataAttribute_RefersToDAType(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -262,20 +261,20 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByFCDAPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataAttribute_ReferredByFCDA_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_ReferredByFCDA_feature", "_UI_AbstractDataAttribute_type"),
-                 SclPackage.eINSTANCE.getAbstractDataAttribute_ReferredByFCDA(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByFCDAPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataAttribute_ReferredByFCDA_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_AbstractDataAttribute_ReferredByFCDA_feature", "_UI_AbstractDataAttribute_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataAttribute_ReferredByFCDA(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -284,20 +283,20 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByExtRefPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataAttribute_ReferredByExtRef_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_ReferredByExtRef_feature", "_UI_AbstractDataAttribute_type"),
-                 SclPackage.eINSTANCE.getAbstractDataAttribute_ReferredByExtRef(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByExtRefPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add( createItemPropertyDescriptor(
+                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString( "_UI_AbstractDataAttribute_ReferredByExtRef_feature" ),
+                getString( "_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_ReferredByExtRef_feature",
+                        "_UI_AbstractDataAttribute_type" ),
+                SclPackage.eINSTANCE.getAbstractDataAttribute_ReferredByExtRef(),
+                true,
+                false,
+                true,
+                null,
+                null,
+                null ) );
     }
 
     /**
@@ -306,20 +305,20 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataAttribute_name_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_name_feature", "_UI_AbstractDataAttribute_type"),
-                 SclPackage.eINSTANCE.getAbstractDataAttribute_Name(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataAttribute_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_name_feature",
+                                "_UI_AbstractDataAttribute_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataAttribute_Name(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -328,20 +327,20 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByDAIPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataAttribute_ReferredByDAI_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_ReferredByDAI_feature", "_UI_AbstractDataAttribute_type"),
-                 SclPackage.eINSTANCE.getAbstractDataAttribute_ReferredByDAI(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByDAIPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataAttribute_ReferredByDAI_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_AbstractDataAttribute_ReferredByDAI_feature", "_UI_AbstractDataAttribute_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataAttribute_ReferredByDAI(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -350,20 +349,20 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredBySDIPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataAttribute_ReferredBySDI_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_ReferredBySDI_feature", "_UI_AbstractDataAttribute_type"),
-                 SclPackage.eINSTANCE.getAbstractDataAttribute_ReferredBySDI(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredBySDIPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataAttribute_ReferredBySDI_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_AbstractDataAttribute_ReferredBySDI_feature", "_UI_AbstractDataAttribute_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataAttribute_ReferredBySDI(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -375,10 +374,10 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getAbstractDataAttribute_Val());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAbstractDataAttribute_Val() );
         }
         return childrenFeatures;
     }
@@ -389,11 +388,11 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -403,8 +402,8 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AbstractDataAttribute"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/AbstractDataAttribute" ) );
     }
 
     /**
@@ -414,13 +413,11 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((AbstractDataAttribute)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_AbstractDataAttribute_type") :
-            getString("_UI_AbstractDataAttribute_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( AbstractDataAttribute ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_AbstractDataAttribute_type" )
+                : getString( "_UI_AbstractDataAttribute_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -430,24 +427,24 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(AbstractDataAttribute.class)) {
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE:
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT:
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR:
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE:
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT:
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND:
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( AbstractDataAttribute.class ) ) {
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE:
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT:
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR:
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE:
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT:
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND:
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -458,13 +455,11 @@ public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAbstractDataAttribute_Val(),
-                 SclFactory.eINSTANCE.createVal()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAbstractDataAttribute_Val(),
+                SclFactory.eINSTANCE.createVal() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractDataObjectItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractDataObjectItemProvider.java
index cbde4d1..51b09ca 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractDataObjectItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractDataObjectItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataObject;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 
@@ -48,8 +47,8 @@ public class AbstractDataObjectItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public AbstractDataObjectItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AbstractDataObjectItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,14 +58,14 @@ public class AbstractDataObjectItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
-
-            addNamePropertyDescriptor(object);
-            addTypePropertyDescriptor(object);
-            addRefersToDOTypePropertyDescriptor(object);
-            addReferredByExtRefPropertyDescriptor(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
+
+            addNamePropertyDescriptor( object );
+            addTypePropertyDescriptor( object );
+            addRefersToDOTypePropertyDescriptor( object );
+            addReferredByExtRefPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -77,20 +76,20 @@ public class AbstractDataObjectItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataObject_name_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataObject_name_feature", "_UI_AbstractDataObject_type"),
-                 SclPackage.eINSTANCE.getAbstractDataObject_Name(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataObject_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AbstractDataObject_name_feature",
+                                "_UI_AbstractDataObject_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataObject_Name(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,20 +98,20 @@ public class AbstractDataObjectItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataObject_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataObject_type_feature", "_UI_AbstractDataObject_type"),
-                 SclPackage.eINSTANCE.getAbstractDataObject_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataObject_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AbstractDataObject_type_feature",
+                                "_UI_AbstractDataObject_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataObject_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -121,20 +120,20 @@ public class AbstractDataObjectItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToDOTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataObject_RefersToDOType_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataObject_RefersToDOType_feature", "_UI_AbstractDataObject_type"),
-                 SclPackage.eINSTANCE.getAbstractDataObject_RefersToDOType(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToDOTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataObject_RefersToDOType_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_AbstractDataObject_RefersToDOType_feature", "_UI_AbstractDataObject_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataObject_RefersToDOType(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -143,20 +142,20 @@ public class AbstractDataObjectItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByExtRefPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractDataObject_ReferredByExtRef_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataObject_ReferredByExtRef_feature", "_UI_AbstractDataObject_type"),
-                 SclPackage.eINSTANCE.getAbstractDataObject_ReferredByExtRef(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByExtRefPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractDataObject_ReferredByExtRef_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_AbstractDataObject_ReferredByExtRef_feature", "_UI_AbstractDataObject_type" ),
+                        SclPackage.eINSTANCE.getAbstractDataObject_ReferredByExtRef(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -166,14 +165,12 @@ public class AbstractDataObjectItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((AbstractDataObject)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_AbstractDataObject_type") :
-            getString("_UI_AbstractDataObject_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( AbstractDataObject ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_AbstractDataObject_type" )
+                : getString( "_UI_AbstractDataObject_type" ) + " " + label;
     }
 
-
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
      * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
@@ -182,16 +179,16 @@ public class AbstractDataObjectItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(AbstractDataObject.class)) {
-            case SclPackage.ABSTRACT_DATA_OBJECT__NAME:
-            case SclPackage.ABSTRACT_DATA_OBJECT__TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( AbstractDataObject.class ) ) {
+        case SclPackage.ABSTRACT_DATA_OBJECT__NAME:
+        case SclPackage.ABSTRACT_DATA_OBJECT__TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -202,8 +199,8 @@ public class AbstractDataObjectItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractEqFuncSubFuncItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractEqFuncSubFuncItemProvider.java
index cd2aa9f..ffe40bd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractEqFuncSubFuncItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AbstractEqFuncSubFuncItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class AbstractEqFuncSubFuncItemProvider extends PowerSystemResourceItemPr
      * <!-- end-user-doc -->
      * @generated
      */
-    public AbstractEqFuncSubFuncItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AbstractEqFuncSubFuncItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class AbstractEqFuncSubFuncItemProvider extends PowerSystemResourceItemPr
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTypePropertyDescriptor(object);
+            addTypePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class AbstractEqFuncSubFuncItemProvider extends PowerSystemResourceItemPr
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AbstractEqFuncSubFunc_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AbstractEqFuncSubFunc_type_feature", "_UI_AbstractEqFuncSubFunc_type"),
-                 SclPackage.eINSTANCE.getAbstractEqFuncSubFunc_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AbstractEqFuncSubFunc_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AbstractEqFuncSubFunc_type_feature",
+                                "_UI_AbstractEqFuncSubFunc_type" ),
+                        SclPackage.eINSTANCE.getAbstractEqFuncSubFunc_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,11 +98,11 @@ public class AbstractEqFuncSubFuncItemProvider extends PowerSystemResourceItemPr
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getAbstractEqFuncSubFunc_EqSubFunction());
-            childrenFeatures.add(SclPackage.eINSTANCE.getAbstractEqFuncSubFunc_SubGeneralEquipment());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAbstractEqFuncSubFunc_EqSubFunction() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAbstractEqFuncSubFunc_SubGeneralEquipment() );
         }
         return childrenFeatures;
     }
@@ -114,11 +113,11 @@ public class AbstractEqFuncSubFuncItemProvider extends PowerSystemResourceItemPr
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -128,8 +127,8 @@ public class AbstractEqFuncSubFuncItemProvider extends PowerSystemResourceItemPr
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AbstractEqFuncSubFunc"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/AbstractEqFuncSubFunc" ) );
     }
 
     /**
@@ -139,13 +138,11 @@ public class AbstractEqFuncSubFuncItemProvider extends PowerSystemResourceItemPr
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((AbstractEqFuncSubFunc)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_AbstractEqFuncSubFunc_type") :
-            getString("_UI_AbstractEqFuncSubFunc_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( AbstractEqFuncSubFunc ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_AbstractEqFuncSubFunc_type" )
+                : getString( "_UI_AbstractEqFuncSubFunc_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -155,19 +152,19 @@ public class AbstractEqFuncSubFuncItemProvider extends PowerSystemResourceItemPr
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(AbstractEqFuncSubFunc.class)) {
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION:
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( AbstractEqFuncSubFunc.class ) ) {
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION:
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -178,18 +175,15 @@ public class AbstractEqFuncSubFuncItemProvider extends PowerSystemResourceItemPr
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAbstractEqFuncSubFunc_EqSubFunction(),
-                 SclFactory.eINSTANCE.createEqSubFunction()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAbstractEqFuncSubFunc_SubGeneralEquipment(),
-                 SclFactory.eINSTANCE.createGeneralEquipment()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAbstractEqFuncSubFunc_EqSubFunction(),
+                SclFactory.eINSTANCE.createEqSubFunction() ) );
+
+        newChildDescriptors
+                .add( createChildParameter( SclPackage.eINSTANCE.getAbstractEqFuncSubFunc_SubGeneralEquipment(),
+                        SclFactory.eINSTANCE.createGeneralEquipment() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AccessControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AccessControlItemProvider.java
index c51c2ef..3bf7f83 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AccessControlItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AccessControlItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessControl;
  * <!-- end-user-doc -->
  * @generated
  */
-public class AccessControlItemProvider 
-    extends SclObjectItemProvider {
+public class AccessControlItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public AccessControlItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AccessControlItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class AccessControlItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class AccessControlItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AccessControl"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/AccessControl" ) );
     }
 
     /**
@@ -80,11 +79,10 @@ public class AccessControlItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        AccessControl accessControl = (AccessControl)object;
-        return getString("_UI_AccessControl_type") + " " + accessControl.getLineNumber();
+    public String getText( Object object ) {
+        AccessControl accessControl = ( AccessControl ) object;
+        return getString( "_UI_AccessControl_type" ) + " " + accessControl.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -94,9 +92,8 @@ public class AccessControlItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -107,8 +104,8 @@ public class AccessControlItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AccessPointItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AccessPointItemProvider.java
index 5944f9c..d4d7244 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AccessPointItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AccessPointItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public AccessPointItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AccessPointItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,17 +58,17 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addClockPropertyDescriptor(object);
-            addKdcPropertyDescriptor(object);
-            addRouterPropertyDescriptor(object);
-            addReferredByServerAtPropertyDescriptor(object);
-            addNamePropertyDescriptor(object);
-            addReferredByConnectedAPPropertyDescriptor(object);
-            addReferredByKDCPropertyDescriptor(object);
+            addClockPropertyDescriptor( object );
+            addKdcPropertyDescriptor( object );
+            addRouterPropertyDescriptor( object );
+            addReferredByServerAtPropertyDescriptor( object );
+            addNamePropertyDescriptor( object );
+            addReferredByConnectedAPPropertyDescriptor( object );
+            addReferredByKDCPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -80,20 +79,20 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addClockPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AccessPoint_clock_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AccessPoint_clock_feature", "_UI_AccessPoint_type"),
-                 SclPackage.eINSTANCE.getAccessPoint_Clock(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addClockPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AccessPoint_clock_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AccessPoint_clock_feature",
+                                "_UI_AccessPoint_type" ),
+                        SclPackage.eINSTANCE.getAccessPoint_Clock(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -102,20 +101,20 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addKdcPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AccessPoint_kdc_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AccessPoint_kdc_feature", "_UI_AccessPoint_type"),
-                 SclPackage.eINSTANCE.getAccessPoint_Kdc(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addKdcPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AccessPoint_kdc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AccessPoint_kdc_feature",
+                                "_UI_AccessPoint_type" ),
+                        SclPackage.eINSTANCE.getAccessPoint_Kdc(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -124,20 +123,20 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRouterPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AccessPoint_router_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AccessPoint_router_feature", "_UI_AccessPoint_type"),
-                 SclPackage.eINSTANCE.getAccessPoint_Router(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addRouterPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AccessPoint_router_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AccessPoint_router_feature",
+                                "_UI_AccessPoint_type" ),
+                        SclPackage.eINSTANCE.getAccessPoint_Router(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -146,20 +145,20 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByServerAtPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AccessPoint_ReferredByServerAt_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AccessPoint_ReferredByServerAt_feature", "_UI_AccessPoint_type"),
-                 SclPackage.eINSTANCE.getAccessPoint_ReferredByServerAt(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByServerAtPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AccessPoint_ReferredByServerAt_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AccessPoint_ReferredByServerAt_feature",
+                                "_UI_AccessPoint_type" ),
+                        SclPackage.eINSTANCE.getAccessPoint_ReferredByServerAt(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -168,20 +167,20 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AccessPoint_name_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AccessPoint_name_feature", "_UI_AccessPoint_type"),
-                 SclPackage.eINSTANCE.getAccessPoint_Name(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AccessPoint_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AccessPoint_name_feature",
+                                "_UI_AccessPoint_type" ),
+                        SclPackage.eINSTANCE.getAccessPoint_Name(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -190,20 +189,20 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByConnectedAPPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AccessPoint_ReferredByConnectedAP_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AccessPoint_ReferredByConnectedAP_feature", "_UI_AccessPoint_type"),
-                 SclPackage.eINSTANCE.getAccessPoint_ReferredByConnectedAP(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByConnectedAPPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AccessPoint_ReferredByConnectedAP_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_AccessPoint_ReferredByConnectedAP_feature", "_UI_AccessPoint_type" ),
+                        SclPackage.eINSTANCE.getAccessPoint_ReferredByConnectedAP(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -212,20 +211,20 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByKDCPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AccessPoint_ReferredByKDC_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AccessPoint_ReferredByKDC_feature", "_UI_AccessPoint_type"),
-                 SclPackage.eINSTANCE.getAccessPoint_ReferredByKDC(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByKDCPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AccessPoint_ReferredByKDC_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AccessPoint_ReferredByKDC_feature",
+                                "_UI_AccessPoint_type" ),
+                        SclPackage.eINSTANCE.getAccessPoint_ReferredByKDC(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -237,15 +236,15 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getAccessPoint_LN());
-            childrenFeatures.add(SclPackage.eINSTANCE.getAccessPoint_SMVSecurity());
-            childrenFeatures.add(SclPackage.eINSTANCE.getAccessPoint_ServerAt());
-            childrenFeatures.add(SclPackage.eINSTANCE.getAccessPoint_Server());
-            childrenFeatures.add(SclPackage.eINSTANCE.getAccessPoint_Services());
-            childrenFeatures.add(SclPackage.eINSTANCE.getAccessPoint_GOOSESecurity());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAccessPoint_LN() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAccessPoint_SMVSecurity() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAccessPoint_ServerAt() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAccessPoint_Server() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAccessPoint_Services() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAccessPoint_GOOSESecurity() );
         }
         return childrenFeatures;
     }
@@ -256,11 +255,11 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -270,8 +269,8 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AccessPoint"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/AccessPoint" ) );
     }
 
     /**
@@ -281,13 +280,11 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((AccessPoint)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_AccessPoint_type") :
-            getString("_UI_AccessPoint_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( AccessPoint ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_AccessPoint_type" )
+                : getString( "_UI_AccessPoint_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -297,26 +294,26 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(AccessPoint.class)) {
-            case SclPackage.ACCESS_POINT__CLOCK:
-            case SclPackage.ACCESS_POINT__KDC:
-            case SclPackage.ACCESS_POINT__ROUTER:
-            case SclPackage.ACCESS_POINT__NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.ACCESS_POINT__LN:
-            case SclPackage.ACCESS_POINT__SMV_SECURITY:
-            case SclPackage.ACCESS_POINT__SERVER_AT:
-            case SclPackage.ACCESS_POINT__SERVER:
-            case SclPackage.ACCESS_POINT__SERVICES:
-            case SclPackage.ACCESS_POINT__GOOSE_SECURITY:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( AccessPoint.class ) ) {
+        case SclPackage.ACCESS_POINT__CLOCK:
+        case SclPackage.ACCESS_POINT__KDC:
+        case SclPackage.ACCESS_POINT__ROUTER:
+        case SclPackage.ACCESS_POINT__NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.ACCESS_POINT__LN:
+        case SclPackage.ACCESS_POINT__SMV_SECURITY:
+        case SclPackage.ACCESS_POINT__SERVER_AT:
+        case SclPackage.ACCESS_POINT__SERVER:
+        case SclPackage.ACCESS_POINT__SERVICES:
+        case SclPackage.ACCESS_POINT__GOOSE_SECURITY:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -327,38 +324,26 @@ public class AccessPointItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAccessPoint_LN(),
-                 SclFactory.eINSTANCE.createLN()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAccessPoint_LN(),
+                SclFactory.eINSTANCE.createLN() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAccessPoint_SMVSecurity(),
-                 SclFactory.eINSTANCE.createSMVSecurity()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAccessPoint_SMVSecurity(),
+                SclFactory.eINSTANCE.createSMVSecurity() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAccessPoint_ServerAt(),
-                 SclFactory.eINSTANCE.createServerAt()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAccessPoint_ServerAt(),
+                SclFactory.eINSTANCE.createServerAt() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAccessPoint_Server(),
-                 SclFactory.eINSTANCE.createServer()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAccessPoint_Server(),
+                SclFactory.eINSTANCE.createServer() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAccessPoint_Services(),
-                 SclFactory.eINSTANCE.createServices()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAccessPoint_Services(),
+                SclFactory.eINSTANCE.createServices() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAccessPoint_GOOSESecurity(),
-                 SclFactory.eINSTANCE.createGOOSESecurity()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAccessPoint_GOOSESecurity(),
+                SclFactory.eINSTANCE.createGOOSESecurity() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AddressItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AddressItemProvider.java
index a5b1080..3514af7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AddressItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AddressItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class AddressItemProvider 
-    extends SclObjectItemProvider {
+public class AddressItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public AddressItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AddressItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,9 +57,9 @@ public class AddressItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -75,10 +74,10 @@ public class AddressItemProvider
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getAddress_P());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAddress_P() );
         }
         return childrenFeatures;
     }
@@ -89,11 +88,11 @@ public class AddressItemProvider
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -103,8 +102,8 @@ public class AddressItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Address"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Address" ) );
     }
 
     /**
@@ -114,11 +113,10 @@ public class AddressItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Address address = (Address)object;
-        return getString("_UI_Address_type") + " " + address.getLineNumber();
+    public String getText( Object object ) {
+        Address address = ( Address ) object;
+        return getString( "_UI_Address_type" ) + " " + address.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -128,15 +126,15 @@ public class AddressItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(Address.class)) {
-            case SclPackage.ADDRESS__P:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( Address.class ) ) {
+        case SclPackage.ADDRESS__P:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -147,13 +145,11 @@ public class AddressItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAddress_P(),
-                 SclFactory.eINSTANCE.createP()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAddress_P(),
+                SclFactory.eINSTANCE.createP() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgAuthenticationItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgAuthenticationItemProvider.java
index 1fc4c70..8c537af 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgAuthenticationItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgAuthenticationItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgAuthentication;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 
@@ -49,9 +48,9 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * <!-- end-user-doc -->
  * @generated
  */
-public class AgAuthenticationItemProvider 
-    extends ItemProviderAdapter
-    implements
+public class AgAuthenticationItemProvider
+        extends ItemProviderAdapter
+        implements
         IEditingDomainItemProvider,
         IStructuredItemContentProvider,
         ITreeItemContentProvider,
@@ -63,8 +62,8 @@ public class AgAuthenticationItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    public AgAuthenticationItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AgAuthenticationItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -74,15 +73,15 @@ public class AgAuthenticationItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addCertificatePropertyDescriptor(object);
-            addNonePropertyDescriptor(object);
-            addPasswordPropertyDescriptor(object);
-            addStrongPropertyDescriptor(object);
-            addWeakPropertyDescriptor(object);
+            addCertificatePropertyDescriptor( object );
+            addNonePropertyDescriptor( object );
+            addPasswordPropertyDescriptor( object );
+            addStrongPropertyDescriptor( object );
+            addWeakPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -93,20 +92,20 @@ public class AgAuthenticationItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addCertificatePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgAuthentication_certificate_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgAuthentication_certificate_feature", "_UI_AgAuthentication_type"),
-                 SclPackage.eINSTANCE.getAgAuthentication_Certificate(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addCertificatePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgAuthentication_certificate_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgAuthentication_certificate_feature",
+                                "_UI_AgAuthentication_type" ),
+                        SclPackage.eINSTANCE.getAgAuthentication_Certificate(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -115,20 +114,20 @@ public class AgAuthenticationItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNonePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgAuthentication_none_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgAuthentication_none_feature", "_UI_AgAuthentication_type"),
-                 SclPackage.eINSTANCE.getAgAuthentication_None(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNonePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgAuthentication_none_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgAuthentication_none_feature",
+                                "_UI_AgAuthentication_type" ),
+                        SclPackage.eINSTANCE.getAgAuthentication_None(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -137,20 +136,20 @@ public class AgAuthenticationItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPasswordPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgAuthentication_password_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgAuthentication_password_feature", "_UI_AgAuthentication_type"),
-                 SclPackage.eINSTANCE.getAgAuthentication_Password(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPasswordPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgAuthentication_password_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgAuthentication_password_feature",
+                                "_UI_AgAuthentication_type" ),
+                        SclPackage.eINSTANCE.getAgAuthentication_Password(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -159,20 +158,20 @@ public class AgAuthenticationItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addStrongPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgAuthentication_strong_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgAuthentication_strong_feature", "_UI_AgAuthentication_type"),
-                 SclPackage.eINSTANCE.getAgAuthentication_Strong(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addStrongPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgAuthentication_strong_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgAuthentication_strong_feature",
+                                "_UI_AgAuthentication_type" ),
+                        SclPackage.eINSTANCE.getAgAuthentication_Strong(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -181,20 +180,20 @@ public class AgAuthenticationItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addWeakPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgAuthentication_weak_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgAuthentication_weak_feature", "_UI_AgAuthentication_type"),
-                 SclPackage.eINSTANCE.getAgAuthentication_Weak(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addWeakPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgAuthentication_weak_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgAuthentication_weak_feature",
+                                "_UI_AgAuthentication_type" ),
+                        SclPackage.eINSTANCE.getAgAuthentication_Weak(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -204,8 +203,8 @@ public class AgAuthenticationItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AgAuthentication"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/AgAuthentication" ) );
     }
 
     /**
@@ -215,15 +214,13 @@ public class AgAuthenticationItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Boolean labelValue = ((AgAuthentication)object).getCertificate();
+    public String getText( Object object ) {
+        Boolean labelValue = ( ( AgAuthentication ) object ).getCertificate();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ?
-            getString("_UI_AgAuthentication_type") :
-            getString("_UI_AgAuthentication_type") + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_AgAuthentication_type" )
+                : getString( "_UI_AgAuthentication_type" ) + " " + label;
     }
 
-
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
      * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
@@ -232,19 +229,19 @@ public class AgAuthenticationItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(AgAuthentication.class)) {
-            case SclPackage.AG_AUTHENTICATION__CERTIFICATE:
-            case SclPackage.AG_AUTHENTICATION__NONE:
-            case SclPackage.AG_AUTHENTICATION__PASSWORD:
-            case SclPackage.AG_AUTHENTICATION__STRONG:
-            case SclPackage.AG_AUTHENTICATION__WEAK:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( AgAuthentication.class ) ) {
+        case SclPackage.AG_AUTHENTICATION__CERTIFICATE:
+        case SclPackage.AG_AUTHENTICATION__NONE:
+        case SclPackage.AG_AUTHENTICATION__PASSWORD:
+        case SclPackage.AG_AUTHENTICATION__STRONG:
+        case SclPackage.AG_AUTHENTICATION__WEAK:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -255,8 +252,8 @@ public class AgAuthenticationItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgDATrgOpItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgDATrgOpItemProvider.java
index 9cbd619..6fdb6fe 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgDATrgOpItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgDATrgOpItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgDATrgOp;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 
@@ -49,9 +48,9 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * <!-- end-user-doc -->
  * @generated
  */
-public class AgDATrgOpItemProvider 
-    extends ItemProviderAdapter
-    implements
+public class AgDATrgOpItemProvider
+        extends ItemProviderAdapter
+        implements
         IEditingDomainItemProvider,
         IStructuredItemContentProvider,
         ITreeItemContentProvider,
@@ -63,8 +62,8 @@ public class AgDATrgOpItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    public AgDATrgOpItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AgDATrgOpItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -74,13 +73,13 @@ public class AgDATrgOpItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addDchgPropertyDescriptor(object);
-            addDupdPropertyDescriptor(object);
-            addQchgPropertyDescriptor(object);
+            addDchgPropertyDescriptor( object );
+            addDupdPropertyDescriptor( object );
+            addQchgPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -91,20 +90,20 @@ public class AgDATrgOpItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDchgPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgDATrgOp_dchg_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgDATrgOp_dchg_feature", "_UI_AgDATrgOp_type"),
-                 SclPackage.eINSTANCE.getAgDATrgOp_Dchg(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDchgPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgDATrgOp_dchg_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgDATrgOp_dchg_feature",
+                                "_UI_AgDATrgOp_type" ),
+                        SclPackage.eINSTANCE.getAgDATrgOp_Dchg(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -113,20 +112,20 @@ public class AgDATrgOpItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDupdPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgDATrgOp_dupd_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgDATrgOp_dupd_feature", "_UI_AgDATrgOp_type"),
-                 SclPackage.eINSTANCE.getAgDATrgOp_Dupd(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDupdPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgDATrgOp_dupd_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgDATrgOp_dupd_feature",
+                                "_UI_AgDATrgOp_type" ),
+                        SclPackage.eINSTANCE.getAgDATrgOp_Dupd(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -135,20 +134,20 @@ public class AgDATrgOpItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addQchgPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgDATrgOp_qchg_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgDATrgOp_qchg_feature", "_UI_AgDATrgOp_type"),
-                 SclPackage.eINSTANCE.getAgDATrgOp_Qchg(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addQchgPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgDATrgOp_qchg_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgDATrgOp_qchg_feature",
+                                "_UI_AgDATrgOp_type" ),
+                        SclPackage.eINSTANCE.getAgDATrgOp_Qchg(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -158,15 +157,13 @@ public class AgDATrgOpItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Boolean labelValue = ((AgDATrgOp)object).getDchg();
+    public String getText( Object object ) {
+        Boolean labelValue = ( ( AgDATrgOp ) object ).getDchg();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ?
-            getString("_UI_AgDATrgOp_type") :
-            getString("_UI_AgDATrgOp_type") + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_AgDATrgOp_type" )
+                : getString( "_UI_AgDATrgOp_type" ) + " " + label;
     }
 
-
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
      * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
@@ -175,17 +172,17 @@ public class AgDATrgOpItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(AgDATrgOp.class)) {
-            case SclPackage.AG_DA_TRG_OP__DCHG:
-            case SclPackage.AG_DA_TRG_OP__DUPD:
-            case SclPackage.AG_DA_TRG_OP__QCHG:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( AgDATrgOp.class ) ) {
+        case SclPackage.AG_DA_TRG_OP__DCHG:
+        case SclPackage.AG_DA_TRG_OP__DUPD:
+        case SclPackage.AG_DA_TRG_OP__QCHG:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -196,8 +193,8 @@ public class AgDATrgOpItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgDescItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgDescItemProvider.java
index e94b4b7..60e818d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgDescItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgDescItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgDesc;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 
@@ -49,9 +48,9 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * <!-- end-user-doc -->
  * @generated
  */
-public class AgDescItemProvider 
-    extends ItemProviderAdapter
-    implements
+public class AgDescItemProvider
+        extends ItemProviderAdapter
+        implements
         IEditingDomainItemProvider,
         IStructuredItemContentProvider,
         ITreeItemContentProvider,
@@ -63,8 +62,8 @@ public class AgDescItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    public AgDescItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AgDescItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -74,11 +73,11 @@ public class AgDescItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addDescPropertyDescriptor(object);
+            addDescPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -89,20 +88,19 @@ public class AgDescItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDescPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgDesc_desc_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type"),
-                 SclPackage.eINSTANCE.getAgDesc_Desc(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDescPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgDesc_desc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type" ),
+                        SclPackage.eINSTANCE.getAgDesc_Desc(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -112,14 +110,12 @@ public class AgDescItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((AgDesc)object).getDesc();
-        return label == null || label.length() == 0 ?
-            getString("_UI_AgDesc_type") :
-            getString("_UI_AgDesc_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( AgDesc ) object ).getDesc();
+        return label == null || label.length() == 0 ? getString( "_UI_AgDesc_type" )
+                : getString( "_UI_AgDesc_type" ) + " " + label;
     }
 
-
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
      * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
@@ -128,15 +124,15 @@ public class AgDescItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(AgDesc.class)) {
-            case SclPackage.AG_DESC__DESC:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( AgDesc.class ) ) {
+        case SclPackage.AG_DESC__DESC:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -147,8 +143,8 @@ public class AgDescItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgLDRefItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgLDRefItemProvider.java
index 8476a01..442575a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgLDRefItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgLDRefItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgLDRef;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 
@@ -48,8 +47,8 @@ public class AgLDRefItemProvider extends AgDescItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public AgLDRefItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AgLDRefItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,12 +58,12 @@ public class AgLDRefItemProvider extends AgDescItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addIedNamePropertyDescriptor(object);
-            addLdInstPropertyDescriptor(object);
+            addIedNamePropertyDescriptor( object );
+            addLdInstPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class AgLDRefItemProvider extends AgDescItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIedNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLDRef_iedName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLDRef_iedName_feature", "_UI_AgLDRef_type"),
-                 SclPackage.eINSTANCE.getAgLDRef_IedName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIedNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLDRef_iedName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLDRef_iedName_feature",
+                                "_UI_AgLDRef_type" ),
+                        SclPackage.eINSTANCE.getAgLDRef_IedName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class AgLDRefItemProvider extends AgDescItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLdInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLDRef_ldInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLDRef_ldInst_feature", "_UI_AgLDRef_type"),
-                 SclPackage.eINSTANCE.getAgLDRef_LdInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLdInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLDRef_ldInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLDRef_ldInst_feature",
+                                "_UI_AgLDRef_type" ),
+                        SclPackage.eINSTANCE.getAgLDRef_LdInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -120,14 +119,12 @@ public class AgLDRefItemProvider extends AgDescItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((AgLDRef)object).getIedName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_AgLDRef_type") :
-            getString("_UI_AgLDRef_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( AgLDRef ) object ).getIedName();
+        return label == null || label.length() == 0 ? getString( "_UI_AgLDRef_type" )
+                : getString( "_UI_AgLDRef_type" ) + " " + label;
     }
 
-
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
      * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
@@ -136,16 +133,16 @@ public class AgLDRefItemProvider extends AgDescItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(AgLDRef.class)) {
-            case SclPackage.AG_LD_REF__IED_NAME:
-            case SclPackage.AG_LD_REF__LD_INST:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( AgLDRef.class ) ) {
+        case SclPackage.AG_LD_REF__IED_NAME:
+        case SclPackage.AG_LD_REF__LD_INST:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -156,8 +153,8 @@ public class AgLDRefItemProvider extends AgDescItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgLNRefItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgLNRefItemProvider.java
index 0dfff23..99d8721 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgLNRefItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgLNRefItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgLNRef;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 
@@ -48,8 +47,8 @@ public class AgLNRefItemProvider extends AgLDRefItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public AgLNRefItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AgLNRefItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,13 +58,13 @@ public class AgLNRefItemProvider extends AgLDRefItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addLnClassPropertyDescriptor(object);
-            addLnInstPropertyDescriptor(object);
-            addPrefixPropertyDescriptor(object);
+            addLnClassPropertyDescriptor( object );
+            addLnInstPropertyDescriptor( object );
+            addPrefixPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -76,20 +75,20 @@ public class AgLNRefItemProvider extends AgLDRefItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLNRef_lnClass_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLNRef_lnClass_feature", "_UI_AgLNRef_type"),
-                 SclPackage.eINSTANCE.getAgLNRef_LnClass(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnClassPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLNRef_lnClass_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLNRef_lnClass_feature",
+                                "_UI_AgLNRef_type" ),
+                        SclPackage.eINSTANCE.getAgLNRef_LnClass(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -98,20 +97,20 @@ public class AgLNRefItemProvider extends AgLDRefItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLNRef_lnInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLNRef_lnInst_feature", "_UI_AgLNRef_type"),
-                 SclPackage.eINSTANCE.getAgLNRef_LnInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLNRef_lnInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLNRef_lnInst_feature",
+                                "_UI_AgLNRef_type" ),
+                        SclPackage.eINSTANCE.getAgLNRef_LnInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -120,20 +119,20 @@ public class AgLNRefItemProvider extends AgLDRefItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPrefixPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLNRef_prefix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLNRef_prefix_feature", "_UI_AgLNRef_type"),
-                 SclPackage.eINSTANCE.getAgLNRef_Prefix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPrefixPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLNRef_prefix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLNRef_prefix_feature",
+                                "_UI_AgLNRef_type" ),
+                        SclPackage.eINSTANCE.getAgLNRef_Prefix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -143,8 +142,8 @@ public class AgLNRefItemProvider extends AgLDRefItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AgLNRef"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/AgLNRef" ) );
     }
 
     /**
@@ -154,14 +153,12 @@ public class AgLNRefItemProvider extends AgLDRefItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((AgLNRef)object).getIedName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_AgLNRef_type") :
-            getString("_UI_AgLNRef_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( AgLNRef ) object ).getIedName();
+        return label == null || label.length() == 0 ? getString( "_UI_AgLNRef_type" )
+                : getString( "_UI_AgLNRef_type" ) + " " + label;
     }
 
-
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
      * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
@@ -170,17 +167,17 @@ public class AgLNRefItemProvider extends AgLDRefItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(AgLNRef.class)) {
-            case SclPackage.AG_LN_REF__LN_CLASS:
-            case SclPackage.AG_LN_REF__LN_INST:
-            case SclPackage.AG_LN_REF__PREFIX:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( AgLNRef.class ) ) {
+        case SclPackage.AG_LN_REF__LN_CLASS:
+        case SclPackage.AG_LN_REF__LN_INST:
+        case SclPackage.AG_LN_REF__PREFIX:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -191,8 +188,8 @@ public class AgLNRefItemProvider extends AgLDRefItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgOptFieldsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgOptFieldsItemProvider.java
index 70bc1b4..69b2e27 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgOptFieldsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgOptFieldsItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 
@@ -49,9 +48,9 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * <!-- end-user-doc -->
  * @generated
  */
-public class AgOptFieldsItemProvider 
-    extends ItemProviderAdapter
-    implements
+public class AgOptFieldsItemProvider
+        extends ItemProviderAdapter
+        implements
         IEditingDomainItemProvider,
         IStructuredItemContentProvider,
         ITreeItemContentProvider,
@@ -63,8 +62,8 @@ public class AgOptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    public AgOptFieldsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AgOptFieldsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -74,19 +73,19 @@ public class AgOptFieldsItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addBufOvflPropertyDescriptor(object);
-            addConfigRefPropertyDescriptor(object);
-            addDataRefPropertyDescriptor(object);
-            addDataSetPropertyDescriptor(object);
-            addEntryIDPropertyDescriptor(object);
-            addReasonCodePropertyDescriptor(object);
-            addSeqNumPropertyDescriptor(object);
-            addTimeStampPropertyDescriptor(object);
-            addSegmentationPropertyDescriptor(object);
+            addBufOvflPropertyDescriptor( object );
+            addConfigRefPropertyDescriptor( object );
+            addDataRefPropertyDescriptor( object );
+            addDataSetPropertyDescriptor( object );
+            addEntryIDPropertyDescriptor( object );
+            addReasonCodePropertyDescriptor( object );
+            addSeqNumPropertyDescriptor( object );
+            addTimeStampPropertyDescriptor( object );
+            addSegmentationPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -97,20 +96,20 @@ public class AgOptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addBufOvflPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_bufOvfl_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_bufOvfl_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_BufOvfl(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addBufOvflPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_bufOvfl_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_bufOvfl_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_BufOvfl(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,20 +118,20 @@ public class AgOptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addConfigRefPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_configRef_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_configRef_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_ConfigRef(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addConfigRefPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_configRef_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_configRef_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_ConfigRef(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -141,20 +140,20 @@ public class AgOptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDataRefPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_dataRef_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_dataRef_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_DataRef(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDataRefPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_dataRef_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_dataRef_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_DataRef(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -163,20 +162,20 @@ public class AgOptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDataSetPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_dataSet_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_dataSet_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_DataSet(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDataSetPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_dataSet_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_dataSet_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_DataSet(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -185,20 +184,20 @@ public class AgOptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addEntryIDPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_entryID_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_entryID_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_EntryID(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addEntryIDPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_entryID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_entryID_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_EntryID(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -207,20 +206,20 @@ public class AgOptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReasonCodePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_reasonCode_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_reasonCode_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_ReasonCode(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addReasonCodePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_reasonCode_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_reasonCode_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_ReasonCode(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -229,20 +228,20 @@ public class AgOptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSeqNumPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_seqNum_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_seqNum_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_SeqNum(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSeqNumPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_seqNum_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_seqNum_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_SeqNum(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -251,20 +250,20 @@ public class AgOptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTimeStampPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_timeStamp_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_timeStamp_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_TimeStamp(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTimeStampPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_timeStamp_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_timeStamp_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_TimeStamp(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -273,20 +272,20 @@ public class AgOptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSegmentationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_segmentation_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_segmentation_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_Segmentation(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSegmentationPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_segmentation_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_segmentation_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_Segmentation(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -296,15 +295,13 @@ public class AgOptFieldsItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Boolean labelValue = ((AgOptFields)object).getBufOvfl();
+    public String getText( Object object ) {
+        Boolean labelValue = ( ( AgOptFields ) object ).getBufOvfl();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ?
-            getString("_UI_AgOptFields_type") :
-            getString("_UI_AgOptFields_type") + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_AgOptFields_type" )
+                : getString( "_UI_AgOptFields_type" ) + " " + label;
     }
 
-
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
      * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
@@ -313,23 +310,23 @@ public class AgOptFieldsItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(AgOptFields.class)) {
-            case SclPackage.AG_OPT_FIELDS__BUF_OVFL:
-            case SclPackage.AG_OPT_FIELDS__CONFIG_REF:
-            case SclPackage.AG_OPT_FIELDS__DATA_REF:
-            case SclPackage.AG_OPT_FIELDS__DATA_SET:
-            case SclPackage.AG_OPT_FIELDS__ENTRY_ID:
-            case SclPackage.AG_OPT_FIELDS__REASON_CODE:
-            case SclPackage.AG_OPT_FIELDS__SEQ_NUM:
-            case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
-            case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( AgOptFields.class ) ) {
+        case SclPackage.AG_OPT_FIELDS__BUF_OVFL:
+        case SclPackage.AG_OPT_FIELDS__CONFIG_REF:
+        case SclPackage.AG_OPT_FIELDS__DATA_REF:
+        case SclPackage.AG_OPT_FIELDS__DATA_SET:
+        case SclPackage.AG_OPT_FIELDS__ENTRY_ID:
+        case SclPackage.AG_OPT_FIELDS__REASON_CODE:
+        case SclPackage.AG_OPT_FIELDS__SEQ_NUM:
+        case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
+        case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -340,8 +337,8 @@ public class AgOptFieldsItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgSmvOptsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgSmvOptsItemProvider.java
index 349fb1e..b8a36b3 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgSmvOptsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgSmvOptsItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 
@@ -49,9 +48,9 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * <!-- end-user-doc -->
  * @generated
  */
-public class AgSmvOptsItemProvider 
-    extends ItemProviderAdapter
-    implements
+public class AgSmvOptsItemProvider
+        extends ItemProviderAdapter
+        implements
         IEditingDomainItemProvider,
         IStructuredItemContentProvider,
         ITreeItemContentProvider,
@@ -63,8 +62,8 @@ public class AgSmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    public AgSmvOptsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AgSmvOptsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -74,18 +73,18 @@ public class AgSmvOptsItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addDataSetPropertyDescriptor(object);
-            addRefreshTimePropertyDescriptor(object);
-            addSampleRatePropertyDescriptor(object);
-            addSampleSynchronizedPropertyDescriptor(object);
-            addSecurityPropertyDescriptor(object);
-            addTimestampPropertyDescriptor(object);
-            addSynchSourceIdPropertyDescriptor(object);
-            addDataRefPropertyDescriptor(object);
+            addDataSetPropertyDescriptor( object );
+            addRefreshTimePropertyDescriptor( object );
+            addSampleRatePropertyDescriptor( object );
+            addSampleSynchronizedPropertyDescriptor( object );
+            addSecurityPropertyDescriptor( object );
+            addTimestampPropertyDescriptor( object );
+            addSynchSourceIdPropertyDescriptor( object );
+            addDataRefPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -96,20 +95,20 @@ public class AgSmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDataSetPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_dataSet_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_dataSet_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_DataSet(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDataSetPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_dataSet_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_dataSet_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_DataSet(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -118,20 +117,20 @@ public class AgSmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefreshTimePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_refreshTime_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_refreshTime_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_RefreshTime(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addRefreshTimePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_refreshTime_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_refreshTime_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_RefreshTime(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -140,20 +139,20 @@ public class AgSmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSampleRatePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_sampleRate_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_sampleRate_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_SampleRate(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSampleRatePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_sampleRate_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_sampleRate_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_SampleRate(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -162,20 +161,20 @@ public class AgSmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSampleSynchronizedPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_sampleSynchronized_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_sampleSynchronized_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_SampleSynchronized(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSampleSynchronizedPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_sampleSynchronized_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_sampleSynchronized_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_SampleSynchronized(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -184,20 +183,20 @@ public class AgSmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSecurityPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_security_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_security_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_Security(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSecurityPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_security_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_security_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_Security(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -206,20 +205,20 @@ public class AgSmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTimestampPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_timestamp_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_timestamp_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_Timestamp(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTimestampPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_timestamp_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_timestamp_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_Timestamp(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -228,20 +227,20 @@ public class AgSmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSynchSourceIdPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_synchSourceId_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_synchSourceId_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_SynchSourceId(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSynchSourceIdPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_synchSourceId_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_synchSourceId_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_SynchSourceId(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -250,20 +249,20 @@ public class AgSmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDataRefPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_dataRef_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_dataRef_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_DataRef(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDataRefPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_dataRef_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_dataRef_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_DataRef(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -273,15 +272,13 @@ public class AgSmvOptsItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Boolean labelValue = ((AgSmvOpts)object).getDataSet();
+    public String getText( Object object ) {
+        Boolean labelValue = ( ( AgSmvOpts ) object ).getDataSet();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ?
-            getString("_UI_AgSmvOpts_type") :
-            getString("_UI_AgSmvOpts_type") + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_AgSmvOpts_type" )
+                : getString( "_UI_AgSmvOpts_type" ) + " " + label;
     }
 
-
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
      * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
@@ -290,22 +287,22 @@ public class AgSmvOptsItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(AgSmvOpts.class)) {
-            case SclPackage.AG_SMV_OPTS__DATA_SET:
-            case SclPackage.AG_SMV_OPTS__REFRESH_TIME:
-            case SclPackage.AG_SMV_OPTS__SAMPLE_RATE:
-            case SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED:
-            case SclPackage.AG_SMV_OPTS__SECURITY:
-            case SclPackage.AG_SMV_OPTS__TIMESTAMP:
-            case SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID:
-            case SclPackage.AG_SMV_OPTS__DATA_REF:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( AgSmvOpts.class ) ) {
+        case SclPackage.AG_SMV_OPTS__DATA_SET:
+        case SclPackage.AG_SMV_OPTS__REFRESH_TIME:
+        case SclPackage.AG_SMV_OPTS__SAMPLE_RATE:
+        case SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED:
+        case SclPackage.AG_SMV_OPTS__SECURITY:
+        case SclPackage.AG_SMV_OPTS__TIMESTAMP:
+        case SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID:
+        case SclPackage.AG_SMV_OPTS__DATA_REF:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -316,8 +313,8 @@ public class AgSmvOptsItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgVirtualItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgVirtualItemProvider.java
index 2de8c3a..4d0720b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgVirtualItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AgVirtualItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgVirtual;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 
@@ -49,9 +48,9 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * <!-- end-user-doc -->
  * @generated
  */
-public class AgVirtualItemProvider 
-    extends ItemProviderAdapter
-    implements
+public class AgVirtualItemProvider
+        extends ItemProviderAdapter
+        implements
         IEditingDomainItemProvider,
         IStructuredItemContentProvider,
         ITreeItemContentProvider,
@@ -63,8 +62,8 @@ public class AgVirtualItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    public AgVirtualItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AgVirtualItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -74,11 +73,11 @@ public class AgVirtualItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addVirtualPropertyDescriptor(object);
+            addVirtualPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -89,20 +88,20 @@ public class AgVirtualItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addVirtualPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgVirtual_virtual_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgVirtual_virtual_feature", "_UI_AgVirtual_type"),
-                 SclPackage.eINSTANCE.getAgVirtual_Virtual(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addVirtualPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgVirtual_virtual_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgVirtual_virtual_feature",
+                                "_UI_AgVirtual_type" ),
+                        SclPackage.eINSTANCE.getAgVirtual_Virtual(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -112,15 +111,13 @@ public class AgVirtualItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Boolean labelValue = ((AgVirtual)object).getVirtual();
+    public String getText( Object object ) {
+        Boolean labelValue = ( ( AgVirtual ) object ).getVirtual();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ?
-            getString("_UI_AgVirtual_type") :
-            getString("_UI_AgVirtual_type") + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_AgVirtual_type" )
+                : getString( "_UI_AgVirtual_type" ) + " " + label;
     }
 
-
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
      * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
@@ -129,15 +126,15 @@ public class AgVirtualItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(AgVirtual.class)) {
-            case SclPackage.AG_VIRTUAL__VIRTUAL:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( AgVirtual.class ) ) {
+        case SclPackage.AG_VIRTUAL__VIRTUAL:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -148,8 +145,8 @@ public class AgVirtualItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyContentFromOtherNamespaceItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyContentFromOtherNamespaceItemProvider.java
index 13911bc..5a482f2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyContentFromOtherNamespaceItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyContentFromOtherNamespaceItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -41,135 +40,123 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class AnyContentFromOtherNamespaceItemProvider 
-	extends SclObjectItemProvider {
-	/**
+public class AnyContentFromOtherNamespaceItemProvider
+        extends SclObjectItemProvider {
+    /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	public AnyContentFromOtherNamespaceItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AnyContentFromOtherNamespaceItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
-	/**
+    /**
      * This returns the property descriptors for the adapted class.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    @Override
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
     }
 
-	/**
+    /**
      * 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.MoveCommand} in {@link #createCommand}.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_Mixed());
-            childrenFeatures.add(SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_AnyAttribute());
+    @Override
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_Mixed() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_AnyAttribute() );
         }
         return childrenFeatures;
     }
 
-	/**
+    /**
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
+    @Override
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
-	/**
+    /**
      * This returns the label text for the adapted class.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	@Override
-	public String getText(Object object) {
-        AnyContentFromOtherNamespace anyContentFromOtherNamespace = (AnyContentFromOtherNamespace)object;
-        return getString("_UI_AnyContentFromOtherNamespace_type") + " " + anyContentFromOtherNamespace.getLineNumber();
+    @Override
+    public String getText( Object object ) {
+        AnyContentFromOtherNamespace anyContentFromOtherNamespace = ( AnyContentFromOtherNamespace ) object;
+        return getString( "_UI_AnyContentFromOtherNamespace_type" ) + " "
+                + anyContentFromOtherNamespace.getLineNumber();
     }
-	
 
-	/**
+    /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
      * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	@Override
-	public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(AnyContentFromOtherNamespace.class)) {
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__MIXED:
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY_ATTRIBUTE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    @Override
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( AnyContentFromOtherNamespace.class ) ) {
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__MIXED:
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY_ATTRIBUTE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
-	/**
+    /**
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
      * that can be created under this object.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_Mixed(),
-                 FeatureMapUtil.createEntry
-                    (XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
-                     "")));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_Mixed(),
-                 FeatureMapUtil.createEntry
-                    (XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
-                     "")));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_Mixed(),
-                 FeatureMapUtil.createEntry
-                    (XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
-                     XMLTypeFactory.eINSTANCE.createProcessingInstruction())));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_Mixed(),
-                 FeatureMapUtil.createEntry
-                    (XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
-                     "")));
+    @Override
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_Mixed(),
+                FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT,
+                        "" ) ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_Mixed(),
+                FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT,
+                        "" ) ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_Mixed(),
+                FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION,
+                        XMLTypeFactory.eINSTANCE.createProcessingInstruction() ) ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_Mixed(),
+                FeatureMapUtil.createEntry( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA,
+                        "" ) ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyLNItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyLNItemProvider.java
index 66e5b10..25d8f5c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyLNItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyLNItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public AnyLNItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AnyLNItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,19 +58,19 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addInstPropertyDescriptor(object);
-            addLnClassPropertyDescriptor(object);
-            addLnTypePropertyDescriptor(object);
-            addRefersToLNodeTypePropertyDescriptor(object);
-            addReferredByClientLNPropertyDescriptor(object);
-            addReferredByLogControlPropertyDescriptor(object);
-            addReferredByAssociationPropertyDescriptor(object);
-            addReferredByIEDNamePropertyDescriptor(object);
-            addReferredByLNodePropertyDescriptor(object);
+            addInstPropertyDescriptor( object );
+            addLnClassPropertyDescriptor( object );
+            addLnTypePropertyDescriptor( object );
+            addRefersToLNodeTypePropertyDescriptor( object );
+            addReferredByClientLNPropertyDescriptor( object );
+            addReferredByLogControlPropertyDescriptor( object );
+            addReferredByAssociationPropertyDescriptor( object );
+            addReferredByIEDNamePropertyDescriptor( object );
+            addReferredByLNodePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -82,20 +81,19 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AnyLN_inst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AnyLN_inst_feature", "_UI_AnyLN_type"),
-                 SclPackage.eINSTANCE.getAnyLN_Inst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AnyLN_inst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AnyLN_inst_feature", "_UI_AnyLN_type" ),
+                        SclPackage.eINSTANCE.getAnyLN_Inst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -104,20 +102,20 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AnyLN_lnClass_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AnyLN_lnClass_feature", "_UI_AnyLN_type"),
-                 SclPackage.eINSTANCE.getAnyLN_LnClass(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnClassPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AnyLN_lnClass_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AnyLN_lnClass_feature",
+                                "_UI_AnyLN_type" ),
+                        SclPackage.eINSTANCE.getAnyLN_LnClass(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -126,20 +124,19 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AnyLN_lnType_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AnyLN_lnType_feature", "_UI_AnyLN_type"),
-                 SclPackage.eINSTANCE.getAnyLN_LnType(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AnyLN_lnType_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AnyLN_lnType_feature", "_UI_AnyLN_type" ),
+                        SclPackage.eINSTANCE.getAnyLN_LnType(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -148,20 +145,20 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToLNodeTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AnyLN_RefersToLNodeType_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AnyLN_RefersToLNodeType_feature", "_UI_AnyLN_type"),
-                 SclPackage.eINSTANCE.getAnyLN_RefersToLNodeType(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToLNodeTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AnyLN_RefersToLNodeType_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AnyLN_RefersToLNodeType_feature",
+                                "_UI_AnyLN_type" ),
+                        SclPackage.eINSTANCE.getAnyLN_RefersToLNodeType(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -170,20 +167,20 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByClientLNPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AnyLN_ReferredByClientLN_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AnyLN_ReferredByClientLN_feature", "_UI_AnyLN_type"),
-                 SclPackage.eINSTANCE.getAnyLN_ReferredByClientLN(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByClientLNPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AnyLN_ReferredByClientLN_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AnyLN_ReferredByClientLN_feature",
+                                "_UI_AnyLN_type" ),
+                        SclPackage.eINSTANCE.getAnyLN_ReferredByClientLN(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -192,20 +189,20 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByLogControlPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AnyLN_ReferredByLogControl_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AnyLN_ReferredByLogControl_feature", "_UI_AnyLN_type"),
-                 SclPackage.eINSTANCE.getAnyLN_ReferredByLogControl(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByLogControlPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AnyLN_ReferredByLogControl_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AnyLN_ReferredByLogControl_feature",
+                                "_UI_AnyLN_type" ),
+                        SclPackage.eINSTANCE.getAnyLN_ReferredByLogControl(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -214,20 +211,20 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByAssociationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AnyLN_ReferredByAssociation_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AnyLN_ReferredByAssociation_feature", "_UI_AnyLN_type"),
-                 SclPackage.eINSTANCE.getAnyLN_ReferredByAssociation(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByAssociationPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AnyLN_ReferredByAssociation_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AnyLN_ReferredByAssociation_feature",
+                                "_UI_AnyLN_type" ),
+                        SclPackage.eINSTANCE.getAnyLN_ReferredByAssociation(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -236,20 +233,20 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByIEDNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AnyLN_ReferredByIEDName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AnyLN_ReferredByIEDName_feature", "_UI_AnyLN_type"),
-                 SclPackage.eINSTANCE.getAnyLN_ReferredByIEDName(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByIEDNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AnyLN_ReferredByIEDName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AnyLN_ReferredByIEDName_feature",
+                                "_UI_AnyLN_type" ),
+                        SclPackage.eINSTANCE.getAnyLN_ReferredByIEDName(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -258,20 +255,20 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * <!-- 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));
+    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 ) );
     }
 
     /**
@@ -283,16 +280,16 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getAnyLN_Inputs());
-            childrenFeatures.add(SclPackage.eINSTANCE.getAnyLN_Log());
-            childrenFeatures.add(SclPackage.eINSTANCE.getAnyLN_DOI());
-            childrenFeatures.add(SclPackage.eINSTANCE.getAnyLN_ReportControl());
-            childrenFeatures.add(SclPackage.eINSTANCE.getAnyLN_LogControl());
-            childrenFeatures.add(SclPackage.eINSTANCE.getAnyLN_DataSet());
-            childrenFeatures.add(SclPackage.eINSTANCE.getAnyLN_Control());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAnyLN_Inputs() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAnyLN_Log() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAnyLN_DOI() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAnyLN_ReportControl() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAnyLN_LogControl() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAnyLN_DataSet() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getAnyLN_Control() );
         }
         return childrenFeatures;
     }
@@ -303,11 +300,11 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -317,8 +314,8 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AnyLN"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/AnyLN" ) );
     }
 
     /**
@@ -328,11 +325,10 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        AnyLN anyLN = (AnyLN)object;
-        return getString("_UI_AnyLN_type") + " " + anyLN.getLineNumber();
+    public String getText( Object object ) {
+        AnyLN anyLN = ( AnyLN ) object;
+        return getString( "_UI_AnyLN_type" ) + " " + anyLN.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -342,26 +338,26 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(AnyLN.class)) {
-            case SclPackage.ANY_LN__INST:
-            case SclPackage.ANY_LN__LN_CLASS:
-            case SclPackage.ANY_LN__LN_TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.ANY_LN__INPUTS:
-            case SclPackage.ANY_LN__LOG:
-            case SclPackage.ANY_LN__DOI:
-            case SclPackage.ANY_LN__REPORT_CONTROL:
-            case SclPackage.ANY_LN__LOG_CONTROL:
-            case SclPackage.ANY_LN__DATA_SET:
-            case SclPackage.ANY_LN__CONTROL:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( AnyLN.class ) ) {
+        case SclPackage.ANY_LN__INST:
+        case SclPackage.ANY_LN__LN_CLASS:
+        case SclPackage.ANY_LN__LN_TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.ANY_LN__INPUTS:
+        case SclPackage.ANY_LN__LOG:
+        case SclPackage.ANY_LN__DOI:
+        case SclPackage.ANY_LN__REPORT_CONTROL:
+        case SclPackage.ANY_LN__LOG_CONTROL:
+        case SclPackage.ANY_LN__DATA_SET:
+        case SclPackage.ANY_LN__CONTROL:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -372,38 +368,26 @@ public class AnyLNItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAnyLN_Inputs(),
-                 SclFactory.eINSTANCE.createInputs()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAnyLN_Inputs(),
+                SclFactory.eINSTANCE.createInputs() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAnyLN_Log(),
-                 SclFactory.eINSTANCE.createLog()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAnyLN_Log(),
+                SclFactory.eINSTANCE.createLog() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAnyLN_DOI(),
-                 SclFactory.eINSTANCE.createDOI()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAnyLN_DOI(),
+                SclFactory.eINSTANCE.createDOI() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAnyLN_ReportControl(),
-                 SclFactory.eINSTANCE.createReportControl()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAnyLN_ReportControl(),
+                SclFactory.eINSTANCE.createReportControl() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAnyLN_LogControl(),
-                 SclFactory.eINSTANCE.createLogControl()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAnyLN_LogControl(),
+                SclFactory.eINSTANCE.createLogControl() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getAnyLN_DataSet(),
-                 SclFactory.eINSTANCE.createDataSet()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getAnyLN_DataSet(),
+                SclFactory.eINSTANCE.createDataSet() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AssociationItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AssociationItemProvider.java
index b62f551..125f258 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AssociationItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AssociationItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public AssociationItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AssociationItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,19 +56,19 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addDescPropertyDescriptor(object);
-            addIedNamePropertyDescriptor(object);
-            addLdInstPropertyDescriptor(object);
-            addLnClassPropertyDescriptor(object);
-            addLnInstPropertyDescriptor(object);
-            addPrefixPropertyDescriptor(object);
-            addAssociationIDPropertyDescriptor(object);
-            addKindPropertyDescriptor(object);
-            addRefersToAnyLNPropertyDescriptor(object);
+            addDescPropertyDescriptor( object );
+            addIedNamePropertyDescriptor( object );
+            addLdInstPropertyDescriptor( object );
+            addLnClassPropertyDescriptor( object );
+            addLnInstPropertyDescriptor( object );
+            addPrefixPropertyDescriptor( object );
+            addAssociationIDPropertyDescriptor( object );
+            addKindPropertyDescriptor( object );
+            addRefersToAnyLNPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -80,20 +79,19 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDescPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgDesc_desc_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type"),
-                 SclPackage.eINSTANCE.getAgDesc_Desc(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDescPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgDesc_desc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type" ),
+                        SclPackage.eINSTANCE.getAgDesc_Desc(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -102,20 +100,20 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addAssociationIDPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Association_associationID_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Association_associationID_feature", "_UI_Association_type"),
-                 SclPackage.eINSTANCE.getAssociation_AssociationID(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addAssociationIDPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Association_associationID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Association_associationID_feature",
+                                "_UI_Association_type" ),
+                        SclPackage.eINSTANCE.getAssociation_AssociationID(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -124,20 +122,20 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIedNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLDRef_iedName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLDRef_iedName_feature", "_UI_AgLDRef_type"),
-                 SclPackage.eINSTANCE.getAgLDRef_IedName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIedNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLDRef_iedName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLDRef_iedName_feature",
+                                "_UI_AgLDRef_type" ),
+                        SclPackage.eINSTANCE.getAgLDRef_IedName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -146,20 +144,20 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addKindPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Association_kind_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Association_kind_feature", "_UI_Association_type"),
-                 SclPackage.eINSTANCE.getAssociation_Kind(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addKindPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Association_kind_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Association_kind_feature",
+                                "_UI_Association_type" ),
+                        SclPackage.eINSTANCE.getAssociation_Kind(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -168,20 +166,20 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLdInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLDRef_ldInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLDRef_ldInst_feature", "_UI_AgLDRef_type"),
-                 SclPackage.eINSTANCE.getAgLDRef_LdInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLdInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLDRef_ldInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLDRef_ldInst_feature",
+                                "_UI_AgLDRef_type" ),
+                        SclPackage.eINSTANCE.getAgLDRef_LdInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -190,20 +188,20 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLNRef_lnClass_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLNRef_lnClass_feature", "_UI_AgLNRef_type"),
-                 SclPackage.eINSTANCE.getAgLNRef_LnClass(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnClassPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLNRef_lnClass_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLNRef_lnClass_feature",
+                                "_UI_AgLNRef_type" ),
+                        SclPackage.eINSTANCE.getAgLNRef_LnClass(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -212,20 +210,20 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLNRef_lnInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLNRef_lnInst_feature", "_UI_AgLNRef_type"),
-                 SclPackage.eINSTANCE.getAgLNRef_LnInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLNRef_lnInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLNRef_lnInst_feature",
+                                "_UI_AgLNRef_type" ),
+                        SclPackage.eINSTANCE.getAgLNRef_LnInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -234,20 +232,20 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPrefixPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLNRef_prefix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLNRef_prefix_feature", "_UI_AgLNRef_type"),
-                 SclPackage.eINSTANCE.getAgLNRef_Prefix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPrefixPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLNRef_prefix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLNRef_prefix_feature",
+                                "_UI_AgLNRef_type" ),
+                        SclPackage.eINSTANCE.getAgLNRef_Prefix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -256,20 +254,20 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToAnyLNPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Association_RefersToAnyLN_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Association_RefersToAnyLN_feature", "_UI_Association_type"),
-                 SclPackage.eINSTANCE.getAssociation_RefersToAnyLN(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToAnyLNPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Association_RefersToAnyLN_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Association_RefersToAnyLN_feature",
+                                "_UI_Association_type" ),
+                        SclPackage.eINSTANCE.getAssociation_RefersToAnyLN(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -279,8 +277,8 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Association"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Association" ) );
     }
 
     /**
@@ -290,13 +288,11 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((Association)object).getIedName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Association_type") :
-            getString("_UI_Association_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( Association ) object ).getIedName();
+        return label == null || label.length() == 0 ? getString( "_UI_Association_type" )
+                : getString( "_UI_Association_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -306,22 +302,22 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(Association.class)) {
-            case SclPackage.ASSOCIATION__DESC:
-            case SclPackage.ASSOCIATION__IED_NAME:
-            case SclPackage.ASSOCIATION__LD_INST:
-            case SclPackage.ASSOCIATION__LN_CLASS:
-            case SclPackage.ASSOCIATION__LN_INST:
-            case SclPackage.ASSOCIATION__PREFIX:
-            case SclPackage.ASSOCIATION__ASSOCIATION_ID:
-            case SclPackage.ASSOCIATION__KIND:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( Association.class ) ) {
+        case SclPackage.ASSOCIATION__DESC:
+        case SclPackage.ASSOCIATION__IED_NAME:
+        case SclPackage.ASSOCIATION__LD_INST:
+        case SclPackage.ASSOCIATION__LN_CLASS:
+        case SclPackage.ASSOCIATION__LN_INST:
+        case SclPackage.ASSOCIATION__PREFIX:
+        case SclPackage.ASSOCIATION__ASSOCIATION_ID:
+        case SclPackage.ASSOCIATION__KIND:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -332,8 +328,8 @@ public class AssociationItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AuthenticationItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AuthenticationItemProvider.java
index 01f5b67..c99b335 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AuthenticationItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AuthenticationItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class AuthenticationItemProvider 
-    extends SclObjectItemProvider {
+public class AuthenticationItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public AuthenticationItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public AuthenticationItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,15 +57,15 @@ public class AuthenticationItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
-
-            addCertificatePropertyDescriptor(object);
-            addNonePropertyDescriptor(object);
-            addPasswordPropertyDescriptor(object);
-            addStrongPropertyDescriptor(object);
-            addWeakPropertyDescriptor(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
+
+            addCertificatePropertyDescriptor( object );
+            addNonePropertyDescriptor( object );
+            addPasswordPropertyDescriptor( object );
+            addStrongPropertyDescriptor( object );
+            addWeakPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -77,20 +76,20 @@ public class AuthenticationItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addCertificatePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgAuthentication_certificate_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgAuthentication_certificate_feature", "_UI_AgAuthentication_type"),
-                 SclPackage.eINSTANCE.getAgAuthentication_Certificate(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addCertificatePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgAuthentication_certificate_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgAuthentication_certificate_feature",
+                                "_UI_AgAuthentication_type" ),
+                        SclPackage.eINSTANCE.getAgAuthentication_Certificate(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,20 +98,20 @@ public class AuthenticationItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNonePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgAuthentication_none_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgAuthentication_none_feature", "_UI_AgAuthentication_type"),
-                 SclPackage.eINSTANCE.getAgAuthentication_None(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNonePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgAuthentication_none_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgAuthentication_none_feature",
+                                "_UI_AgAuthentication_type" ),
+                        SclPackage.eINSTANCE.getAgAuthentication_None(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -121,20 +120,20 @@ public class AuthenticationItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPasswordPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgAuthentication_password_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgAuthentication_password_feature", "_UI_AgAuthentication_type"),
-                 SclPackage.eINSTANCE.getAgAuthentication_Password(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPasswordPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgAuthentication_password_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgAuthentication_password_feature",
+                                "_UI_AgAuthentication_type" ),
+                        SclPackage.eINSTANCE.getAgAuthentication_Password(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -143,20 +142,20 @@ public class AuthenticationItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addStrongPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgAuthentication_strong_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgAuthentication_strong_feature", "_UI_AgAuthentication_type"),
-                 SclPackage.eINSTANCE.getAgAuthentication_Strong(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addStrongPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgAuthentication_strong_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgAuthentication_strong_feature",
+                                "_UI_AgAuthentication_type" ),
+                        SclPackage.eINSTANCE.getAgAuthentication_Strong(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -165,20 +164,20 @@ public class AuthenticationItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addWeakPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgAuthentication_weak_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgAuthentication_weak_feature", "_UI_AgAuthentication_type"),
-                 SclPackage.eINSTANCE.getAgAuthentication_Weak(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addWeakPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgAuthentication_weak_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgAuthentication_weak_feature",
+                                "_UI_AgAuthentication_type" ),
+                        SclPackage.eINSTANCE.getAgAuthentication_Weak(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -188,8 +187,8 @@ public class AuthenticationItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Authentication"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Authentication" ) );
     }
 
     /**
@@ -199,11 +198,10 @@ public class AuthenticationItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Authentication authentication = (Authentication)object;
-        return getString("_UI_Authentication_type") + " " + authentication.getLineNumber();
+    public String getText( Object object ) {
+        Authentication authentication = ( Authentication ) object;
+        return getString( "_UI_Authentication_type" ) + " " + authentication.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -213,19 +211,19 @@ public class AuthenticationItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(Authentication.class)) {
-            case SclPackage.AUTHENTICATION__CERTIFICATE:
-            case SclPackage.AUTHENTICATION__NONE:
-            case SclPackage.AUTHENTICATION__PASSWORD:
-            case SclPackage.AUTHENTICATION__STRONG:
-            case SclPackage.AUTHENTICATION__WEAK:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( Authentication.class ) ) {
+        case SclPackage.AUTHENTICATION__CERTIFICATE:
+        case SclPackage.AUTHENTICATION__NONE:
+        case SclPackage.AUTHENTICATION__PASSWORD:
+        case SclPackage.AUTHENTICATION__STRONG:
+        case SclPackage.AUTHENTICATION__WEAK:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -236,8 +234,8 @@ public class AuthenticationItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BDAItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BDAItemProvider.java
index 74a4efc..89f1d47 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BDAItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BDAItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class BDAItemProvider extends AbstractDataAttributeItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public BDAItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public BDAItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class BDAItemProvider extends AbstractDataAttributeItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class BDAItemProvider extends AbstractDataAttributeItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BDA"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/BDA" ) );
     }
 
     /**
@@ -79,13 +78,11 @@ public class BDAItemProvider extends AbstractDataAttributeItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((BDA)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_BDA_type") :
-            getString("_UI_BDA_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( BDA ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_BDA_type" )
+                : getString( "_UI_BDA_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -95,9 +92,8 @@ public class BDAItemProvider extends AbstractDataAttributeItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -108,8 +104,8 @@ public class BDAItemProvider extends AbstractDataAttributeItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BaseElementItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BaseElementItemProvider.java
index 267df86..4dd82aa 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BaseElementItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BaseElementItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class BaseElementItemProvider 
-    extends SclObjectItemProvider {
+public class BaseElementItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public BaseElementItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public BaseElementItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,9 +57,9 @@ public class BaseElementItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -75,13 +74,13 @@ public class BaseElementItemProvider
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getBaseElement_Private());
-            childrenFeatures.add(SclPackage.eINSTANCE.getBaseElement_Text());
-            childrenFeatures.add(SclPackage.eINSTANCE.getBaseElement_Any());
-            childrenFeatures.add(SclPackage.eINSTANCE.getBaseElement_AnyAttribute());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getBaseElement_Private() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getBaseElement_Text() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getBaseElement_Any() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getBaseElement_AnyAttribute() );
         }
         return childrenFeatures;
     }
@@ -92,11 +91,11 @@ public class BaseElementItemProvider
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -106,8 +105,8 @@ public class BaseElementItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BaseElement"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/BaseElement" ) );
     }
 
     /**
@@ -117,11 +116,10 @@ public class BaseElementItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        BaseElement baseElement = (BaseElement)object;
-        return getString("_UI_BaseElement_type") + " " + baseElement.getLineNumber();
+    public String getText( Object object ) {
+        BaseElement baseElement = ( BaseElement ) object;
+        return getString( "_UI_BaseElement_type" ) + " " + baseElement.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -131,18 +129,18 @@ public class BaseElementItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(BaseElement.class)) {
-            case SclPackage.BASE_ELEMENT__PRIVATE:
-            case SclPackage.BASE_ELEMENT__TEXT:
-            case SclPackage.BASE_ELEMENT__ANY:
-            case SclPackage.BASE_ELEMENT__ANY_ATTRIBUTE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( BaseElement.class ) ) {
+        case SclPackage.BASE_ELEMENT__PRIVATE:
+        case SclPackage.BASE_ELEMENT__TEXT:
+        case SclPackage.BASE_ELEMENT__ANY:
+        case SclPackage.BASE_ELEMENT__ANY_ATTRIBUTE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -153,18 +151,14 @@ public class BaseElementItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getBaseElement_Private(),
-                 SclFactory.eINSTANCE.createPrivate()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getBaseElement_Text(),
-                 SclFactory.eINSTANCE.createText()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getBaseElement_Private(),
+                SclFactory.eINSTANCE.createPrivate() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getBaseElement_Text(),
+                SclFactory.eINSTANCE.createText() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BayItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BayItemProvider.java
index b6beaf8..d027d55 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BayItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BayItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class BayItemProvider extends EquipmentContainerItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public BayItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public BayItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,9 +56,9 @@ public class BayItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -74,12 +73,12 @@ public class BayItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getBay_Function());
-            childrenFeatures.add(SclPackage.eINSTANCE.getBay_ConnectivityNode());
-            childrenFeatures.add(SclPackage.eINSTANCE.getBay_ConductingEquipment());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getBay_Function() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getBay_ConnectivityNode() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getBay_ConductingEquipment() );
         }
         return childrenFeatures;
     }
@@ -90,11 +89,11 @@ public class BayItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -104,8 +103,8 @@ public class BayItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Bay"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Bay" ) );
     }
 
     /**
@@ -115,13 +114,11 @@ public class BayItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((Bay)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Bay_type") :
-            getString("_UI_Bay_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( Bay ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_Bay_type" )
+                : getString( "_UI_Bay_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -131,17 +128,17 @@ public class BayItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(Bay.class)) {
-            case SclPackage.BAY__FUNCTION:
-            case SclPackage.BAY__CONNECTIVITY_NODE:
-            case SclPackage.BAY__CONDUCTING_EQUIPMENT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( Bay.class ) ) {
+        case SclPackage.BAY__FUNCTION:
+        case SclPackage.BAY__CONNECTIVITY_NODE:
+        case SclPackage.BAY__CONDUCTING_EQUIPMENT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -152,23 +149,17 @@ public class BayItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getBay_Function(),
-                 SclFactory.eINSTANCE.createFunction()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getBay_ConnectivityNode(),
-                 SclFactory.eINSTANCE.createConnectivityNode()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getBay_ConductingEquipment(),
-                 SclFactory.eINSTANCE.createConductingEquipment()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getBay_Function(),
+                SclFactory.eINSTANCE.createFunction() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getBay_ConnectivityNode(),
+                SclFactory.eINSTANCE.createConnectivityNode() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getBay_ConductingEquipment(),
+                SclFactory.eINSTANCE.createConductingEquipment() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateInMbPerSecItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateInMbPerSecItemProvider.java
index 096b710..dfdd0cd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateInMbPerSecItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateInMbPerSecItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class BitRateInMbPerSecItemProvider 
-    extends SclObjectItemProvider {
+public class BitRateInMbPerSecItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public BitRateInMbPerSecItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public BitRateInMbPerSecItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,13 +57,13 @@ public class BitRateInMbPerSecItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addValuePropertyDescriptor(object);
-            addMultiplierPropertyDescriptor(object);
-            addUnitPropertyDescriptor(object);
+            addValuePropertyDescriptor( object );
+            addMultiplierPropertyDescriptor( object );
+            addUnitPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class BitRateInMbPerSecItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addValuePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_BitRateInMbPerSec_value_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_BitRateInMbPerSec_value_feature", "_UI_BitRateInMbPerSec_type"),
-                 SclPackage.eINSTANCE.getBitRateInMbPerSec_Value(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValuePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_BitRateInMbPerSec_value_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_BitRateInMbPerSec_value_feature",
+                                "_UI_BitRateInMbPerSec_type" ),
+                        SclPackage.eINSTANCE.getBitRateInMbPerSec_Value(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class BitRateInMbPerSecItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMultiplierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_BitRateInMbPerSec_multiplier_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_BitRateInMbPerSec_multiplier_feature", "_UI_BitRateInMbPerSec_type"),
-                 SclPackage.eINSTANCE.getBitRateInMbPerSec_Multiplier(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMultiplierPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_BitRateInMbPerSec_multiplier_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_BitRateInMbPerSec_multiplier_feature",
+                                "_UI_BitRateInMbPerSec_type" ),
+                        SclPackage.eINSTANCE.getBitRateInMbPerSec_Multiplier(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,20 +118,20 @@ public class BitRateInMbPerSecItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addUnitPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_BitRateInMbPerSec_unit_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_BitRateInMbPerSec_unit_feature", "_UI_BitRateInMbPerSec_type"),
-                 SclPackage.eINSTANCE.getBitRateInMbPerSec_Unit(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addUnitPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_BitRateInMbPerSec_unit_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_BitRateInMbPerSec_unit_feature",
+                                "_UI_BitRateInMbPerSec_type" ),
+                        SclPackage.eINSTANCE.getBitRateInMbPerSec_Unit(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -142,8 +141,8 @@ public class BitRateInMbPerSecItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BitRateInMbPerSec"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/BitRateInMbPerSec" ) );
     }
 
     /**
@@ -153,11 +152,10 @@ public class BitRateInMbPerSecItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        BitRateInMbPerSec bitRateInMbPerSec = (BitRateInMbPerSec)object;
-        return getString("_UI_BitRateInMbPerSec_type") + " " + bitRateInMbPerSec.getLineNumber();
+    public String getText( Object object ) {
+        BitRateInMbPerSec bitRateInMbPerSec = ( BitRateInMbPerSec ) object;
+        return getString( "_UI_BitRateInMbPerSec_type" ) + " " + bitRateInMbPerSec.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -167,17 +165,17 @@ public class BitRateInMbPerSecItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(BitRateInMbPerSec.class)) {
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__VALUE:
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__MULTIPLIER:
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__UNIT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( BitRateInMbPerSec.class ) ) {
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__VALUE:
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__MULTIPLIER:
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__UNIT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -188,8 +186,8 @@ public class BitRateInMbPerSecItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateItemProvider.java
index 39475d5..627415c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,8 +43,8 @@ public class BitRateItemProvider extends BitRateInMbPerSecItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public BitRateItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public BitRateItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -55,9 +54,9 @@ public class BitRateItemProvider extends BitRateInMbPerSecItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -70,8 +69,8 @@ public class BitRateItemProvider extends BitRateInMbPerSecItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/BitRate"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/BitRate" ) );
     }
 
     /**
@@ -81,11 +80,10 @@ public class BitRateItemProvider extends BitRateInMbPerSecItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        BitRate bitRate = (BitRate)object;
-        return getString("_UI_BitRate_type") + " " + bitRate.getLineNumber();
+    public String getText( Object object ) {
+        BitRate bitRate = ( BitRate ) object;
+        return getString( "_UI_BitRate_type" ) + " " + bitRate.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -95,9 +93,8 @@ public class BitRateItemProvider extends BitRateInMbPerSecItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -108,8 +105,8 @@ public class BitRateItemProvider extends BitRateInMbPerSecItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CertItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CertItemProvider.java
index c1786cb..53fb32b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CertItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CertItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -48,8 +47,8 @@ public class CertItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public CertItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public CertItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,12 +58,12 @@ public class CertItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addCommonNamePropertyDescriptor(object);
-            addIdHierarchyPropertyDescriptor(object);
+            addCommonNamePropertyDescriptor( object );
+            addIdHierarchyPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class CertItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addCommonNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Cert_commonName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Cert_commonName_feature", "_UI_Cert_type"),
-                 SclPackage.eINSTANCE.getCert_CommonName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addCommonNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Cert_commonName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Cert_commonName_feature",
+                                "_UI_Cert_type" ),
+                        SclPackage.eINSTANCE.getCert_CommonName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class CertItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIdHierarchyPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Cert_idHierarchy_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Cert_idHierarchy_feature", "_UI_Cert_type"),
-                 SclPackage.eINSTANCE.getCert_IdHierarchy(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIdHierarchyPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Cert_idHierarchy_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Cert_idHierarchy_feature",
+                                "_UI_Cert_type" ),
+                        SclPackage.eINSTANCE.getCert_IdHierarchy(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -120,8 +119,8 @@ public class CertItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Cert"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Cert" ) );
     }
 
     /**
@@ -131,13 +130,11 @@ public class CertItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((Cert)object).getCommonName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Cert_type") :
-            getString("_UI_Cert_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( Cert ) object ).getCommonName();
+        return label == null || label.length() == 0 ? getString( "_UI_Cert_type" )
+                : getString( "_UI_Cert_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -147,16 +144,16 @@ public class CertItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(Cert.class)) {
-            case SclPackage.CERT__COMMON_NAME:
-            case SclPackage.CERT__ID_HIERARCHY:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( Cert.class ) ) {
+        case SclPackage.CERT__COMMON_NAME:
+        case SclPackage.CERT__ID_HIERARCHY:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -167,8 +164,8 @@ public class CertItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CertificateItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CertificateItemProvider.java
index 6859bb3..a185e1e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CertificateItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CertificateItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class CertificateItemProvider extends NamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public CertificateItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public CertificateItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,12 +58,12 @@ public class CertificateItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addSerialNumberPropertyDescriptor(object);
-            addXferNumberPropertyDescriptor(object);
+            addSerialNumberPropertyDescriptor( object );
+            addXferNumberPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class CertificateItemProvider extends NamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSerialNumberPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Certificate_serialNumber_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Certificate_serialNumber_feature", "_UI_Certificate_type"),
-                 SclPackage.eINSTANCE.getCertificate_SerialNumber(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSerialNumberPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Certificate_serialNumber_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Certificate_serialNumber_feature",
+                                "_UI_Certificate_type" ),
+                        SclPackage.eINSTANCE.getCertificate_SerialNumber(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class CertificateItemProvider extends NamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addXferNumberPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Certificate_xferNumber_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Certificate_xferNumber_feature", "_UI_Certificate_type"),
-                 SclPackage.eINSTANCE.getCertificate_XferNumber(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addXferNumberPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Certificate_xferNumber_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Certificate_xferNumber_feature",
+                                "_UI_Certificate_type" ),
+                        SclPackage.eINSTANCE.getCertificate_XferNumber(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -122,11 +121,11 @@ public class CertificateItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getCertificate_Subject());
-            childrenFeatures.add(SclPackage.eINSTANCE.getCertificate_IssuerName());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getCertificate_Subject() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getCertificate_IssuerName() );
         }
         return childrenFeatures;
     }
@@ -137,11 +136,11 @@ public class CertificateItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -151,8 +150,8 @@ public class CertificateItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Certificate"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Certificate" ) );
     }
 
     /**
@@ -162,13 +161,11 @@ public class CertificateItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((Certificate)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Certificate_type") :
-            getString("_UI_Certificate_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( Certificate ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_Certificate_type" )
+                : getString( "_UI_Certificate_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -178,20 +175,20 @@ public class CertificateItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(Certificate.class)) {
-            case SclPackage.CERTIFICATE__SERIAL_NUMBER:
-            case SclPackage.CERTIFICATE__XFER_NUMBER:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.CERTIFICATE__SUBJECT:
-            case SclPackage.CERTIFICATE__ISSUER_NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( Certificate.class ) ) {
+        case SclPackage.CERTIFICATE__SERIAL_NUMBER:
+        case SclPackage.CERTIFICATE__XFER_NUMBER:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.CERTIFICATE__SUBJECT:
+        case SclPackage.CERTIFICATE__ISSUER_NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -202,18 +199,14 @@ public class CertificateItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getCertificate_Subject(),
-                 SclFactory.eINSTANCE.createSubject()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getCertificate_IssuerName(),
-                 SclFactory.eINSTANCE.createIssuerName()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getCertificate_Subject(),
+                SclFactory.eINSTANCE.createSubject() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getCertificate_IssuerName(),
+                SclFactory.eINSTANCE.createIssuerName() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ClientLNItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ClientLNItemProvider.java
index fb5afab..5a596d1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ClientLNItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ClientLNItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class ClientLNItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ClientLNItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ClientLNItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,18 +56,18 @@ public class ClientLNItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addDescPropertyDescriptor(object);
-            addIedNamePropertyDescriptor(object);
-            addLdInstPropertyDescriptor(object);
-            addLnClassPropertyDescriptor(object);
-            addLnInstPropertyDescriptor(object);
-            addPrefixPropertyDescriptor(object);
-            addApRefPropertyDescriptor(object);
-            addRefersToAnyLNPropertyDescriptor(object);
+            addDescPropertyDescriptor( object );
+            addIedNamePropertyDescriptor( object );
+            addLdInstPropertyDescriptor( object );
+            addLnClassPropertyDescriptor( object );
+            addLnInstPropertyDescriptor( object );
+            addPrefixPropertyDescriptor( object );
+            addApRefPropertyDescriptor( object );
+            addRefersToAnyLNPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -79,20 +78,20 @@ public class ClientLNItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addApRefPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientLN_apRef_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientLN_apRef_feature", "_UI_ClientLN_type"),
-                 SclPackage.eINSTANCE.getClientLN_ApRef(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addApRefPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientLN_apRef_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientLN_apRef_feature",
+                                "_UI_ClientLN_type" ),
+                        SclPackage.eINSTANCE.getClientLN_ApRef(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -101,20 +100,20 @@ public class ClientLNItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIedNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLDRef_iedName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLDRef_iedName_feature", "_UI_AgLDRef_type"),
-                 SclPackage.eINSTANCE.getAgLDRef_IedName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIedNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLDRef_iedName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLDRef_iedName_feature",
+                                "_UI_AgLDRef_type" ),
+                        SclPackage.eINSTANCE.getAgLDRef_IedName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -123,20 +122,20 @@ public class ClientLNItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLdInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLDRef_ldInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLDRef_ldInst_feature", "_UI_AgLDRef_type"),
-                 SclPackage.eINSTANCE.getAgLDRef_LdInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLdInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLDRef_ldInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLDRef_ldInst_feature",
+                                "_UI_AgLDRef_type" ),
+                        SclPackage.eINSTANCE.getAgLDRef_LdInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -145,20 +144,20 @@ public class ClientLNItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLNRef_lnClass_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLNRef_lnClass_feature", "_UI_AgLNRef_type"),
-                 SclPackage.eINSTANCE.getAgLNRef_LnClass(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnClassPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLNRef_lnClass_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLNRef_lnClass_feature",
+                                "_UI_AgLNRef_type" ),
+                        SclPackage.eINSTANCE.getAgLNRef_LnClass(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -167,20 +166,20 @@ public class ClientLNItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLNRef_lnInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLNRef_lnInst_feature", "_UI_AgLNRef_type"),
-                 SclPackage.eINSTANCE.getAgLNRef_LnInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLNRef_lnInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLNRef_lnInst_feature",
+                                "_UI_AgLNRef_type" ),
+                        SclPackage.eINSTANCE.getAgLNRef_LnInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -189,20 +188,20 @@ public class ClientLNItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPrefixPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgLNRef_prefix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgLNRef_prefix_feature", "_UI_AgLNRef_type"),
-                 SclPackage.eINSTANCE.getAgLNRef_Prefix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPrefixPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgLNRef_prefix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgLNRef_prefix_feature",
+                                "_UI_AgLNRef_type" ),
+                        SclPackage.eINSTANCE.getAgLNRef_Prefix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -211,20 +210,19 @@ public class ClientLNItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDescPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgDesc_desc_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type"),
-                 SclPackage.eINSTANCE.getAgDesc_Desc(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDescPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgDesc_desc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type" ),
+                        SclPackage.eINSTANCE.getAgDesc_Desc(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -233,20 +231,20 @@ public class ClientLNItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToAnyLNPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientLN_RefersToAnyLN_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientLN_RefersToAnyLN_feature", "_UI_ClientLN_type"),
-                 SclPackage.eINSTANCE.getClientLN_RefersToAnyLN(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToAnyLNPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientLN_RefersToAnyLN_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientLN_RefersToAnyLN_feature",
+                                "_UI_ClientLN_type" ),
+                        SclPackage.eINSTANCE.getClientLN_RefersToAnyLN(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -256,8 +254,8 @@ public class ClientLNItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ClientLN"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ClientLN" ) );
     }
 
     /**
@@ -267,13 +265,11 @@ public class ClientLNItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((ClientLN)object).getIedName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_ClientLN_type") :
-            getString("_UI_ClientLN_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( ClientLN ) object ).getIedName();
+        return label == null || label.length() == 0 ? getString( "_UI_ClientLN_type" )
+                : getString( "_UI_ClientLN_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -283,21 +279,21 @@ public class ClientLNItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ClientLN.class)) {
-            case SclPackage.CLIENT_LN__DESC:
-            case SclPackage.CLIENT_LN__IED_NAME:
-            case SclPackage.CLIENT_LN__LD_INST:
-            case SclPackage.CLIENT_LN__LN_CLASS:
-            case SclPackage.CLIENT_LN__LN_INST:
-            case SclPackage.CLIENT_LN__PREFIX:
-            case SclPackage.CLIENT_LN__AP_REF:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ClientLN.class ) ) {
+        case SclPackage.CLIENT_LN__DESC:
+        case SclPackage.CLIENT_LN__IED_NAME:
+        case SclPackage.CLIENT_LN__LD_INST:
+        case SclPackage.CLIENT_LN__LN_CLASS:
+        case SclPackage.CLIENT_LN__LN_INST:
+        case SclPackage.CLIENT_LN__PREFIX:
+        case SclPackage.CLIENT_LN__AP_REF:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -308,8 +304,8 @@ public class ClientLNItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ClientServicesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ClientServicesItemProvider.java
index 4ece41d..1d8ec49 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ClientServicesItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ClientServicesItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -41,16 +40,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ClientServicesItemProvider 
-    extends SclObjectItemProvider {
+public class ClientServicesItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public ClientServicesItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ClientServicesItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -60,24 +59,24 @@ public class ClientServicesItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addBufReportPropertyDescriptor(object);
-            addGoosePropertyDescriptor(object);
-            addGssePropertyDescriptor(object);
-            addMaxAttributesPropertyDescriptor(object);
-            addMaxGOOSEPropertyDescriptor(object);
-            addMaxReportsPropertyDescriptor(object);
-            addMaxSMVPropertyDescriptor(object);
-            addReadLogPropertyDescriptor(object);
-            addSupportsLdNamePropertyDescriptor(object);
-            addSvPropertyDescriptor(object);
-            addUnbufReportPropertyDescriptor(object);
-            addRGOOSEPropertyDescriptor(object);
-            addRSVPropertyDescriptor(object);
-            addNoIctBindingPropertyDescriptor(object);
+            addBufReportPropertyDescriptor( object );
+            addGoosePropertyDescriptor( object );
+            addGssePropertyDescriptor( object );
+            addMaxAttributesPropertyDescriptor( object );
+            addMaxGOOSEPropertyDescriptor( object );
+            addMaxReportsPropertyDescriptor( object );
+            addMaxSMVPropertyDescriptor( object );
+            addReadLogPropertyDescriptor( object );
+            addSupportsLdNamePropertyDescriptor( object );
+            addSvPropertyDescriptor( object );
+            addUnbufReportPropertyDescriptor( object );
+            addRGOOSEPropertyDescriptor( object );
+            addRSVPropertyDescriptor( object );
+            addNoIctBindingPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -88,20 +87,20 @@ public class ClientServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addBufReportPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientServices_bufReport_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientServices_bufReport_feature", "_UI_ClientServices_type"),
-                 SclPackage.eINSTANCE.getClientServices_BufReport(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addBufReportPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientServices_bufReport_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientServices_bufReport_feature",
+                                "_UI_ClientServices_type" ),
+                        SclPackage.eINSTANCE.getClientServices_BufReport(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -110,20 +109,20 @@ public class ClientServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addGoosePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientServices_goose_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientServices_goose_feature", "_UI_ClientServices_type"),
-                 SclPackage.eINSTANCE.getClientServices_Goose(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addGoosePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientServices_goose_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientServices_goose_feature",
+                                "_UI_ClientServices_type" ),
+                        SclPackage.eINSTANCE.getClientServices_Goose(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -132,20 +131,20 @@ public class ClientServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addGssePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientServices_gsse_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientServices_gsse_feature", "_UI_ClientServices_type"),
-                 SclPackage.eINSTANCE.getClientServices_Gsse(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addGssePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientServices_gsse_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientServices_gsse_feature",
+                                "_UI_ClientServices_type" ),
+                        SclPackage.eINSTANCE.getClientServices_Gsse(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -154,20 +153,20 @@ public class ClientServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMaxAttributesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientServices_maxAttributes_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientServices_maxAttributes_feature", "_UI_ClientServices_type"),
-                 SclPackage.eINSTANCE.getClientServices_MaxAttributes(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMaxAttributesPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientServices_maxAttributes_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientServices_maxAttributes_feature",
+                                "_UI_ClientServices_type" ),
+                        SclPackage.eINSTANCE.getClientServices_MaxAttributes(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -176,20 +175,20 @@ public class ClientServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMaxGOOSEPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientServices_maxGOOSE_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientServices_maxGOOSE_feature", "_UI_ClientServices_type"),
-                 SclPackage.eINSTANCE.getClientServices_MaxGOOSE(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMaxGOOSEPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientServices_maxGOOSE_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientServices_maxGOOSE_feature",
+                                "_UI_ClientServices_type" ),
+                        SclPackage.eINSTANCE.getClientServices_MaxGOOSE(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -198,20 +197,20 @@ public class ClientServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMaxReportsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientServices_maxReports_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientServices_maxReports_feature", "_UI_ClientServices_type"),
-                 SclPackage.eINSTANCE.getClientServices_MaxReports(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMaxReportsPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientServices_maxReports_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientServices_maxReports_feature",
+                                "_UI_ClientServices_type" ),
+                        SclPackage.eINSTANCE.getClientServices_MaxReports(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -220,20 +219,20 @@ public class ClientServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMaxSMVPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientServices_maxSMV_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientServices_maxSMV_feature", "_UI_ClientServices_type"),
-                 SclPackage.eINSTANCE.getClientServices_MaxSMV(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMaxSMVPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientServices_maxSMV_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientServices_maxSMV_feature",
+                                "_UI_ClientServices_type" ),
+                        SclPackage.eINSTANCE.getClientServices_MaxSMV(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -242,20 +241,20 @@ public class ClientServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReadLogPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientServices_readLog_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientServices_readLog_feature", "_UI_ClientServices_type"),
-                 SclPackage.eINSTANCE.getClientServices_ReadLog(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addReadLogPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientServices_readLog_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientServices_readLog_feature",
+                                "_UI_ClientServices_type" ),
+                        SclPackage.eINSTANCE.getClientServices_ReadLog(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -264,20 +263,20 @@ public class ClientServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSupportsLdNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientServices_supportsLdName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientServices_supportsLdName_feature", "_UI_ClientServices_type"),
-                 SclPackage.eINSTANCE.getClientServices_SupportsLdName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSupportsLdNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientServices_supportsLdName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientServices_supportsLdName_feature",
+                                "_UI_ClientServices_type" ),
+                        SclPackage.eINSTANCE.getClientServices_SupportsLdName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -286,20 +285,20 @@ public class ClientServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSvPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientServices_sv_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientServices_sv_feature", "_UI_ClientServices_type"),
-                 SclPackage.eINSTANCE.getClientServices_Sv(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSvPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientServices_sv_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientServices_sv_feature",
+                                "_UI_ClientServices_type" ),
+                        SclPackage.eINSTANCE.getClientServices_Sv(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -308,20 +307,20 @@ public class ClientServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addUnbufReportPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientServices_unbufReport_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientServices_unbufReport_feature", "_UI_ClientServices_type"),
-                 SclPackage.eINSTANCE.getClientServices_UnbufReport(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addUnbufReportPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientServices_unbufReport_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientServices_unbufReport_feature",
+                                "_UI_ClientServices_type" ),
+                        SclPackage.eINSTANCE.getClientServices_UnbufReport(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -330,20 +329,20 @@ public class ClientServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRGOOSEPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientServices_rGOOSE_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientServices_rGOOSE_feature", "_UI_ClientServices_type"),
-                 SclPackage.eINSTANCE.getClientServices_RGOOSE(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addRGOOSEPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientServices_rGOOSE_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientServices_rGOOSE_feature",
+                                "_UI_ClientServices_type" ),
+                        SclPackage.eINSTANCE.getClientServices_RGOOSE(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -352,20 +351,20 @@ public class ClientServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRSVPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientServices_rSV_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientServices_rSV_feature", "_UI_ClientServices_type"),
-                 SclPackage.eINSTANCE.getClientServices_RSV(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addRSVPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientServices_rSV_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientServices_rSV_feature",
+                                "_UI_ClientServices_type" ),
+                        SclPackage.eINSTANCE.getClientServices_RSV(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -374,20 +373,20 @@ public class ClientServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNoIctBindingPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ClientServices_noIctBinding_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ClientServices_noIctBinding_feature", "_UI_ClientServices_type"),
-                 SclPackage.eINSTANCE.getClientServices_NoIctBinding(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNoIctBindingPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ClientServices_noIctBinding_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ClientServices_noIctBinding_feature",
+                                "_UI_ClientServices_type" ),
+                        SclPackage.eINSTANCE.getClientServices_NoIctBinding(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -399,11 +398,11 @@ public class ClientServicesItemProvider
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getClientServices_TimeSyncProt());
-            childrenFeatures.add(SclPackage.eINSTANCE.getClientServices_McSecurity());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getClientServices_TimeSyncProt() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getClientServices_McSecurity() );
         }
         return childrenFeatures;
     }
@@ -414,11 +413,11 @@ public class ClientServicesItemProvider
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -428,8 +427,8 @@ public class ClientServicesItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ClientServices"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ClientServices" ) );
     }
 
     /**
@@ -439,14 +438,12 @@ public class ClientServicesItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Boolean labelValue = ((ClientServices)object).getSupportsLdName();
+    public String getText( Object object ) {
+        Boolean labelValue = ( ( ClientServices ) object ).getSupportsLdName();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ?
-            getString("_UI_ClientServices_type") :
-            getString("_UI_ClientServices_type") + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_ClientServices_type" )
+                : getString( "_UI_ClientServices_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -456,32 +453,32 @@ public class ClientServicesItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ClientServices.class)) {
-            case SclPackage.CLIENT_SERVICES__BUF_REPORT:
-            case SclPackage.CLIENT_SERVICES__GOOSE:
-            case SclPackage.CLIENT_SERVICES__GSSE:
-            case SclPackage.CLIENT_SERVICES__MAX_ATTRIBUTES:
-            case SclPackage.CLIENT_SERVICES__MAX_GOOSE:
-            case SclPackage.CLIENT_SERVICES__MAX_REPORTS:
-            case SclPackage.CLIENT_SERVICES__MAX_SMV:
-            case SclPackage.CLIENT_SERVICES__READ_LOG:
-            case SclPackage.CLIENT_SERVICES__SUPPORTS_LD_NAME:
-            case SclPackage.CLIENT_SERVICES__SV:
-            case SclPackage.CLIENT_SERVICES__UNBUF_REPORT:
-            case SclPackage.CLIENT_SERVICES__RGOOSE:
-            case SclPackage.CLIENT_SERVICES__RSV:
-            case SclPackage.CLIENT_SERVICES__NO_ICT_BINDING:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT:
-            case SclPackage.CLIENT_SERVICES__MC_SECURITY:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( ClientServices.class ) ) {
+        case SclPackage.CLIENT_SERVICES__BUF_REPORT:
+        case SclPackage.CLIENT_SERVICES__GOOSE:
+        case SclPackage.CLIENT_SERVICES__GSSE:
+        case SclPackage.CLIENT_SERVICES__MAX_ATTRIBUTES:
+        case SclPackage.CLIENT_SERVICES__MAX_GOOSE:
+        case SclPackage.CLIENT_SERVICES__MAX_REPORTS:
+        case SclPackage.CLIENT_SERVICES__MAX_SMV:
+        case SclPackage.CLIENT_SERVICES__READ_LOG:
+        case SclPackage.CLIENT_SERVICES__SUPPORTS_LD_NAME:
+        case SclPackage.CLIENT_SERVICES__SV:
+        case SclPackage.CLIENT_SERVICES__UNBUF_REPORT:
+        case SclPackage.CLIENT_SERVICES__RGOOSE:
+        case SclPackage.CLIENT_SERVICES__RSV:
+        case SclPackage.CLIENT_SERVICES__NO_ICT_BINDING:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT:
+        case SclPackage.CLIENT_SERVICES__MC_SECURITY:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -492,18 +489,14 @@ public class ClientServicesItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getClientServices_TimeSyncProt(),
-                 SclFactory.eINSTANCE.createTimeSyncProt()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getClientServices_TimeSyncProt(),
+                SclFactory.eINSTANCE.createTimeSyncProt() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getClientServices_McSecurity(),
-                 SclFactory.eINSTANCE.createMcSecurity()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getClientServices_McSecurity(),
+                SclFactory.eINSTANCE.createMcSecurity() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CommProtItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CommProtItemProvider.java
index 4e43bda..f900b4d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CommProtItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CommProtItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class CommProtItemProvider 
-    extends SclObjectItemProvider {
+public class CommProtItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public CommProtItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public CommProtItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,11 +57,11 @@ public class CommProtItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addIpv6PropertyDescriptor(object);
+            addIpv6PropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -73,20 +72,20 @@ public class CommProtItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIpv6PropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_CommProt_ipv6_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_CommProt_ipv6_feature", "_UI_CommProt_type"),
-                 SclPackage.eINSTANCE.getCommProt_Ipv6(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIpv6PropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_CommProt_ipv6_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_CommProt_ipv6_feature",
+                                "_UI_CommProt_type" ),
+                        SclPackage.eINSTANCE.getCommProt_Ipv6(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,8 +95,8 @@ public class CommProtItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CommProt"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/CommProt" ) );
     }
 
     /**
@@ -107,11 +106,10 @@ public class CommProtItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        CommProt commProt = (CommProt)object;
-        return getString("_UI_CommProt_type") + " " + commProt.getLineNumber();
+    public String getText( Object object ) {
+        CommProt commProt = ( CommProt ) object;
+        return getString( "_UI_CommProt_type" ) + " " + commProt.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -121,15 +119,15 @@ public class CommProtItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(CommProt.class)) {
-            case SclPackage.COMM_PROT__IPV6:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( CommProt.class ) ) {
+        case SclPackage.COMM_PROT__IPV6:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -140,8 +138,8 @@ public class CommProtItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CommunicationItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CommunicationItemProvider.java
index 84fd183..342bd16 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CommunicationItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CommunicationItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class CommunicationItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public CommunicationItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public CommunicationItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,9 +56,9 @@ public class CommunicationItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -74,10 +73,10 @@ public class CommunicationItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getCommunication_SubNetwork());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getCommunication_SubNetwork() );
         }
         return childrenFeatures;
     }
@@ -88,11 +87,11 @@ public class CommunicationItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -102,8 +101,8 @@ public class CommunicationItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Communication"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Communication" ) );
     }
 
     /**
@@ -113,11 +112,10 @@ public class CommunicationItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Communication communication = (Communication)object;
-        return getString("_UI_Communication_type") + " " + communication.getLineNumber();
+    public String getText( Object object ) {
+        Communication communication = ( Communication ) object;
+        return getString( "_UI_Communication_type" ) + " " + communication.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -127,15 +125,15 @@ public class CommunicationItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(Communication.class)) {
-            case SclPackage.COMMUNICATION__SUB_NETWORK:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( Communication.class ) ) {
+        case SclPackage.COMMUNICATION__SUB_NETWORK:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -146,13 +144,11 @@ public class CommunicationItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getCommunication_SubNetwork(),
-                 SclFactory.eINSTANCE.createSubNetwork()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getCommunication_SubNetwork(),
+                SclFactory.eINSTANCE.createSubNetwork() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConductingEquipmentItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConductingEquipmentItemProvider.java
index d714eca..e62b701 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConductingEquipmentItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConductingEquipmentItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class ConductingEquipmentItemProvider extends AbstractConductingEquipment
      * <!-- end-user-doc -->
      * @generated
      */
-    public ConductingEquipmentItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ConductingEquipmentItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class ConductingEquipmentItemProvider extends AbstractConductingEquipment
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTypePropertyDescriptor(object);
+            addTypePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class ConductingEquipmentItemProvider extends AbstractConductingEquipment
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ConductingEquipment_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ConductingEquipment_type_feature", "_UI_ConductingEquipment_type"),
-                 SclPackage.eINSTANCE.getConductingEquipment_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ConductingEquipment_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ConductingEquipment_type_feature",
+                                "_UI_ConductingEquipment_type" ),
+                        SclPackage.eINSTANCE.getConductingEquipment_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,10 +98,10 @@ public class ConductingEquipmentItemProvider extends AbstractConductingEquipment
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getConductingEquipment_EqFunction());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getConductingEquipment_EqFunction() );
         }
         return childrenFeatures;
     }
@@ -113,11 +112,11 @@ public class ConductingEquipmentItemProvider extends AbstractConductingEquipment
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -127,8 +126,8 @@ public class ConductingEquipmentItemProvider extends AbstractConductingEquipment
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConductingEquipment"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ConductingEquipment" ) );
     }
 
     /**
@@ -138,13 +137,11 @@ public class ConductingEquipmentItemProvider extends AbstractConductingEquipment
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((ConductingEquipment)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_ConductingEquipment_type") :
-            getString("_UI_ConductingEquipment_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( ConductingEquipment ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_ConductingEquipment_type" )
+                : getString( "_UI_ConductingEquipment_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -154,18 +151,18 @@ public class ConductingEquipmentItemProvider extends AbstractConductingEquipment
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(ConductingEquipment.class)) {
-            case SclPackage.CONDUCTING_EQUIPMENT__TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( ConductingEquipment.class ) ) {
+        case SclPackage.CONDUCTING_EQUIPMENT__TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -176,13 +173,11 @@ public class ConductingEquipmentItemProvider extends AbstractConductingEquipment
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getConductingEquipment_EqFunction(),
-                 SclFactory.eINSTANCE.createEqFunction()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getConductingEquipment_EqFunction(),
+                SclFactory.eINSTANCE.createEqFunction() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfDataSetItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfDataSetItemProvider.java
index c19701a..2651639 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfDataSetItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfDataSetItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class ConfDataSetItemProvider extends ServiceForConfDataSetItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ConfDataSetItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ConfDataSetItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class ConfDataSetItemProvider extends ServiceForConfDataSetItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class ConfDataSetItemProvider extends ServiceForConfDataSetItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConfDataSet"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ConfDataSet" ) );
     }
 
     /**
@@ -79,11 +78,10 @@ public class ConfDataSetItemProvider extends ServiceForConfDataSetItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ConfDataSet confDataSet = (ConfDataSet)object;
-        return getString("_UI_ConfDataSet_type") + " " + confDataSet.getLineNumber();
+    public String getText( Object object ) {
+        ConfDataSet confDataSet = ( ConfDataSet ) object;
+        return getString( "_UI_ConfDataSet_type" ) + " " + confDataSet.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -93,9 +91,8 @@ public class ConfDataSetItemProvider extends ServiceForConfDataSetItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -106,8 +103,8 @@ public class ConfDataSetItemProvider extends ServiceForConfDataSetItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLNsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLNsItemProvider.java
index 187fa4e..25ec23e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLNsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLNsItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ConfLNsItemProvider 
-    extends SclObjectItemProvider {
+public class ConfLNsItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public ConfLNsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ConfLNsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,12 +57,12 @@ public class ConfLNsItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addFixLnInstPropertyDescriptor(object);
-            addFixPrefixPropertyDescriptor(object);
+            addFixLnInstPropertyDescriptor( object );
+            addFixPrefixPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class ConfLNsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addFixLnInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ConfLNs_fixLnInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ConfLNs_fixLnInst_feature", "_UI_ConfLNs_type"),
-                 SclPackage.eINSTANCE.getConfLNs_FixLnInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addFixLnInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ConfLNs_fixLnInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ConfLNs_fixLnInst_feature",
+                                "_UI_ConfLNs_type" ),
+                        SclPackage.eINSTANCE.getConfLNs_FixLnInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,20 +95,20 @@ public class ConfLNsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addFixPrefixPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ConfLNs_fixPrefix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ConfLNs_fixPrefix_feature", "_UI_ConfLNs_type"),
-                 SclPackage.eINSTANCE.getConfLNs_FixPrefix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addFixPrefixPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ConfLNs_fixPrefix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ConfLNs_fixPrefix_feature",
+                                "_UI_ConfLNs_type" ),
+                        SclPackage.eINSTANCE.getConfLNs_FixPrefix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,8 +118,8 @@ public class ConfLNsItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConfLNs"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ConfLNs" ) );
     }
 
     /**
@@ -130,11 +129,10 @@ public class ConfLNsItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ConfLNs confLNs = (ConfLNs)object;
-        return getString("_UI_ConfLNs_type") + " " + confLNs.getLineNumber();
+    public String getText( Object object ) {
+        ConfLNs confLNs = ( ConfLNs ) object;
+        return getString( "_UI_ConfLNs_type" ) + " " + confLNs.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -144,16 +142,16 @@ public class ConfLNsItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ConfLNs.class)) {
-            case SclPackage.CONF_LNS__FIX_LN_INST:
-            case SclPackage.CONF_LNS__FIX_PREFIX:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ConfLNs.class ) ) {
+        case SclPackage.CONF_LNS__FIX_LN_INST:
+        case SclPackage.CONF_LNS__FIX_PREFIX:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -164,8 +162,8 @@ public class ConfLNsItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLdNameItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLdNameItemProvider.java
index a56953e..02f2dc9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLdNameItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLdNameItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConfLdName;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ConfLdNameItemProvider 
-    extends ServiceYesNoItemProvider {
+public class ConfLdNameItemProvider
+        extends ServiceYesNoItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public ConfLdNameItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ConfLdNameItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class ConfLdNameItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class ConfLdNameItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConfLdName"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ConfLdName" ) );
     }
 
     /**
@@ -80,11 +79,10 @@ public class ConfLdNameItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ConfLdName confLdName = (ConfLdName)object;
-        return getString("_UI_ConfLdName_type") + " " + confLdName.getLineNumber();
+    public String getText( Object object ) {
+        ConfLdName confLdName = ( ConfLdName ) object;
+        return getString( "_UI_ConfLdName_type" ) + " " + confLdName.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -94,9 +92,8 @@ public class ConfLdNameItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -107,8 +104,8 @@ public class ConfLdNameItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLogControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLogControlItemProvider.java
index 13c8d68..92588e5 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLogControlItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLogControlItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class ConfLogControlItemProvider extends ServiceWithMaxNonZeroItemProvide
      * <!-- end-user-doc -->
      * @generated
      */
-    public ConfLogControlItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ConfLogControlItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class ConfLogControlItemProvider extends ServiceWithMaxNonZeroItemProvide
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class ConfLogControlItemProvider extends ServiceWithMaxNonZeroItemProvide
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConfLogControl"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ConfLogControl" ) );
     }
 
     /**
@@ -79,11 +78,10 @@ public class ConfLogControlItemProvider extends ServiceWithMaxNonZeroItemProvide
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ConfLogControl confLogControl = (ConfLogControl)object;
-        return getString("_UI_ConfLogControl_type") + " " + confLogControl.getLineNumber();
+    public String getText( Object object ) {
+        ConfLogControl confLogControl = ( ConfLogControl ) object;
+        return getString( "_UI_ConfLogControl_type" ) + " " + confLogControl.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -93,9 +91,8 @@ public class ConfLogControlItemProvider extends ServiceWithMaxNonZeroItemProvide
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -106,8 +103,8 @@ public class ConfLogControlItemProvider extends ServiceWithMaxNonZeroItemProvide
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfReportControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfReportControlItemProvider.java
index cc939fd..5dc023b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfReportControlItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfReportControlItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class ConfReportControlItemProvider extends ServiceConfReportControlItemP
      * <!-- end-user-doc -->
      * @generated
      */
-    public ConfReportControlItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ConfReportControlItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class ConfReportControlItemProvider extends ServiceConfReportControlItemP
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class ConfReportControlItemProvider extends ServiceConfReportControlItemP
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConfReportControl"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ConfReportControl" ) );
     }
 
     /**
@@ -79,11 +78,10 @@ public class ConfReportControlItemProvider extends ServiceConfReportControlItemP
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ConfReportControl confReportControl = (ConfReportControl)object;
-        return getString("_UI_ConfReportControl_type") + " " + confReportControl.getLineNumber();
+    public String getText( Object object ) {
+        ConfReportControl confReportControl = ( ConfReportControl ) object;
+        return getString( "_UI_ConfReportControl_type" ) + " " + confReportControl.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -93,9 +91,8 @@ public class ConfReportControlItemProvider extends ServiceConfReportControlItemP
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -106,8 +103,8 @@ public class ConfReportControlItemProvider extends ServiceConfReportControlItemP
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSGItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSGItemProvider.java
index 278e25b..a77a7c6 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSGItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSGItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ConfSGItemProvider 
-    extends SclObjectItemProvider {
+public class ConfSGItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public ConfSGItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ConfSGItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,11 +57,11 @@ public class ConfSGItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addResvTmsPropertyDescriptor(object);
+            addResvTmsPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -73,20 +72,20 @@ public class ConfSGItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addResvTmsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ConfSG_resvTms_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ConfSG_resvTms_feature", "_UI_ConfSG_type"),
-                 SclPackage.eINSTANCE.getConfSG_ResvTms(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addResvTmsPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ConfSG_resvTms_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ConfSG_resvTms_feature",
+                                "_UI_ConfSG_type" ),
+                        SclPackage.eINSTANCE.getConfSG_ResvTms(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,8 +95,8 @@ public class ConfSGItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConfSG"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ConfSG" ) );
     }
 
     /**
@@ -107,11 +106,10 @@ public class ConfSGItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ConfSG confSG = (ConfSG)object;
-        return getString("_UI_ConfSG_type") + " " + confSG.getLineNumber();
+    public String getText( Object object ) {
+        ConfSG confSG = ( ConfSG ) object;
+        return getString( "_UI_ConfSG_type" ) + " " + confSG.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -121,15 +119,15 @@ public class ConfSGItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ConfSG.class)) {
-            case SclPackage.CONF_SG__RESV_TMS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ConfSG.class ) ) {
+        case SclPackage.CONF_SG__RESV_TMS:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -140,8 +138,8 @@ public class ConfSGItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSigRefItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSigRefItemProvider.java
index 8a1570d..5462f09 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSigRefItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSigRefItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class ConfSigRefItemProvider extends ServiceWithMaxNonZeroItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ConfSigRefItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ConfSigRefItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class ConfSigRefItemProvider extends ServiceWithMaxNonZeroItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class ConfSigRefItemProvider extends ServiceWithMaxNonZeroItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConfSigRef"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ConfSigRef" ) );
     }
 
     /**
@@ -79,11 +78,10 @@ public class ConfSigRefItemProvider extends ServiceWithMaxNonZeroItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ConfSigRef confSigRef = (ConfSigRef)object;
-        return getString("_UI_ConfSigRef_type") + " " + confSigRef.getLineNumber();
+    public String getText( Object object ) {
+        ConfSigRef confSigRef = ( ConfSigRef ) object;
+        return getString( "_UI_ConfSigRef_type" ) + " " + confSigRef.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -93,9 +91,8 @@ public class ConfSigRefItemProvider extends ServiceWithMaxNonZeroItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -106,8 +103,8 @@ public class ConfSigRefItemProvider extends ServiceWithMaxNonZeroItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConnectedAPItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConnectedAPItemProvider.java
index 0a8aaee..60dea3a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConnectedAPItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConnectedAPItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class ConnectedAPItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ConnectedAPItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ConnectedAPItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,14 +58,14 @@ public class ConnectedAPItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addApNamePropertyDescriptor(object);
-            addIedNamePropertyDescriptor(object);
-            addRedProtPropertyDescriptor(object);
-            addRefersToAccessPointPropertyDescriptor(object);
+            addApNamePropertyDescriptor( object );
+            addIedNamePropertyDescriptor( object );
+            addRedProtPropertyDescriptor( object );
+            addRefersToAccessPointPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -77,20 +76,20 @@ public class ConnectedAPItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addApNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ConnectedAP_apName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ConnectedAP_apName_feature", "_UI_ConnectedAP_type"),
-                 SclPackage.eINSTANCE.getConnectedAP_ApName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addApNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ConnectedAP_apName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ConnectedAP_apName_feature",
+                                "_UI_ConnectedAP_type" ),
+                        SclPackage.eINSTANCE.getConnectedAP_ApName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,20 +98,20 @@ public class ConnectedAPItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIedNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ConnectedAP_iedName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ConnectedAP_iedName_feature", "_UI_ConnectedAP_type"),
-                 SclPackage.eINSTANCE.getConnectedAP_IedName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIedNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ConnectedAP_iedName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ConnectedAP_iedName_feature",
+                                "_UI_ConnectedAP_type" ),
+                        SclPackage.eINSTANCE.getConnectedAP_IedName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -121,20 +120,20 @@ public class ConnectedAPItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRedProtPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ConnectedAP_redProt_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ConnectedAP_redProt_feature", "_UI_ConnectedAP_type"),
-                 SclPackage.eINSTANCE.getConnectedAP_RedProt(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addRedProtPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ConnectedAP_redProt_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ConnectedAP_redProt_feature",
+                                "_UI_ConnectedAP_type" ),
+                        SclPackage.eINSTANCE.getConnectedAP_RedProt(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -143,20 +142,20 @@ public class ConnectedAPItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToAccessPointPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ConnectedAP_RefersToAccessPoint_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ConnectedAP_RefersToAccessPoint_feature", "_UI_ConnectedAP_type"),
-                 SclPackage.eINSTANCE.getConnectedAP_RefersToAccessPoint(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToAccessPointPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ConnectedAP_RefersToAccessPoint_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ConnectedAP_RefersToAccessPoint_feature",
+                                "_UI_ConnectedAP_type" ),
+                        SclPackage.eINSTANCE.getConnectedAP_RefersToAccessPoint(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -168,14 +167,14 @@ public class ConnectedAPItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getConnectedAP_Address());
-            childrenFeatures.add(SclPackage.eINSTANCE.getConnectedAP_PhysConn());
-            childrenFeatures.add(SclPackage.eINSTANCE.getConnectedAP_GSE());
-            childrenFeatures.add(SclPackage.eINSTANCE.getConnectedAP_SMV());
-            childrenFeatures.add(SclPackage.eINSTANCE.getConnectedAP_ControlBlock());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getConnectedAP_Address() );
+            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;
     }
@@ -186,11 +185,11 @@ public class ConnectedAPItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -200,8 +199,8 @@ public class ConnectedAPItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConnectedAP"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ConnectedAP" ) );
     }
 
     /**
@@ -211,13 +210,11 @@ public class ConnectedAPItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((ConnectedAP)object).getApName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_ConnectedAP_type") :
-            getString("_UI_ConnectedAP_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( ConnectedAP ) object ).getApName();
+        return label == null || label.length() == 0 ? getString( "_UI_ConnectedAP_type" )
+                : getString( "_UI_ConnectedAP_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -227,24 +224,24 @@ public class ConnectedAPItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ConnectedAP.class)) {
-            case SclPackage.CONNECTED_AP__AP_NAME:
-            case SclPackage.CONNECTED_AP__IED_NAME:
-            case SclPackage.CONNECTED_AP__RED_PROT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.CONNECTED_AP__ADDRESS:
-            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;
+        switch( notification.getFeatureID( ConnectedAP.class ) ) {
+        case SclPackage.CONNECTED_AP__AP_NAME:
+        case SclPackage.CONNECTED_AP__IED_NAME:
+        case SclPackage.CONNECTED_AP__RED_PROT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.CONNECTED_AP__ADDRESS:
+        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;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -255,28 +252,20 @@ public class ConnectedAPItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getConnectedAP_Address(),
-                 SclFactory.eINSTANCE.createAddress()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getConnectedAP_Address(),
+                SclFactory.eINSTANCE.createAddress() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getConnectedAP_PhysConn(),
-                 SclFactory.eINSTANCE.createPhysConn()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getConnectedAP_PhysConn(),
+                SclFactory.eINSTANCE.createPhysConn() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getConnectedAP_GSE(),
-                 SclFactory.eINSTANCE.createGSE()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getConnectedAP_GSE(),
+                SclFactory.eINSTANCE.createGSE() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getConnectedAP_SMV(),
-                 SclFactory.eINSTANCE.createSMV()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getConnectedAP_SMV(),
+                SclFactory.eINSTANCE.createSMV() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConnectivityNodeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConnectivityNodeItemProvider.java
index 4cbe470..152d2b6 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConnectivityNodeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConnectivityNodeItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class ConnectivityNodeItemProvider extends LNodeContainerItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ConnectivityNodeItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ConnectivityNodeItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,12 +56,12 @@ public class ConnectivityNodeItemProvider extends LNodeContainerItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addPathNamePropertyDescriptor(object);
-            addReferredByTerminalPropertyDescriptor(object);
+            addPathNamePropertyDescriptor( object );
+            addReferredByTerminalPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -73,20 +72,20 @@ public class ConnectivityNodeItemProvider extends LNodeContainerItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPathNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ConnectivityNode_pathName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ConnectivityNode_pathName_feature", "_UI_ConnectivityNode_type"),
-                 SclPackage.eINSTANCE.getConnectivityNode_PathName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPathNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ConnectivityNode_pathName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ConnectivityNode_pathName_feature",
+                                "_UI_ConnectivityNode_type" ),
+                        SclPackage.eINSTANCE.getConnectivityNode_PathName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -95,20 +94,20 @@ public class ConnectivityNodeItemProvider extends LNodeContainerItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByTerminalPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ConnectivityNode_ReferredByTerminal_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ConnectivityNode_ReferredByTerminal_feature", "_UI_ConnectivityNode_type"),
-                 SclPackage.eINSTANCE.getConnectivityNode_ReferredByTerminal(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByTerminalPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ConnectivityNode_ReferredByTerminal_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_ConnectivityNode_ReferredByTerminal_feature", "_UI_ConnectivityNode_type" ),
+                        SclPackage.eINSTANCE.getConnectivityNode_ReferredByTerminal(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -118,26 +117,24 @@ public class ConnectivityNodeItemProvider extends LNodeContainerItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ConnectivityNode"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ConnectivityNode" ) );
     }
 
     /**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
+     * @generated NOT
+     */
     @Override
-    public String getText(Object object) {
-    	// Use pathName as display text
-		//String label = ((ConnectivityNode)object).getName();
-		String label = ((ConnectivityNode)object).getPathName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ConnectivityNode_type") :
-			getString("_UI_ConnectivityNode_type") + " " + label;
-	}
-    
+    public String getText( Object object ) {
+        // Use pathName as display text
+        //String label = ((ConnectivityNode)object).getName();
+        String label = ( ( ConnectivityNode ) object ).getPathName();
+        return label == null || label.length() == 0 ? getString( "_UI_ConnectivityNode_type" )
+                : getString( "_UI_ConnectivityNode_type" ) + " " + label;
+    }
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -147,15 +144,15 @@ public class ConnectivityNodeItemProvider extends LNodeContainerItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ConnectivityNode.class)) {
-            case SclPackage.CONNECTIVITY_NODE__PATH_NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ConnectivityNode.class ) ) {
+        case SclPackage.CONNECTIVITY_NODE__PATH_NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -166,8 +163,8 @@ public class ConnectivityNodeItemProvider extends LNodeContainerItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlBlockItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlBlockItemProvider.java
index bc354ff..e4aba96 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlBlockItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlBlockItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class ControlBlockItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ControlBlockItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ControlBlockItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,13 +58,13 @@ public class ControlBlockItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addCbNamePropertyDescriptor(object);
-            addLdInstPropertyDescriptor(object);
-            addRefersToControlWithIEDNamePropertyDescriptor(object);
+            addCbNamePropertyDescriptor( object );
+            addLdInstPropertyDescriptor( object );
+            addRefersToControlWithIEDNamePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -76,20 +75,20 @@ public class ControlBlockItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addCbNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ControlBlock_cbName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ControlBlock_cbName_feature", "_UI_ControlBlock_type"),
-                 SclPackage.eINSTANCE.getControlBlock_CbName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addCbNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ControlBlock_cbName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ControlBlock_cbName_feature",
+                                "_UI_ControlBlock_type" ),
+                        SclPackage.eINSTANCE.getControlBlock_CbName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -98,20 +97,20 @@ public class ControlBlockItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLdInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ControlBlock_ldInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ControlBlock_ldInst_feature", "_UI_ControlBlock_type"),
-                 SclPackage.eINSTANCE.getControlBlock_LdInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLdInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ControlBlock_ldInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ControlBlock_ldInst_feature",
+                                "_UI_ControlBlock_type" ),
+                        SclPackage.eINSTANCE.getControlBlock_LdInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -120,20 +119,20 @@ public class ControlBlockItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToControlWithIEDNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ControlBlock_RefersToControlWithIEDName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ControlBlock_RefersToControlWithIEDName_feature", "_UI_ControlBlock_type"),
-                 SclPackage.eINSTANCE.getControlBlock_RefersToControlWithIEDName(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToControlWithIEDNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ControlBlock_RefersToControlWithIEDName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_ControlBlock_RefersToControlWithIEDName_feature", "_UI_ControlBlock_type" ),
+                        SclPackage.eINSTANCE.getControlBlock_RefersToControlWithIEDName(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -145,10 +144,10 @@ public class ControlBlockItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getControlBlock_Address());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getControlBlock_Address() );
         }
         return childrenFeatures;
     }
@@ -159,11 +158,11 @@ public class ControlBlockItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -173,8 +172,8 @@ public class ControlBlockItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ControlBlock"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ControlBlock" ) );
     }
 
     /**
@@ -184,13 +183,11 @@ public class ControlBlockItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((ControlBlock)object).getCbName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_ControlBlock_type") :
-            getString("_UI_ControlBlock_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( ControlBlock ) object ).getCbName();
+        return label == null || label.length() == 0 ? getString( "_UI_ControlBlock_type" )
+                : getString( "_UI_ControlBlock_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -200,19 +197,19 @@ public class ControlBlockItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(ControlBlock.class)) {
-            case SclPackage.CONTROL_BLOCK__CB_NAME:
-            case SclPackage.CONTROL_BLOCK__LD_INST:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.CONTROL_BLOCK__ADDRESS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( ControlBlock.class ) ) {
+        case SclPackage.CONTROL_BLOCK__CB_NAME:
+        case SclPackage.CONTROL_BLOCK__LD_INST:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.CONTROL_BLOCK__ADDRESS:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -223,13 +220,11 @@ public class ControlBlockItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getControlBlock_Address(),
-                 SclFactory.eINSTANCE.createAddress()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getControlBlock_Address(),
+                SclFactory.eINSTANCE.createAddress() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlItemProvider.java
index cc37f57..dc4d8b6 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class ControlItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ControlItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ControlItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,14 +56,14 @@ public class ControlItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
-
-            addDatSetPropertyDescriptor(object);
-            addRefersToDataSetPropertyDescriptor(object);
-            addNamePropertyDescriptor(object);
-            addReferredByExtRefPropertyDescriptor(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
+
+            addDatSetPropertyDescriptor( object );
+            addRefersToDataSetPropertyDescriptor( object );
+            addNamePropertyDescriptor( object );
+            addReferredByExtRefPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class ControlItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDatSetPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Control_datSet_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Control_datSet_feature", "_UI_Control_type"),
-                 SclPackage.eINSTANCE.getControl_DatSet(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDatSetPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Control_datSet_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Control_datSet_feature",
+                                "_UI_Control_type" ),
+                        SclPackage.eINSTANCE.getControl_DatSet(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class ControlItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToDataSetPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Control_RefersToDataSet_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Control_RefersToDataSet_feature", "_UI_Control_type"),
-                 SclPackage.eINSTANCE.getControl_RefersToDataSet(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToDataSetPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Control_RefersToDataSet_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Control_RefersToDataSet_feature",
+                                "_UI_Control_type" ),
+                        SclPackage.eINSTANCE.getControl_RefersToDataSet(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,20 +118,20 @@ public class ControlItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Control_name_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Control_name_feature", "_UI_Control_type"),
-                 SclPackage.eINSTANCE.getControl_Name(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Control_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Control_name_feature",
+                                "_UI_Control_type" ),
+                        SclPackage.eINSTANCE.getControl_Name(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -141,20 +140,20 @@ public class ControlItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByExtRefPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Control_ReferredByExtRef_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Control_ReferredByExtRef_feature", "_UI_Control_type"),
-                 SclPackage.eINSTANCE.getControl_ReferredByExtRef(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByExtRefPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Control_ReferredByExtRef_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Control_ReferredByExtRef_feature",
+                                "_UI_Control_type" ),
+                        SclPackage.eINSTANCE.getControl_ReferredByExtRef(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -164,8 +163,8 @@ public class ControlItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Control"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Control" ) );
     }
 
     /**
@@ -175,13 +174,11 @@ public class ControlItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((Control)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Control_type") :
-            getString("_UI_Control_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( Control ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_Control_type" )
+                : getString( "_UI_Control_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -191,16 +188,16 @@ public class ControlItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(Control.class)) {
-            case SclPackage.CONTROL__DAT_SET:
-            case SclPackage.CONTROL__NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( Control.class ) ) {
+        case SclPackage.CONTROL__DAT_SET:
+        case SclPackage.CONTROL__NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -211,8 +208,8 @@ public class ControlItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlWithIEDNameItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlWithIEDNameItemProvider.java
index 34ba34b..dc0de0c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlWithIEDNameItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlWithIEDNameItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class ControlWithIEDNameItemProvider extends ControlItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ControlWithIEDNameItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ControlWithIEDNameItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,12 +58,12 @@ public class ControlWithIEDNameItemProvider extends ControlItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addConfRevPropertyDescriptor(object);
-            addReferredByControlBlockPropertyDescriptor(object);
+            addConfRevPropertyDescriptor( object );
+            addReferredByControlBlockPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class ControlWithIEDNameItemProvider extends ControlItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addConfRevPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ControlWithIEDName_confRev_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ControlWithIEDName_confRev_feature", "_UI_ControlWithIEDName_type"),
-                 SclPackage.eINSTANCE.getControlWithIEDName_ConfRev(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addConfRevPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ControlWithIEDName_confRev_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ControlWithIEDName_confRev_feature",
+                                "_UI_ControlWithIEDName_type" ),
+                        SclPackage.eINSTANCE.getControlWithIEDName_ConfRev(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class ControlWithIEDNameItemProvider extends ControlItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByControlBlockPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ControlWithIEDName_ReferredByControlBlock_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ControlWithIEDName_ReferredByControlBlock_feature", "_UI_ControlWithIEDName_type"),
-                 SclPackage.eINSTANCE.getControlWithIEDName_ReferredByControlBlock(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByControlBlockPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add( createItemPropertyDescriptor(
+                ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                getResourceLocator(),
+                getString( "_UI_ControlWithIEDName_ReferredByControlBlock_feature" ),
+                getString( "_UI_PropertyDescriptor_description",
+                        "_UI_ControlWithIEDName_ReferredByControlBlock_feature", "_UI_ControlWithIEDName_type" ),
+                SclPackage.eINSTANCE.getControlWithIEDName_ReferredByControlBlock(),
+                true,
+                false,
+                true,
+                null,
+                null,
+                null ) );
     }
 
     /**
@@ -122,11 +121,11 @@ public class ControlWithIEDNameItemProvider extends ControlItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getControlWithIEDName_IEDName());
-            childrenFeatures.add(SclPackage.eINSTANCE.getControlWithIEDName_Protocol());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getControlWithIEDName_IEDName() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getControlWithIEDName_Protocol() );
         }
         return childrenFeatures;
     }
@@ -137,11 +136,11 @@ public class ControlWithIEDNameItemProvider extends ControlItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -151,8 +150,8 @@ public class ControlWithIEDNameItemProvider extends ControlItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ControlWithIEDName"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ControlWithIEDName" ) );
     }
 
     /**
@@ -162,13 +161,11 @@ public class ControlWithIEDNameItemProvider extends ControlItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((ControlWithIEDName)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_ControlWithIEDName_type") :
-            getString("_UI_ControlWithIEDName_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( ControlWithIEDName ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_ControlWithIEDName_type" )
+                : getString( "_UI_ControlWithIEDName_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -178,19 +175,19 @@ public class ControlWithIEDNameItemProvider extends ControlItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(ControlWithIEDName.class)) {
-            case SclPackage.CONTROL_WITH_IED_NAME__CONF_REV:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.CONTROL_WITH_IED_NAME__IED_NAME:
-            case SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( ControlWithIEDName.class ) ) {
+        case SclPackage.CONTROL_WITH_IED_NAME__CONF_REV:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.CONTROL_WITH_IED_NAME__IED_NAME:
+        case SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -201,18 +198,14 @@ public class ControlWithIEDNameItemProvider extends ControlItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getControlWithIEDName_IEDName(),
-                 SclFactory.eINSTANCE.createIEDName()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getControlWithIEDName_Protocol(),
-                 SclFactory.eINSTANCE.createProtocol()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getControlWithIEDName_IEDName(),
+                SclFactory.eINSTANCE.createIEDName() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getControlWithIEDName_Protocol(),
+                SclFactory.eINSTANCE.createProtocol() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlWithTriggerOptItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlWithTriggerOptItemProvider.java
index c41a6f8..65d7923 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlWithTriggerOptItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlWithTriggerOptItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class ControlWithTriggerOptItemProvider extends ControlItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ControlWithTriggerOptItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ControlWithTriggerOptItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class ControlWithTriggerOptItemProvider extends ControlItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addIntgPdPropertyDescriptor(object);
+            addIntgPdPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class ControlWithTriggerOptItemProvider extends ControlItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIntgPdPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ControlWithTriggerOpt_intgPd_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ControlWithTriggerOpt_intgPd_feature", "_UI_ControlWithTriggerOpt_type"),
-                 SclPackage.eINSTANCE.getControlWithTriggerOpt_IntgPd(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIntgPdPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ControlWithTriggerOpt_intgPd_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ControlWithTriggerOpt_intgPd_feature",
+                                "_UI_ControlWithTriggerOpt_type" ),
+                        SclPackage.eINSTANCE.getControlWithTriggerOpt_IntgPd(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,10 +98,10 @@ public class ControlWithTriggerOptItemProvider extends ControlItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getControlWithTriggerOpt_TrgOps());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getControlWithTriggerOpt_TrgOps() );
         }
         return childrenFeatures;
     }
@@ -113,11 +112,11 @@ public class ControlWithTriggerOptItemProvider extends ControlItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -127,8 +126,8 @@ public class ControlWithTriggerOptItemProvider extends ControlItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ControlWithTriggerOpt"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ControlWithTriggerOpt" ) );
     }
 
     /**
@@ -138,13 +137,11 @@ public class ControlWithTriggerOptItemProvider extends ControlItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((ControlWithTriggerOpt)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_ControlWithTriggerOpt_type") :
-            getString("_UI_ControlWithTriggerOpt_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( ControlWithTriggerOpt ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_ControlWithTriggerOpt_type" )
+                : getString( "_UI_ControlWithTriggerOpt_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -154,18 +151,18 @@ public class ControlWithTriggerOptItemProvider extends ControlItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(ControlWithTriggerOpt.class)) {
-            case SclPackage.CONTROL_WITH_TRIGGER_OPT__INTG_PD:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( ControlWithTriggerOpt.class ) ) {
+        case SclPackage.CONTROL_WITH_TRIGGER_OPT__INTG_PD:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -176,13 +173,11 @@ public class ControlWithTriggerOptItemProvider extends ControlItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getControlWithTriggerOpt_TrgOps(),
-                 SclFactory.eINSTANCE.createTrgOps()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getControlWithTriggerOpt_TrgOps(),
+                SclFactory.eINSTANCE.createTrgOps() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DAIItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DAIItemProvider.java
index 44ce7aa..feccab2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DAIItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DAIItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class DAIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public DAIItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public DAIItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,16 +58,16 @@ public class DAIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addIxPropertyDescriptor(object);
-            addSAddrPropertyDescriptor(object);
-            addValImportPropertyDescriptor(object);
-            addValKindPropertyDescriptor(object);
-            addNamePropertyDescriptor(object);
-            addRefersToAbstractDataAttributePropertyDescriptor(object);
+            addIxPropertyDescriptor( object );
+            addSAddrPropertyDescriptor( object );
+            addValImportPropertyDescriptor( object );
+            addValKindPropertyDescriptor( object );
+            addNamePropertyDescriptor( object );
+            addRefersToAbstractDataAttributePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -79,20 +78,19 @@ public class DAIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIxPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DAI_ix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DAI_ix_feature", "_UI_DAI_type"),
-                 SclPackage.eINSTANCE.getDAI_Ix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIxPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DAI_ix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DAI_ix_feature", "_UI_DAI_type" ),
+                        SclPackage.eINSTANCE.getDAI_Ix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -101,20 +99,19 @@ public class DAIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSAddrPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DAI_sAddr_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DAI_sAddr_feature", "_UI_DAI_type"),
-                 SclPackage.eINSTANCE.getDAI_SAddr(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSAddrPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DAI_sAddr_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DAI_sAddr_feature", "_UI_DAI_type" ),
+                        SclPackage.eINSTANCE.getDAI_SAddr(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -123,20 +120,19 @@ public class DAIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addValImportPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DAI_valImport_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DAI_valImport_feature", "_UI_DAI_type"),
-                 SclPackage.eINSTANCE.getDAI_ValImport(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValImportPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DAI_valImport_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DAI_valImport_feature", "_UI_DAI_type" ),
+                        SclPackage.eINSTANCE.getDAI_ValImport(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -145,20 +141,19 @@ public class DAIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addValKindPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DAI_valKind_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DAI_valKind_feature", "_UI_DAI_type"),
-                 SclPackage.eINSTANCE.getDAI_ValKind(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValKindPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DAI_valKind_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DAI_valKind_feature", "_UI_DAI_type" ),
+                        SclPackage.eINSTANCE.getDAI_ValKind(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -167,20 +162,19 @@ public class DAIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DAI_name_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DAI_name_feature", "_UI_DAI_type"),
-                 SclPackage.eINSTANCE.getDAI_Name(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DAI_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DAI_name_feature", "_UI_DAI_type" ),
+                        SclPackage.eINSTANCE.getDAI_Name(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -189,20 +183,20 @@ public class DAIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToAbstractDataAttributePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DAI_RefersToAbstractDataAttribute_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DAI_RefersToAbstractDataAttribute_feature", "_UI_DAI_type"),
-                 SclPackage.eINSTANCE.getDAI_RefersToAbstractDataAttribute(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToAbstractDataAttributePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DAI_RefersToAbstractDataAttribute_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_DAI_RefersToAbstractDataAttribute_feature", "_UI_DAI_type" ),
+                        SclPackage.eINSTANCE.getDAI_RefersToAbstractDataAttribute(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -214,10 +208,10 @@ public class DAIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getDAI_Val());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getDAI_Val() );
         }
         return childrenFeatures;
     }
@@ -228,11 +222,11 @@ public class DAIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -242,8 +236,8 @@ public class DAIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DAI"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DAI" ) );
     }
 
     /**
@@ -253,13 +247,11 @@ public class DAIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((DAI)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_DAI_type") :
-            getString("_UI_DAI_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( DAI ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_DAI_type" )
+                : getString( "_UI_DAI_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -269,22 +261,22 @@ public class DAIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(DAI.class)) {
-            case SclPackage.DAI__IX:
-            case SclPackage.DAI__SADDR:
-            case SclPackage.DAI__VAL_IMPORT:
-            case SclPackage.DAI__VAL_KIND:
-            case SclPackage.DAI__NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.DAI__VAL:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( DAI.class ) ) {
+        case SclPackage.DAI__IX:
+        case SclPackage.DAI__SADDR:
+        case SclPackage.DAI__VAL_IMPORT:
+        case SclPackage.DAI__VAL_KIND:
+        case SclPackage.DAI__NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.DAI__VAL:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -295,13 +287,11 @@ public class DAIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getDAI_Val(),
-                 SclFactory.eINSTANCE.createVal()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getDAI_Val(),
+                SclFactory.eINSTANCE.createVal() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DAItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DAItemProvider.java
index fd64891..714d463 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DAItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DAItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public DAItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public DAItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,14 +58,14 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
-
-            addDchgPropertyDescriptor(object);
-            addDupdPropertyDescriptor(object);
-            addQchgPropertyDescriptor(object);
-            addFcPropertyDescriptor(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
+
+            addDchgPropertyDescriptor( object );
+            addDupdPropertyDescriptor( object );
+            addQchgPropertyDescriptor( object );
+            addFcPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -77,20 +76,20 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDchgPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgDATrgOp_dchg_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgDATrgOp_dchg_feature", "_UI_AgDATrgOp_type"),
-                 SclPackage.eINSTANCE.getAgDATrgOp_Dchg(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDchgPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgDATrgOp_dchg_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgDATrgOp_dchg_feature",
+                                "_UI_AgDATrgOp_type" ),
+                        SclPackage.eINSTANCE.getAgDATrgOp_Dchg(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,20 +98,20 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDupdPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgDATrgOp_dupd_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgDATrgOp_dupd_feature", "_UI_AgDATrgOp_type"),
-                 SclPackage.eINSTANCE.getAgDATrgOp_Dupd(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDupdPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgDATrgOp_dupd_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgDATrgOp_dupd_feature",
+                                "_UI_AgDATrgOp_type" ),
+                        SclPackage.eINSTANCE.getAgDATrgOp_Dupd(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -121,20 +120,19 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addFcPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DA_fc_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DA_fc_feature", "_UI_DA_type"),
-                 SclPackage.eINSTANCE.getDA_Fc(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addFcPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DA_fc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DA_fc_feature", "_UI_DA_type" ),
+                        SclPackage.eINSTANCE.getDA_Fc(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -143,20 +141,20 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addQchgPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgDATrgOp_qchg_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgDATrgOp_qchg_feature", "_UI_AgDATrgOp_type"),
-                 SclPackage.eINSTANCE.getAgDATrgOp_Qchg(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addQchgPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgDATrgOp_qchg_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgDATrgOp_qchg_feature",
+                                "_UI_AgDATrgOp_type" ),
+                        SclPackage.eINSTANCE.getAgDATrgOp_Qchg(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -168,10 +166,10 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getDA_ProtNs());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getDA_ProtNs() );
         }
         return childrenFeatures;
     }
@@ -182,11 +180,11 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -196,8 +194,8 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DA"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DA" ) );
     }
 
     /**
@@ -207,13 +205,11 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((DA)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_DA_type") :
-            getString("_UI_DA_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( DA ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_DA_type" )
+                : getString( "_UI_DA_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -223,21 +219,21 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(DA.class)) {
-            case SclPackage.DA__DCHG:
-            case SclPackage.DA__DUPD:
-            case SclPackage.DA__QCHG:
-            case SclPackage.DA__FC:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.DA__PROT_NS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( DA.class ) ) {
+        case SclPackage.DA__DCHG:
+        case SclPackage.DA__DUPD:
+        case SclPackage.DA__QCHG:
+        case SclPackage.DA__FC:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.DA__PROT_NS:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -248,13 +244,11 @@ public class DAItemProvider extends AbstractDataAttributeItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getDA_ProtNs(),
-                 SclFactory.eINSTANCE.createProtNs()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getDA_ProtNs(),
+                SclFactory.eINSTANCE.createProtNs() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DATypeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DATypeItemProvider.java
index 1e90bb1..c10b836 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DATypeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DATypeItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class DATypeItemProvider extends IDNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public DATypeItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public DATypeItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,12 +58,12 @@ public class DATypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addIedTypePropertyDescriptor(object);
-            addReferredByAbstractDataAttributePropertyDescriptor(object);
+            addIedTypePropertyDescriptor( object );
+            addReferredByAbstractDataAttributePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class DATypeItemProvider extends IDNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIedTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DAType_iedType_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DAType_iedType_feature", "_UI_DAType_type"),
-                 SclPackage.eINSTANCE.getDAType_IedType(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIedTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DAType_iedType_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DAType_iedType_feature",
+                                "_UI_DAType_type" ),
+                        SclPackage.eINSTANCE.getDAType_IedType(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class DATypeItemProvider extends IDNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByAbstractDataAttributePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DAType_ReferredByAbstractDataAttribute_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DAType_ReferredByAbstractDataAttribute_feature", "_UI_DAType_type"),
-                 SclPackage.eINSTANCE.getDAType_ReferredByAbstractDataAttribute(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByAbstractDataAttributePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DAType_ReferredByAbstractDataAttribute_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_DAType_ReferredByAbstractDataAttribute_feature", "_UI_DAType_type" ),
+                        SclPackage.eINSTANCE.getDAType_ReferredByAbstractDataAttribute(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -122,11 +121,11 @@ public class DATypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getDAType_BDA());
-            childrenFeatures.add(SclPackage.eINSTANCE.getDAType_ProtNs());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getDAType_BDA() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getDAType_ProtNs() );
         }
         return childrenFeatures;
     }
@@ -137,11 +136,11 @@ public class DATypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -151,8 +150,8 @@ public class DATypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DAType"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DAType" ) );
     }
 
     /**
@@ -162,13 +161,11 @@ public class DATypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((DAType)object).getId();
-        return label == null || label.length() == 0 ?
-            getString("_UI_DAType_type") :
-            getString("_UI_DAType_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( DAType ) object ).getId();
+        return label == null || label.length() == 0 ? getString( "_UI_DAType_type" )
+                : getString( "_UI_DAType_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -178,19 +175,19 @@ public class DATypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(DAType.class)) {
-            case SclPackage.DA_TYPE__IED_TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.DA_TYPE__BDA:
-            case SclPackage.DA_TYPE__PROT_NS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( DAType.class ) ) {
+        case SclPackage.DA_TYPE__IED_TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.DA_TYPE__BDA:
+        case SclPackage.DA_TYPE__PROT_NS:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -201,18 +198,14 @@ public class DATypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getDAType_BDA(),
-                 SclFactory.eINSTANCE.createBDA()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getDAType_ProtNs(),
-                 SclFactory.eINSTANCE.createProtNs()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getDAType_BDA(),
+                SclFactory.eINSTANCE.createBDA() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getDAType_ProtNs(),
+                SclFactory.eINSTANCE.createProtNs() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DOIItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DOIItemProvider.java
index 5980202..432a156 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DOIItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DOIItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class DOIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public DOIItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public DOIItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,14 +58,14 @@ public class DOIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addIxPropertyDescriptor(object);
-            addAccessControlPropertyDescriptor(object);
-            addNamePropertyDescriptor(object);
-            addRefersToDOPropertyDescriptor(object);
+            addIxPropertyDescriptor( object );
+            addAccessControlPropertyDescriptor( object );
+            addNamePropertyDescriptor( object );
+            addRefersToDOPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -77,20 +76,19 @@ public class DOIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIxPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DOI_ix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DOI_ix_feature", "_UI_DOI_type"),
-                 SclPackage.eINSTANCE.getDOI_Ix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIxPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DOI_ix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DOI_ix_feature", "_UI_DOI_type" ),
+                        SclPackage.eINSTANCE.getDOI_Ix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,20 +97,20 @@ public class DOIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addAccessControlPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DOI_accessControl_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DOI_accessControl_feature", "_UI_DOI_type"),
-                 SclPackage.eINSTANCE.getDOI_AccessControl(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addAccessControlPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DOI_accessControl_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DOI_accessControl_feature",
+                                "_UI_DOI_type" ),
+                        SclPackage.eINSTANCE.getDOI_AccessControl(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -121,20 +119,19 @@ public class DOIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DOI_name_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DOI_name_feature", "_UI_DOI_type"),
-                 SclPackage.eINSTANCE.getDOI_Name(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DOI_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DOI_name_feature", "_UI_DOI_type" ),
+                        SclPackage.eINSTANCE.getDOI_Name(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -143,20 +140,19 @@ public class DOIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToDOPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DOI_RefersToDO_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DOI_RefersToDO_feature", "_UI_DOI_type"),
-                 SclPackage.eINSTANCE.getDOI_RefersToDO(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToDOPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DOI_RefersToDO_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DOI_RefersToDO_feature", "_UI_DOI_type" ),
+                        SclPackage.eINSTANCE.getDOI_RefersToDO(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -168,11 +164,11 @@ public class DOIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getDOI_DAI());
-            childrenFeatures.add(SclPackage.eINSTANCE.getDOI_SDI());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getDOI_DAI() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getDOI_SDI() );
         }
         return childrenFeatures;
     }
@@ -183,11 +179,11 @@ public class DOIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -197,8 +193,8 @@ public class DOIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DOI"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DOI" ) );
     }
 
     /**
@@ -208,13 +204,11 @@ public class DOIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((DOI)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_DOI_type") :
-            getString("_UI_DOI_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( DOI ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_DOI_type" )
+                : getString( "_UI_DOI_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -224,21 +218,21 @@ public class DOIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(DOI.class)) {
-            case SclPackage.DOI__IX:
-            case SclPackage.DOI__ACCESS_CONTROL:
-            case SclPackage.DOI__NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.DOI__DAI:
-            case SclPackage.DOI__SDI:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( DOI.class ) ) {
+        case SclPackage.DOI__IX:
+        case SclPackage.DOI__ACCESS_CONTROL:
+        case SclPackage.DOI__NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.DOI__DAI:
+        case SclPackage.DOI__SDI:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -249,18 +243,14 @@ public class DOIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getDOI_DAI(),
-                 SclFactory.eINSTANCE.createDAI()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getDOI_DAI(),
+                SclFactory.eINSTANCE.createDAI() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getDOI_SDI(),
-                 SclFactory.eINSTANCE.createSDI()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getDOI_SDI(),
+                SclFactory.eINSTANCE.createSDI() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DOItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DOItemProvider.java
index 651c0fd..f960833 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DOItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DOItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class DOItemProvider extends AbstractDataObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public DOItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public DOItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,13 +56,13 @@ public class DOItemProvider extends AbstractDataObjectItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTransientPropertyDescriptor(object);
-            addAccessControlPropertyDescriptor(object);
-            addReferredByDOIPropertyDescriptor(object);
+            addTransientPropertyDescriptor( object );
+            addAccessControlPropertyDescriptor( object );
+            addReferredByDOIPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,19 @@ public class DOItemProvider extends AbstractDataObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTransientPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DO_transient_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DO_transient_feature", "_UI_DO_type"),
-                 SclPackage.eINSTANCE.getDO_Transient(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTransientPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DO_transient_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DO_transient_feature", "_UI_DO_type" ),
+                        SclPackage.eINSTANCE.getDO_Transient(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,20 +94,20 @@ public class DOItemProvider extends AbstractDataObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addAccessControlPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DO_accessControl_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DO_accessControl_feature", "_UI_DO_type"),
-                 SclPackage.eINSTANCE.getDO_AccessControl(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addAccessControlPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DO_accessControl_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DO_accessControl_feature",
+                                "_UI_DO_type" ),
+                        SclPackage.eINSTANCE.getDO_AccessControl(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -118,20 +116,20 @@ public class DOItemProvider extends AbstractDataObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByDOIPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DO_ReferredByDOI_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DO_ReferredByDOI_feature", "_UI_DO_type"),
-                 SclPackage.eINSTANCE.getDO_ReferredByDOI(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByDOIPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DO_ReferredByDOI_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DO_ReferredByDOI_feature",
+                                "_UI_DO_type" ),
+                        SclPackage.eINSTANCE.getDO_ReferredByDOI(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -141,8 +139,8 @@ public class DOItemProvider extends AbstractDataObjectItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DO"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DO" ) );
     }
 
     /**
@@ -152,13 +150,11 @@ public class DOItemProvider extends AbstractDataObjectItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((DO)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_DO_type") :
-            getString("_UI_DO_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( DO ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_DO_type" )
+                : getString( "_UI_DO_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -168,16 +164,16 @@ public class DOItemProvider extends AbstractDataObjectItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(DO.class)) {
-            case SclPackage.DO__TRANSIENT:
-            case SclPackage.DO__ACCESS_CONTROL:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( DO.class ) ) {
+        case SclPackage.DO__TRANSIENT:
+        case SclPackage.DO__ACCESS_CONTROL:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -188,8 +184,8 @@ public class DOItemProvider extends AbstractDataObjectItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DOTypeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DOTypeItemProvider.java
index fcaabd6..1a5cf8c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DOTypeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DOTypeItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class DOTypeItemProvider extends IDNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public DOTypeItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public DOTypeItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,13 +58,13 @@ public class DOTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addCdcPropertyDescriptor(object);
-            addIedTypePropertyDescriptor(object);
-            addReferredByAbstractDataObjectPropertyDescriptor(object);
+            addCdcPropertyDescriptor( object );
+            addIedTypePropertyDescriptor( object );
+            addReferredByAbstractDataObjectPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -76,20 +75,19 @@ public class DOTypeItemProvider extends IDNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addCdcPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DOType_cdc_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DOType_cdc_feature", "_UI_DOType_type"),
-                 SclPackage.eINSTANCE.getDOType_Cdc(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addCdcPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DOType_cdc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DOType_cdc_feature", "_UI_DOType_type" ),
+                        SclPackage.eINSTANCE.getDOType_Cdc(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -98,20 +96,20 @@ public class DOTypeItemProvider extends IDNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIedTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DOType_iedType_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DOType_iedType_feature", "_UI_DOType_type"),
-                 SclPackage.eINSTANCE.getDOType_IedType(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIedTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DOType_iedType_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DOType_iedType_feature",
+                                "_UI_DOType_type" ),
+                        SclPackage.eINSTANCE.getDOType_IedType(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -120,20 +118,20 @@ public class DOTypeItemProvider extends IDNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByAbstractDataObjectPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DOType_ReferredByAbstractDataObject_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DOType_ReferredByAbstractDataObject_feature", "_UI_DOType_type"),
-                 SclPackage.eINSTANCE.getDOType_ReferredByAbstractDataObject(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByAbstractDataObjectPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DOType_ReferredByAbstractDataObject_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_DOType_ReferredByAbstractDataObject_feature", "_UI_DOType_type" ),
+                        SclPackage.eINSTANCE.getDOType_ReferredByAbstractDataObject(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -145,11 +143,11 @@ public class DOTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getDOType_DA());
-            childrenFeatures.add(SclPackage.eINSTANCE.getDOType_SDO());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getDOType_DA() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getDOType_SDO() );
         }
         return childrenFeatures;
     }
@@ -160,11 +158,11 @@ public class DOTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -174,8 +172,8 @@ public class DOTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DOType"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DOType" ) );
     }
 
     /**
@@ -185,13 +183,11 @@ public class DOTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((DOType)object).getId();
-        return label == null || label.length() == 0 ?
-            getString("_UI_DOType_type") :
-            getString("_UI_DOType_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( DOType ) object ).getId();
+        return label == null || label.length() == 0 ? getString( "_UI_DOType_type" )
+                : getString( "_UI_DOType_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -201,20 +197,20 @@ public class DOTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(DOType.class)) {
-            case SclPackage.DO_TYPE__CDC:
-            case SclPackage.DO_TYPE__IED_TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.DO_TYPE__DA:
-            case SclPackage.DO_TYPE__SDO:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( DOType.class ) ) {
+        case SclPackage.DO_TYPE__CDC:
+        case SclPackage.DO_TYPE__IED_TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.DO_TYPE__DA:
+        case SclPackage.DO_TYPE__SDO:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -225,18 +221,14 @@ public class DOTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getDOType_DA(),
-                 SclFactory.eINSTANCE.createDA()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getDOType_SDO(),
-                 SclFactory.eINSTANCE.createSDO()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getDOType_DA(),
+                SclFactory.eINSTANCE.createDA() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getDOType_SDO(),
+                SclFactory.eINSTANCE.createSDO() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataObjectDirectoryItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataObjectDirectoryItemProvider.java
index 234c5aa..650aed6 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataObjectDirectoryItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataObjectDirectoryItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataObjectDirectory;
  * <!-- end-user-doc -->
  * @generated
  */
-public class DataObjectDirectoryItemProvider 
-    extends ServiceYesNoItemProvider {
+public class DataObjectDirectoryItemProvider
+        extends ServiceYesNoItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public DataObjectDirectoryItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public DataObjectDirectoryItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class DataObjectDirectoryItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class DataObjectDirectoryItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DataObjectDirectory"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DataObjectDirectory" ) );
     }
 
     /**
@@ -80,11 +79,10 @@ public class DataObjectDirectoryItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        DataObjectDirectory dataObjectDirectory = (DataObjectDirectory)object;
-        return getString("_UI_DataObjectDirectory_type") + " " + dataObjectDirectory.getLineNumber();
+    public String getText( Object object ) {
+        DataObjectDirectory dataObjectDirectory = ( DataObjectDirectory ) object;
+        return getString( "_UI_DataObjectDirectory_type" ) + " " + dataObjectDirectory.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -94,9 +92,8 @@ public class DataObjectDirectoryItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -107,8 +104,8 @@ public class DataObjectDirectoryItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataSetDirectoryItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataSetDirectoryItemProvider.java
index 9fb170a..43f8129 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataSetDirectoryItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataSetDirectoryItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataSetDirectory;
  * <!-- end-user-doc -->
  * @generated
  */
-public class DataSetDirectoryItemProvider 
-    extends ServiceYesNoItemProvider {
+public class DataSetDirectoryItemProvider
+        extends ServiceYesNoItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public DataSetDirectoryItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public DataSetDirectoryItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class DataSetDirectoryItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class DataSetDirectoryItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DataSetDirectory"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DataSetDirectory" ) );
     }
 
     /**
@@ -80,11 +79,10 @@ public class DataSetDirectoryItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        DataSetDirectory dataSetDirectory = (DataSetDirectory)object;
-        return getString("_UI_DataSetDirectory_type") + " " + dataSetDirectory.getLineNumber();
+    public String getText( Object object ) {
+        DataSetDirectory dataSetDirectory = ( DataSetDirectory ) object;
+        return getString( "_UI_DataSetDirectory_type" ) + " " + dataSetDirectory.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -94,9 +92,8 @@ public class DataSetDirectoryItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -107,8 +104,8 @@ public class DataSetDirectoryItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataSetItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataSetItemProvider.java
index e41f3c7..9b8a016 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataSetItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataSetItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class DataSetItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public DataSetItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public DataSetItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,12 +58,12 @@ public class DataSetItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addReferredByControlPropertyDescriptor(object);
-            addNamePropertyDescriptor(object);
+            addReferredByControlPropertyDescriptor( object );
+            addNamePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class DataSetItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByControlPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DataSet_ReferredByControl_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DataSet_ReferredByControl_feature", "_UI_DataSet_type"),
-                 SclPackage.eINSTANCE.getDataSet_ReferredByControl(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByControlPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DataSet_ReferredByControl_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataSet_ReferredByControl_feature",
+                                "_UI_DataSet_type" ),
+                        SclPackage.eINSTANCE.getDataSet_ReferredByControl(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class DataSetItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DataSet_name_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DataSet_name_feature", "_UI_DataSet_type"),
-                 SclPackage.eINSTANCE.getDataSet_Name(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DataSet_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DataSet_name_feature",
+                                "_UI_DataSet_type" ),
+                        SclPackage.eINSTANCE.getDataSet_Name(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -122,10 +121,10 @@ public class DataSetItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getDataSet_FCDA());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getDataSet_FCDA() );
         }
         return childrenFeatures;
     }
@@ -136,11 +135,11 @@ public class DataSetItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -150,8 +149,8 @@ public class DataSetItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DataSet"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DataSet" ) );
     }
 
     /**
@@ -161,13 +160,11 @@ public class DataSetItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((DataSet)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_DataSet_type") :
-            getString("_UI_DataSet_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( DataSet ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_DataSet_type" )
+                : getString( "_UI_DataSet_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -177,18 +174,18 @@ public class DataSetItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(DataSet.class)) {
-            case SclPackage.DATA_SET__NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.DATA_SET__FCDA:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( DataSet.class ) ) {
+        case SclPackage.DATA_SET__NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.DATA_SET__FCDA:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -199,13 +196,11 @@ public class DataSetItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getDataSet_FCDA(),
-                 SclFactory.eINSTANCE.createFCDA()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getDataSet_FCDA(),
+                SclFactory.eINSTANCE.createFCDA() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataTypeTemplatesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataTypeTemplatesItemProvider.java
index 536fd95..9f83283 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataTypeTemplatesItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataTypeTemplatesItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class DataTypeTemplatesItemProvider 
-    extends SclObjectItemProvider {
+public class DataTypeTemplatesItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public DataTypeTemplatesItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public DataTypeTemplatesItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,9 +57,9 @@ public class DataTypeTemplatesItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -75,13 +74,13 @@ public class DataTypeTemplatesItemProvider
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getDataTypeTemplates_DAType());
-            childrenFeatures.add(SclPackage.eINSTANCE.getDataTypeTemplates_DOType());
-            childrenFeatures.add(SclPackage.eINSTANCE.getDataTypeTemplates_EnumType());
-            childrenFeatures.add(SclPackage.eINSTANCE.getDataTypeTemplates_LNodeType());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getDataTypeTemplates_DAType() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getDataTypeTemplates_DOType() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getDataTypeTemplates_EnumType() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getDataTypeTemplates_LNodeType() );
         }
         return childrenFeatures;
     }
@@ -92,11 +91,11 @@ public class DataTypeTemplatesItemProvider
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -106,8 +105,8 @@ public class DataTypeTemplatesItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DataTypeTemplates"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DataTypeTemplates" ) );
     }
 
     /**
@@ -117,11 +116,10 @@ public class DataTypeTemplatesItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        DataTypeTemplates dataTypeTemplates = (DataTypeTemplates)object;
-        return getString("_UI_DataTypeTemplates_type") + " " + dataTypeTemplates.getLineNumber();
+    public String getText( Object object ) {
+        DataTypeTemplates dataTypeTemplates = ( DataTypeTemplates ) object;
+        return getString( "_UI_DataTypeTemplates_type" ) + " " + dataTypeTemplates.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -131,18 +129,18 @@ public class DataTypeTemplatesItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(DataTypeTemplates.class)) {
-            case SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE:
-            case SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE:
-            case SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE:
-            case SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( DataTypeTemplates.class ) ) {
+        case SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE:
+        case SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE:
+        case SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE:
+        case SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -153,28 +151,20 @@ public class DataTypeTemplatesItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getDataTypeTemplates_DAType(),
-                 SclFactory.eINSTANCE.createDAType()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getDataTypeTemplates_DOType(),
-                 SclFactory.eINSTANCE.createDOType()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getDataTypeTemplates_EnumType(),
-                 SclFactory.eINSTANCE.createEnumType()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getDataTypeTemplates_LNodeType(),
-                 SclFactory.eINSTANCE.createLNodeType()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getDataTypeTemplates_DAType(),
+                SclFactory.eINSTANCE.createDAType() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getDataTypeTemplates_DOType(),
+                SclFactory.eINSTANCE.createDOType() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getDataTypeTemplates_EnumType(),
+                SclFactory.eINSTANCE.createEnumType() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getDataTypeTemplates_LNodeType(),
+                SclFactory.eINSTANCE.createLNodeType() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInMilliSecItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInMilliSecItemProvider.java
index b3bdda6..739028d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInMilliSecItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInMilliSecItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class DurationInMilliSecItemProvider 
-    extends SclObjectItemProvider {
+public class DurationInMilliSecItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public DurationInMilliSecItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public DurationInMilliSecItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,13 +57,13 @@ public class DurationInMilliSecItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addValuePropertyDescriptor(object);
-            addMultiplierPropertyDescriptor(object);
-            addUnitPropertyDescriptor(object);
+            addValuePropertyDescriptor( object );
+            addMultiplierPropertyDescriptor( object );
+            addUnitPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class DurationInMilliSecItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addValuePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DurationInMilliSec_value_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DurationInMilliSec_value_feature", "_UI_DurationInMilliSec_type"),
-                 SclPackage.eINSTANCE.getDurationInMilliSec_Value(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValuePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DurationInMilliSec_value_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DurationInMilliSec_value_feature",
+                                "_UI_DurationInMilliSec_type" ),
+                        SclPackage.eINSTANCE.getDurationInMilliSec_Value(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class DurationInMilliSecItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMultiplierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DurationInMilliSec_multiplier_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DurationInMilliSec_multiplier_feature", "_UI_DurationInMilliSec_type"),
-                 SclPackage.eINSTANCE.getDurationInMilliSec_Multiplier(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMultiplierPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DurationInMilliSec_multiplier_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DurationInMilliSec_multiplier_feature",
+                                "_UI_DurationInMilliSec_type" ),
+                        SclPackage.eINSTANCE.getDurationInMilliSec_Multiplier(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,20 +118,20 @@ public class DurationInMilliSecItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addUnitPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DurationInMilliSec_unit_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DurationInMilliSec_unit_feature", "_UI_DurationInMilliSec_type"),
-                 SclPackage.eINSTANCE.getDurationInMilliSec_Unit(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addUnitPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_DurationInMilliSec_unit_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_DurationInMilliSec_unit_feature",
+                                "_UI_DurationInMilliSec_type" ),
+                        SclPackage.eINSTANCE.getDurationInMilliSec_Unit(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -142,8 +141,8 @@ public class DurationInMilliSecItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DurationInMilliSec"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DurationInMilliSec" ) );
     }
 
     /**
@@ -153,11 +152,10 @@ public class DurationInMilliSecItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        DurationInMilliSec durationInMilliSec = (DurationInMilliSec)object;
-        return getString("_UI_DurationInMilliSec_type") + " " + durationInMilliSec.getLineNumber();
+    public String getText( Object object ) {
+        DurationInMilliSec durationInMilliSec = ( DurationInMilliSec ) object;
+        return getString( "_UI_DurationInMilliSec_type" ) + " " + durationInMilliSec.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -167,17 +165,17 @@ public class DurationInMilliSecItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(DurationInMilliSec.class)) {
-            case SclPackage.DURATION_IN_MILLI_SEC__VALUE:
-            case SclPackage.DURATION_IN_MILLI_SEC__MULTIPLIER:
-            case SclPackage.DURATION_IN_MILLI_SEC__UNIT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( DurationInMilliSec.class ) ) {
+        case SclPackage.DURATION_IN_MILLI_SEC__VALUE:
+        case SclPackage.DURATION_IN_MILLI_SEC__MULTIPLIER:
+        case SclPackage.DURATION_IN_MILLI_SEC__UNIT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -188,8 +186,8 @@ public class DurationInMilliSecItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInSecItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInSecItemProvider.java
index bd19b12..2158c41 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInSecItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInSecItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,8 +43,8 @@ public class DurationInSecItemProvider extends ValueWithUnitItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public DurationInSecItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public DurationInSecItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -55,9 +54,9 @@ public class DurationInSecItemProvider extends ValueWithUnitItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -70,8 +69,8 @@ public class DurationInSecItemProvider extends ValueWithUnitItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DurationInSec"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DurationInSec" ) );
     }
 
     /**
@@ -81,11 +80,10 @@ public class DurationInSecItemProvider extends ValueWithUnitItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        DurationInSec durationInSec = (DurationInSec)object;
-        return getString("_UI_DurationInSec_type") + " " + durationInSec.getLineNumber();
+    public String getText( Object object ) {
+        DurationInSec durationInSec = ( DurationInSec ) object;
+        return getString( "_UI_DurationInSec_type" ) + " " + durationInSec.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -95,9 +93,8 @@ public class DurationInSecItemProvider extends ValueWithUnitItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -108,8 +105,8 @@ public class DurationInSecItemProvider extends ValueWithUnitItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynAssociationItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynAssociationItemProvider.java
index 88b97f0..c0fb057 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynAssociationItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynAssociationItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.DynAssociation;
  * <!-- end-user-doc -->
  * @generated
  */
-public class DynAssociationItemProvider 
-    extends ServiceWithOptionalMaxItemProvider {
+public class DynAssociationItemProvider
+        extends ServiceWithOptionalMaxItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public DynAssociationItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public DynAssociationItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class DynAssociationItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class DynAssociationItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DynAssociation"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DynAssociation" ) );
     }
 
     /**
@@ -80,11 +79,10 @@ public class DynAssociationItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        DynAssociation dynAssociation = (DynAssociation)object;
-        return getString("_UI_DynAssociation_type") + " " + dynAssociation.getLineNumber();
+    public String getText( Object object ) {
+        DynAssociation dynAssociation = ( DynAssociation ) object;
+        return getString( "_UI_DynAssociation_type" ) + " " + dynAssociation.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -94,9 +92,8 @@ public class DynAssociationItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -107,8 +104,8 @@ public class DynAssociationItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynDataSetItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynDataSetItemProvider.java
index bbed143..d195e2e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynDataSetItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynDataSetItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class DynDataSetItemProvider extends ServiceWithMaxAndMaxAttributesItemPr
      * <!-- end-user-doc -->
      * @generated
      */
-    public DynDataSetItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public DynDataSetItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class DynDataSetItemProvider extends ServiceWithMaxAndMaxAttributesItemPr
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class DynDataSetItemProvider extends ServiceWithMaxAndMaxAttributesItemPr
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/DynDataSet"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/DynDataSet" ) );
     }
 
     /**
@@ -79,11 +78,10 @@ public class DynDataSetItemProvider extends ServiceWithMaxAndMaxAttributesItemPr
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        DynDataSet dynDataSet = (DynDataSet)object;
-        return getString("_UI_DynDataSet_type") + " " + dynDataSet.getLineNumber();
+    public String getText( Object object ) {
+        DynDataSet dynDataSet = ( DynDataSet ) object;
+        return getString( "_UI_DynDataSet_type" ) + " " + dynDataSet.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -93,9 +91,8 @@ public class DynDataSetItemProvider extends ServiceWithMaxAndMaxAttributesItemPr
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -106,8 +103,8 @@ public class DynDataSetItemProvider extends ServiceWithMaxAndMaxAttributesItemPr
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EnumTypeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EnumTypeItemProvider.java
index aaacbe4..5232c9b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EnumTypeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EnumTypeItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -47,8 +46,8 @@ public class EnumTypeItemProvider extends IDNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public EnumTypeItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public EnumTypeItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,11 +57,11 @@ public class EnumTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addReferredByAbstractDataAttributePropertyDescriptor(object);
+            addReferredByAbstractDataAttributePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -73,20 +72,20 @@ public class EnumTypeItemProvider extends IDNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByAbstractDataAttributePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_EnumType_ReferredByAbstractDataAttribute_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_EnumType_ReferredByAbstractDataAttribute_feature", "_UI_EnumType_type"),
-                 SclPackage.eINSTANCE.getEnumType_ReferredByAbstractDataAttribute(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByAbstractDataAttributePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_EnumType_ReferredByAbstractDataAttribute_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_EnumType_ReferredByAbstractDataAttribute_feature", "_UI_EnumType_type" ),
+                        SclPackage.eINSTANCE.getEnumType_ReferredByAbstractDataAttribute(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -98,10 +97,10 @@ public class EnumTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getEnumType_EnumVal());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getEnumType_EnumVal() );
         }
         return childrenFeatures;
     }
@@ -112,11 +111,11 @@ public class EnumTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -126,8 +125,8 @@ public class EnumTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EnumType"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/EnumType" ) );
     }
 
     /**
@@ -137,13 +136,11 @@ public class EnumTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((EnumType)object).getId();
-        return label == null || label.length() == 0 ?
-            getString("_UI_EnumType_type") :
-            getString("_UI_EnumType_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( EnumType ) object ).getId();
+        return label == null || label.length() == 0 ? getString( "_UI_EnumType_type" )
+                : getString( "_UI_EnumType_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -153,15 +150,15 @@ public class EnumTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(EnumType.class)) {
-            case SclPackage.ENUM_TYPE__ENUM_VAL:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( EnumType.class ) ) {
+        case SclPackage.ENUM_TYPE__ENUM_VAL:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -172,13 +169,11 @@ public class EnumTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getEnumType_EnumVal(),
-                 SclFactory.eINSTANCE.createEnumVal()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getEnumType_EnumVal(),
+                SclFactory.eINSTANCE.createEnumVal() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EnumValItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EnumValItemProvider.java
index e793e75..bc412c9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EnumValItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EnumValItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class EnumValItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public EnumValItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public EnumValItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,13 +56,13 @@ public class EnumValItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addDescPropertyDescriptor(object);
-            addOrdPropertyDescriptor(object);
-            addValuePropertyDescriptor(object);
+            addDescPropertyDescriptor( object );
+            addOrdPropertyDescriptor( object );
+            addValuePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,75 +73,74 @@ public class EnumValItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addOrdPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_EnumVal_ord_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_EnumVal_ord_feature", "_UI_EnumVal_type"),
-                 SclPackage.eINSTANCE.getEnumVal_Ord(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addOrdPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_EnumVal_ord_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_EnumVal_ord_feature",
+                                "_UI_EnumVal_type" ),
+                        SclPackage.eINSTANCE.getEnumVal_Ord(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
      * This adds a property descriptor for the Value feature.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	protected void addValuePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_EnumVal_value_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_EnumVal_value_feature", "_UI_EnumVal_type"),
-                 SclPackage.eINSTANCE.getEnumVal_Value(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValuePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_EnumVal_value_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_EnumVal_value_feature",
+                                "_UI_EnumVal_type" ),
+                        SclPackage.eINSTANCE.getEnumVal_Value(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
-				/**
-     * This adds a property descriptor for the Desc feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addDescPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgDesc_desc_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type"),
-                 SclPackage.eINSTANCE.getAgDesc_Desc(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    /**
+    * This adds a property descriptor for the Desc feature.
+    * <!-- begin-user-doc -->
+    * <!-- end-user-doc -->
+    * @generated
+    */
+    protected void addDescPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgDesc_desc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type" ),
+                        SclPackage.eINSTANCE.getAgDesc_Desc(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
-                /**
-     * This returns EnumVal.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
+    /**
+    * This returns EnumVal.gif.
+    * <!-- begin-user-doc -->
+    * <!-- end-user-doc -->
+    * @generated
+    */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EnumVal"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/EnumVal" ) );
     }
 
     /**
@@ -152,11 +150,10 @@ public class EnumValItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        EnumVal enumVal = (EnumVal)object;
-        return getString("_UI_EnumVal_type") + " " + enumVal.getLineNumber();
+    public String getText( Object object ) {
+        EnumVal enumVal = ( EnumVal ) object;
+        return getString( "_UI_EnumVal_type" ) + " " + enumVal.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -166,17 +163,17 @@ public class EnumValItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(EnumVal.class)) {
-            case SclPackage.ENUM_VAL__DESC:
-            case SclPackage.ENUM_VAL__ORD:
-            case SclPackage.ENUM_VAL__VALUE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( EnumVal.class ) ) {
+        case SclPackage.ENUM_VAL__DESC:
+        case SclPackage.ENUM_VAL__ORD:
+        case SclPackage.ENUM_VAL__VALUE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -187,8 +184,8 @@ public class EnumValItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EqFunctionItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EqFunctionItemProvider.java
index 319dee1..d32d37f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EqFunctionItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EqFunctionItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class EqFunctionItemProvider extends AbstractEqFuncSubFuncItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public EqFunctionItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public EqFunctionItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class EqFunctionItemProvider extends AbstractEqFuncSubFuncItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class EqFunctionItemProvider extends AbstractEqFuncSubFuncItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EqFunction"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/EqFunction" ) );
     }
 
     /**
@@ -79,13 +78,11 @@ public class EqFunctionItemProvider extends AbstractEqFuncSubFuncItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((EqFunction)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_EqFunction_type") :
-            getString("_UI_EqFunction_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( EqFunction ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_EqFunction_type" )
+                : getString( "_UI_EqFunction_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -95,9 +92,8 @@ public class EqFunctionItemProvider extends AbstractEqFuncSubFuncItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -108,8 +104,8 @@ public class EqFunctionItemProvider extends AbstractEqFuncSubFuncItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EqSubFunctionItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EqSubFunctionItemProvider.java
index 8af2545..72ff38d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EqSubFunctionItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EqSubFunctionItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class EqSubFunctionItemProvider extends AbstractEqFuncSubFuncItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    public EqSubFunctionItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public EqSubFunctionItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class EqSubFunctionItemProvider extends AbstractEqFuncSubFuncItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class EqSubFunctionItemProvider extends AbstractEqFuncSubFuncItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EqSubFunction"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/EqSubFunction" ) );
     }
 
     /**
@@ -79,13 +78,11 @@ public class EqSubFunctionItemProvider extends AbstractEqFuncSubFuncItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((EqSubFunction)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_EqSubFunction_type") :
-            getString("_UI_EqSubFunction_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( EqSubFunction ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_EqSubFunction_type" )
+                : getString( "_UI_EqSubFunction_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -95,9 +92,8 @@ public class EqSubFunctionItemProvider extends AbstractEqFuncSubFuncItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -108,8 +104,8 @@ public class EqSubFunctionItemProvider extends AbstractEqFuncSubFuncItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EquipmentContainerItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EquipmentContainerItemProvider.java
index 4786d1d..6a9bcf3 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EquipmentContainerItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EquipmentContainerItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class EquipmentContainerItemProvider extends PowerSystemResourceItemProvi
      * <!-- end-user-doc -->
      * @generated
      */
-    public EquipmentContainerItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public EquipmentContainerItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,9 +56,9 @@ public class EquipmentContainerItemProvider extends PowerSystemResourceItemProvi
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -74,11 +73,11 @@ public class EquipmentContainerItemProvider extends PowerSystemResourceItemProvi
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getEquipmentContainer_PowerTransformer());
-            childrenFeatures.add(SclPackage.eINSTANCE.getEquipmentContainer_GeneralEquipment());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getEquipmentContainer_PowerTransformer() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getEquipmentContainer_GeneralEquipment() );
         }
         return childrenFeatures;
     }
@@ -89,11 +88,11 @@ public class EquipmentContainerItemProvider extends PowerSystemResourceItemProvi
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -103,8 +102,8 @@ public class EquipmentContainerItemProvider extends PowerSystemResourceItemProvi
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/EquipmentContainer"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/EquipmentContainer" ) );
     }
 
     /**
@@ -114,13 +113,11 @@ public class EquipmentContainerItemProvider extends PowerSystemResourceItemProvi
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((EquipmentContainer)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_EquipmentContainer_type") :
-            getString("_UI_EquipmentContainer_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( EquipmentContainer ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_EquipmentContainer_type" )
+                : getString( "_UI_EquipmentContainer_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -130,16 +127,16 @@ public class EquipmentContainerItemProvider extends PowerSystemResourceItemProvi
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(EquipmentContainer.class)) {
-            case SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER:
-            case SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( EquipmentContainer.class ) ) {
+        case SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER:
+        case SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -150,18 +147,14 @@ public class EquipmentContainerItemProvider extends PowerSystemResourceItemProvi
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getEquipmentContainer_PowerTransformer(),
-                 SclFactory.eINSTANCE.createPowerTransformer()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getEquipmentContainer_GeneralEquipment(),
-                 SclFactory.eINSTANCE.createGeneralEquipment()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getEquipmentContainer_PowerTransformer(),
+                SclFactory.eINSTANCE.createPowerTransformer() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getEquipmentContainer_GeneralEquipment(),
+                SclFactory.eINSTANCE.createGeneralEquipment() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EquipmentItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EquipmentItemProvider.java
index 68230b3..9ef3ce3 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EquipmentItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/EquipmentItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class EquipmentItemProvider extends PowerSystemResourceItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public EquipmentItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public EquipmentItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,11 +56,11 @@ public class EquipmentItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addVirtualPropertyDescriptor(object);
+            addVirtualPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -72,20 +71,20 @@ public class EquipmentItemProvider extends PowerSystemResourceItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addVirtualPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgVirtual_virtual_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgVirtual_virtual_feature", "_UI_AgVirtual_type"),
-                 SclPackage.eINSTANCE.getAgVirtual_Virtual(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addVirtualPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgVirtual_virtual_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgVirtual_virtual_feature",
+                                "_UI_AgVirtual_type" ),
+                        SclPackage.eINSTANCE.getAgVirtual_Virtual(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -95,8 +94,8 @@ public class EquipmentItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Equipment"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Equipment" ) );
     }
 
     /**
@@ -106,13 +105,11 @@ public class EquipmentItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((Equipment)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Equipment_type") :
-            getString("_UI_Equipment_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( Equipment ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_Equipment_type" )
+                : getString( "_UI_Equipment_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -122,15 +119,15 @@ public class EquipmentItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(Equipment.class)) {
-            case SclPackage.EQUIPMENT__VIRTUAL:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( Equipment.class ) ) {
+        case SclPackage.EQUIPMENT__VIRTUAL:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -141,8 +138,8 @@ public class EquipmentItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ExtRefItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ExtRefItemProvider.java
index 7550c53..a3bd357 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ExtRefItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ExtRefItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ExtRefItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ExtRefItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,32 +56,32 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
-
-            addDescPropertyDescriptor(object);
-            addDaNamePropertyDescriptor(object);
-            addDoNamePropertyDescriptor(object);
-            addIedNamePropertyDescriptor(object);
-            addIntAddrPropertyDescriptor(object);
-            addLdInstPropertyDescriptor(object);
-            addLnClassPropertyDescriptor(object);
-            addLnInstPropertyDescriptor(object);
-            addPrefixPropertyDescriptor(object);
-            addServiceTypePropertyDescriptor(object);
-            addSrcCBNamePropertyDescriptor(object);
-            addSrcLDInstPropertyDescriptor(object);
-            addSrcLNClassPropertyDescriptor(object);
-            addSrcLNInstPropertyDescriptor(object);
-            addSrcPrefixPropertyDescriptor(object);
-            addRefersToAbstractDataAttributePropertyDescriptor(object);
-            addRefersToAbstractDataObjectPropertyDescriptor(object);
-            addPServTPropertyDescriptor(object);
-            addPLNPropertyDescriptor(object);
-            addPDOPropertyDescriptor(object);
-            addPDAPropertyDescriptor(object);
-            addRefersToControlPropertyDescriptor(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
+
+            addDescPropertyDescriptor( object );
+            addDaNamePropertyDescriptor( object );
+            addDoNamePropertyDescriptor( object );
+            addIedNamePropertyDescriptor( object );
+            addIntAddrPropertyDescriptor( object );
+            addLdInstPropertyDescriptor( object );
+            addLnClassPropertyDescriptor( object );
+            addLnInstPropertyDescriptor( object );
+            addPrefixPropertyDescriptor( object );
+            addServiceTypePropertyDescriptor( object );
+            addSrcCBNamePropertyDescriptor( object );
+            addSrcLDInstPropertyDescriptor( object );
+            addSrcLNClassPropertyDescriptor( object );
+            addSrcLNInstPropertyDescriptor( object );
+            addSrcPrefixPropertyDescriptor( object );
+            addRefersToAbstractDataAttributePropertyDescriptor( object );
+            addRefersToAbstractDataObjectPropertyDescriptor( object );
+            addPServTPropertyDescriptor( object );
+            addPLNPropertyDescriptor( object );
+            addPDOPropertyDescriptor( object );
+            addPDAPropertyDescriptor( object );
+            addRefersToControlPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -93,20 +92,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDaNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_daName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_daName_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_DaName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDaNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_daName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_daName_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_DaName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -115,20 +114,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDoNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_doName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_doName_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_DoName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDoNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_doName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_doName_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_DoName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -137,20 +136,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIedNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_iedName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_iedName_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_IedName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIedNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_iedName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_iedName_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_IedName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -159,20 +158,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIntAddrPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_intAddr_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_intAddr_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_IntAddr(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIntAddrPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_intAddr_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_intAddr_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_IntAddr(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -181,20 +180,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLdInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_ldInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_ldInst_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_LdInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLdInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_ldInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_ldInst_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_LdInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -203,20 +202,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_lnClass_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_lnClass_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_LnClass(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnClassPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_lnClass_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_lnClass_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_LnClass(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -225,20 +224,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_lnInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_lnInst_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_LnInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_lnInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_lnInst_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_LnInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -247,20 +246,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPrefixPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_prefix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_prefix_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_Prefix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPrefixPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_prefix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_prefix_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_Prefix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -269,20 +268,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addServiceTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_serviceType_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_serviceType_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_ServiceType(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addServiceTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_serviceType_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_serviceType_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_ServiceType(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -291,20 +290,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSrcCBNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_srcCBName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_srcCBName_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_SrcCBName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSrcCBNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_srcCBName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_srcCBName_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_SrcCBName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -313,20 +312,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSrcLDInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_srcLDInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_srcLDInst_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_SrcLDInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSrcLDInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_srcLDInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_srcLDInst_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_SrcLDInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -335,20 +334,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSrcLNClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_srcLNClass_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_srcLNClass_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_SrcLNClass(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSrcLNClassPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_srcLNClass_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_srcLNClass_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_SrcLNClass(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -357,20 +356,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSrcLNInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_srcLNInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_srcLNInst_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_SrcLNInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSrcLNInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_srcLNInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_srcLNInst_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_SrcLNInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -379,20 +378,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSrcPrefixPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_srcPrefix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_srcPrefix_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_SrcPrefix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSrcPrefixPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_srcPrefix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_srcPrefix_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_SrcPrefix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -401,20 +400,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToAbstractDataAttributePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_RefersToAbstractDataAttribute_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_RefersToAbstractDataAttribute_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_RefersToAbstractDataAttribute(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToAbstractDataAttributePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_RefersToAbstractDataAttribute_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_ExtRef_RefersToAbstractDataAttribute_feature", "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_RefersToAbstractDataAttribute(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -423,20 +422,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToAbstractDataObjectPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_RefersToAbstractDataObject_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_RefersToAbstractDataObject_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_RefersToAbstractDataObject(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToAbstractDataObjectPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_RefersToAbstractDataObject_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_ExtRef_RefersToAbstractDataObject_feature", "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_RefersToAbstractDataObject(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -445,20 +444,19 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDescPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgDesc_desc_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type"),
-                 SclPackage.eINSTANCE.getAgDesc_Desc(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDescPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgDesc_desc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type" ),
+                        SclPackage.eINSTANCE.getAgDesc_Desc(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -467,20 +465,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPServTPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_pServT_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_pServT_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_PServT(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPServTPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_pServT_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_pServT_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_PServT(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -489,20 +487,19 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPLNPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_pLN_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_pLN_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_PLN(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPLNPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_pLN_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_pLN_feature", "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_PLN(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -511,20 +508,19 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPDOPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_pDO_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_pDO_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_PDO(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPDOPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_pDO_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_pDO_feature", "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_PDO(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -533,20 +529,19 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPDAPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_pDA_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_pDA_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_PDA(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPDAPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_pDA_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_pDA_feature", "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_PDA(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -555,20 +550,20 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToControlPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ExtRef_RefersToControl_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ExtRef_RefersToControl_feature", "_UI_ExtRef_type"),
-                 SclPackage.eINSTANCE.getExtRef_RefersToControl(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToControlPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ExtRef_RefersToControl_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ExtRef_RefersToControl_feature",
+                                "_UI_ExtRef_type" ),
+                        SclPackage.eINSTANCE.getExtRef_RefersToControl(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -578,8 +573,8 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ExtRef"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ExtRef" ) );
     }
 
     /**
@@ -589,13 +584,11 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((ExtRef)object).getDaName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_ExtRef_type") :
-            getString("_UI_ExtRef_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( ExtRef ) object ).getDaName();
+        return label == null || label.length() == 0 ? getString( "_UI_ExtRef_type" )
+                : getString( "_UI_ExtRef_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -605,33 +598,33 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(ExtRef.class)) {
-            case SclPackage.EXT_REF__DESC:
-            case SclPackage.EXT_REF__DA_NAME:
-            case SclPackage.EXT_REF__DO_NAME:
-            case SclPackage.EXT_REF__IED_NAME:
-            case SclPackage.EXT_REF__INT_ADDR:
-            case SclPackage.EXT_REF__LD_INST:
-            case SclPackage.EXT_REF__LN_CLASS:
-            case SclPackage.EXT_REF__LN_INST:
-            case SclPackage.EXT_REF__PREFIX:
-            case SclPackage.EXT_REF__SERVICE_TYPE:
-            case SclPackage.EXT_REF__SRC_CB_NAME:
-            case SclPackage.EXT_REF__SRC_LD_INST:
-            case SclPackage.EXT_REF__SRC_LN_CLASS:
-            case SclPackage.EXT_REF__SRC_LN_INST:
-            case SclPackage.EXT_REF__SRC_PREFIX:
-            case SclPackage.EXT_REF__PSERV_T:
-            case SclPackage.EXT_REF__PLN:
-            case SclPackage.EXT_REF__PDO:
-            case SclPackage.EXT_REF__PDA:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( ExtRef.class ) ) {
+        case SclPackage.EXT_REF__DESC:
+        case SclPackage.EXT_REF__DA_NAME:
+        case SclPackage.EXT_REF__DO_NAME:
+        case SclPackage.EXT_REF__IED_NAME:
+        case SclPackage.EXT_REF__INT_ADDR:
+        case SclPackage.EXT_REF__LD_INST:
+        case SclPackage.EXT_REF__LN_CLASS:
+        case SclPackage.EXT_REF__LN_INST:
+        case SclPackage.EXT_REF__PREFIX:
+        case SclPackage.EXT_REF__SERVICE_TYPE:
+        case SclPackage.EXT_REF__SRC_CB_NAME:
+        case SclPackage.EXT_REF__SRC_LD_INST:
+        case SclPackage.EXT_REF__SRC_LN_CLASS:
+        case SclPackage.EXT_REF__SRC_LN_INST:
+        case SclPackage.EXT_REF__SRC_PREFIX:
+        case SclPackage.EXT_REF__PSERV_T:
+        case SclPackage.EXT_REF__PLN:
+        case SclPackage.EXT_REF__PDO:
+        case SclPackage.EXT_REF__PDA:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -642,8 +635,8 @@ public class ExtRefItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FCDAItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FCDAItemProvider.java
index a0c9b34..4010565 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FCDAItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FCDAItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class FCDAItemProvider 
-    extends SclObjectItemProvider {
+public class FCDAItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public FCDAItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public FCDAItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,19 +57,19 @@ public class FCDAItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addDaNamePropertyDescriptor(object);
-            addDoNamePropertyDescriptor(object);
-            addFcPropertyDescriptor(object);
-            addIxPropertyDescriptor(object);
-            addLdInstPropertyDescriptor(object);
-            addLnClassPropertyDescriptor(object);
-            addLnInstPropertyDescriptor(object);
-            addPrefixPropertyDescriptor(object);
-            addRefersToAbstractDataAttributePropertyDescriptor(object);
+            addDaNamePropertyDescriptor( object );
+            addDoNamePropertyDescriptor( object );
+            addFcPropertyDescriptor( object );
+            addIxPropertyDescriptor( object );
+            addLdInstPropertyDescriptor( object );
+            addLnClassPropertyDescriptor( object );
+            addLnInstPropertyDescriptor( object );
+            addPrefixPropertyDescriptor( object );
+            addRefersToAbstractDataAttributePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -81,20 +80,19 @@ public class FCDAItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDaNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_FCDA_daName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_FCDA_daName_feature", "_UI_FCDA_type"),
-                 SclPackage.eINSTANCE.getFCDA_DaName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDaNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_FCDA_daName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_FCDA_daName_feature", "_UI_FCDA_type" ),
+                        SclPackage.eINSTANCE.getFCDA_DaName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -103,20 +101,19 @@ public class FCDAItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDoNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_FCDA_doName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_FCDA_doName_feature", "_UI_FCDA_type"),
-                 SclPackage.eINSTANCE.getFCDA_DoName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDoNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_FCDA_doName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_FCDA_doName_feature", "_UI_FCDA_type" ),
+                        SclPackage.eINSTANCE.getFCDA_DoName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -125,20 +122,19 @@ public class FCDAItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addFcPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_FCDA_fc_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_FCDA_fc_feature", "_UI_FCDA_type"),
-                 SclPackage.eINSTANCE.getFCDA_Fc(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addFcPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_FCDA_fc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_FCDA_fc_feature", "_UI_FCDA_type" ),
+                        SclPackage.eINSTANCE.getFCDA_Fc(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -147,20 +143,19 @@ public class FCDAItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIxPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_FCDA_ix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_FCDA_ix_feature", "_UI_FCDA_type"),
-                 SclPackage.eINSTANCE.getFCDA_Ix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIxPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_FCDA_ix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_FCDA_ix_feature", "_UI_FCDA_type" ),
+                        SclPackage.eINSTANCE.getFCDA_Ix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -169,20 +164,19 @@ public class FCDAItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLdInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_FCDA_ldInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_FCDA_ldInst_feature", "_UI_FCDA_type"),
-                 SclPackage.eINSTANCE.getFCDA_LdInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLdInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_FCDA_ldInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_FCDA_ldInst_feature", "_UI_FCDA_type" ),
+                        SclPackage.eINSTANCE.getFCDA_LdInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -191,20 +185,19 @@ public class FCDAItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_FCDA_lnClass_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_FCDA_lnClass_feature", "_UI_FCDA_type"),
-                 SclPackage.eINSTANCE.getFCDA_LnClass(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnClassPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_FCDA_lnClass_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_FCDA_lnClass_feature", "_UI_FCDA_type" ),
+                        SclPackage.eINSTANCE.getFCDA_LnClass(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -213,20 +206,19 @@ public class FCDAItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_FCDA_lnInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_FCDA_lnInst_feature", "_UI_FCDA_type"),
-                 SclPackage.eINSTANCE.getFCDA_LnInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_FCDA_lnInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_FCDA_lnInst_feature", "_UI_FCDA_type" ),
+                        SclPackage.eINSTANCE.getFCDA_LnInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -235,20 +227,19 @@ public class FCDAItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPrefixPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_FCDA_prefix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_FCDA_prefix_feature", "_UI_FCDA_type"),
-                 SclPackage.eINSTANCE.getFCDA_Prefix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPrefixPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_FCDA_prefix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_FCDA_prefix_feature", "_UI_FCDA_type" ),
+                        SclPackage.eINSTANCE.getFCDA_Prefix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -257,20 +248,20 @@ public class FCDAItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToAbstractDataAttributePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_FCDA_RefersToAbstractDataAttribute_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_FCDA_RefersToAbstractDataAttribute_feature", "_UI_FCDA_type"),
-                 SclPackage.eINSTANCE.getFCDA_RefersToAbstractDataAttribute(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToAbstractDataAttributePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_FCDA_RefersToAbstractDataAttribute_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_FCDA_RefersToAbstractDataAttribute_feature", "_UI_FCDA_type" ),
+                        SclPackage.eINSTANCE.getFCDA_RefersToAbstractDataAttribute(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -280,8 +271,8 @@ public class FCDAItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FCDA"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/FCDA" ) );
     }
 
     /**
@@ -291,13 +282,11 @@ public class FCDAItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((FCDA)object).getDaName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_FCDA_type") :
-            getString("_UI_FCDA_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( FCDA ) object ).getDaName();
+        return label == null || label.length() == 0 ? getString( "_UI_FCDA_type" )
+                : getString( "_UI_FCDA_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -307,22 +296,22 @@ public class FCDAItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(FCDA.class)) {
-            case SclPackage.FCDA__DA_NAME:
-            case SclPackage.FCDA__DO_NAME:
-            case SclPackage.FCDA__FC:
-            case SclPackage.FCDA__IX:
-            case SclPackage.FCDA__LD_INST:
-            case SclPackage.FCDA__LN_CLASS:
-            case SclPackage.FCDA__LN_INST:
-            case SclPackage.FCDA__PREFIX:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( FCDA.class ) ) {
+        case SclPackage.FCDA__DA_NAME:
+        case SclPackage.FCDA__DO_NAME:
+        case SclPackage.FCDA__FC:
+        case SclPackage.FCDA__IX:
+        case SclPackage.FCDA__LD_INST:
+        case SclPackage.FCDA__LN_CLASS:
+        case SclPackage.FCDA__LN_INST:
+        case SclPackage.FCDA__PREFIX:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -333,8 +322,8 @@ public class FCDAItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FileHandlingItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FileHandlingItemProvider.java
index f55bdec..a975717 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FileHandlingItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FileHandlingItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class FileHandlingItemProvider 
-    extends SclObjectItemProvider {
+public class FileHandlingItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public FileHandlingItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public FileHandlingItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,13 +57,13 @@ public class FileHandlingItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addFtpPropertyDescriptor(object);
-            addFtpsPropertyDescriptor(object);
-            addMmsPropertyDescriptor(object);
+            addFtpPropertyDescriptor( object );
+            addFtpsPropertyDescriptor( object );
+            addMmsPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class FileHandlingItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addFtpPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_FileHandling_ftp_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_FileHandling_ftp_feature", "_UI_FileHandling_type"),
-                 SclPackage.eINSTANCE.getFileHandling_Ftp(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addFtpPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_FileHandling_ftp_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_FileHandling_ftp_feature",
+                                "_UI_FileHandling_type" ),
+                        SclPackage.eINSTANCE.getFileHandling_Ftp(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class FileHandlingItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addFtpsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_FileHandling_ftps_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_FileHandling_ftps_feature", "_UI_FileHandling_type"),
-                 SclPackage.eINSTANCE.getFileHandling_Ftps(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addFtpsPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_FileHandling_ftps_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_FileHandling_ftps_feature",
+                                "_UI_FileHandling_type" ),
+                        SclPackage.eINSTANCE.getFileHandling_Ftps(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,20 +118,20 @@ public class FileHandlingItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMmsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_FileHandling_mms_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_FileHandling_mms_feature", "_UI_FileHandling_type"),
-                 SclPackage.eINSTANCE.getFileHandling_Mms(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMmsPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_FileHandling_mms_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_FileHandling_mms_feature",
+                                "_UI_FileHandling_type" ),
+                        SclPackage.eINSTANCE.getFileHandling_Mms(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -142,8 +141,8 @@ public class FileHandlingItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FileHandling"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/FileHandling" ) );
     }
 
     /**
@@ -153,11 +152,10 @@ public class FileHandlingItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        FileHandling fileHandling = (FileHandling)object;
-        return getString("_UI_FileHandling_type") + " " + fileHandling.getLineNumber();
+    public String getText( Object object ) {
+        FileHandling fileHandling = ( FileHandling ) object;
+        return getString( "_UI_FileHandling_type" ) + " " + fileHandling.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -167,17 +165,17 @@ public class FileHandlingItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(FileHandling.class)) {
-            case SclPackage.FILE_HANDLING__FTP:
-            case SclPackage.FILE_HANDLING__FTPS:
-            case SclPackage.FILE_HANDLING__MMS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( FileHandling.class ) ) {
+        case SclPackage.FILE_HANDLING__FTP:
+        case SclPackage.FILE_HANDLING__FTPS:
+        case SclPackage.FILE_HANDLING__MMS:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -188,8 +186,8 @@ public class FileHandlingItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FunctionItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FunctionItemProvider.java
index b1f2aa7..ffc44e2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FunctionItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FunctionItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class FunctionItemProvider extends PowerSystemResourceItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public FunctionItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public FunctionItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class FunctionItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTypePropertyDescriptor(object);
+            addTypePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class FunctionItemProvider extends PowerSystemResourceItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Function_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Function_type_feature", "_UI_Function_type"),
-                 SclPackage.eINSTANCE.getFunction_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Function_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Function_type_feature",
+                                "_UI_Function_type" ),
+                        SclPackage.eINSTANCE.getFunction_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,12 +98,12 @@ public class FunctionItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getFunction_ConductingEquipment());
-            childrenFeatures.add(SclPackage.eINSTANCE.getFunction_SubFunction());
-            childrenFeatures.add(SclPackage.eINSTANCE.getFunction_GeneralEquipment());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getFunction_ConductingEquipment() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getFunction_SubFunction() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getFunction_GeneralEquipment() );
         }
         return childrenFeatures;
     }
@@ -115,11 +114,11 @@ public class FunctionItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -129,8 +128,8 @@ public class FunctionItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Function"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Function" ) );
     }
 
     /**
@@ -140,13 +139,11 @@ public class FunctionItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((Function)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Function_type") :
-            getString("_UI_Function_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( Function ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_Function_type" )
+                : getString( "_UI_Function_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -156,20 +153,20 @@ public class FunctionItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(Function.class)) {
-            case SclPackage.FUNCTION__TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.FUNCTION__CONDUCTING_EQUIPMENT:
-            case SclPackage.FUNCTION__SUB_FUNCTION:
-            case SclPackage.FUNCTION__GENERAL_EQUIPMENT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( Function.class ) ) {
+        case SclPackage.FUNCTION__TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.FUNCTION__CONDUCTING_EQUIPMENT:
+        case SclPackage.FUNCTION__SUB_FUNCTION:
+        case SclPackage.FUNCTION__GENERAL_EQUIPMENT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -180,23 +177,17 @@ public class FunctionItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getFunction_ConductingEquipment(),
-                 SclFactory.eINSTANCE.createConductingEquipment()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getFunction_SubFunction(),
-                 SclFactory.eINSTANCE.createSubFunction()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getFunction_GeneralEquipment(),
-                 SclFactory.eINSTANCE.createGeneralEquipment()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getFunction_ConductingEquipment(),
+                SclFactory.eINSTANCE.createConductingEquipment() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getFunction_SubFunction(),
+                SclFactory.eINSTANCE.createSubFunction() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getFunction_GeneralEquipment(),
+                SclFactory.eINSTANCE.createGeneralEquipment() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GOOSEItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GOOSEItemProvider.java
index 62291a0..a3c0b6a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GOOSEItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GOOSEItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class GOOSEItemProvider extends ServiceWithMaxItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public GOOSEItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public GOOSEItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,13 +56,13 @@ public class GOOSEItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addFixedOffsPropertyDescriptor(object);
-            addGoosePropertyDescriptor(object);
-            addRGOOSEPropertyDescriptor(object);
+            addFixedOffsPropertyDescriptor( object );
+            addGoosePropertyDescriptor( object );
+            addRGOOSEPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class GOOSEItemProvider extends ServiceWithMaxItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addFixedOffsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GOOSE_fixedOffs_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GOOSE_fixedOffs_feature", "_UI_GOOSE_type"),
-                 SclPackage.eINSTANCE.getGOOSE_FixedOffs(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addFixedOffsPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_GOOSE_fixedOffs_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_GOOSE_fixedOffs_feature",
+                                "_UI_GOOSE_type" ),
+                        SclPackage.eINSTANCE.getGOOSE_FixedOffs(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,20 +95,19 @@ public class GOOSEItemProvider extends ServiceWithMaxItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addGoosePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GOOSE_goose_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GOOSE_goose_feature", "_UI_GOOSE_type"),
-                 SclPackage.eINSTANCE.getGOOSE_Goose(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addGoosePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_GOOSE_goose_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_GOOSE_goose_feature", "_UI_GOOSE_type" ),
+                        SclPackage.eINSTANCE.getGOOSE_Goose(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -118,20 +116,19 @@ public class GOOSEItemProvider extends ServiceWithMaxItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRGOOSEPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GOOSE_rGOOSE_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GOOSE_rGOOSE_feature", "_UI_GOOSE_type"),
-                 SclPackage.eINSTANCE.getGOOSE_RGOOSE(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addRGOOSEPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_GOOSE_rGOOSE_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_GOOSE_rGOOSE_feature", "_UI_GOOSE_type" ),
+                        SclPackage.eINSTANCE.getGOOSE_RGOOSE(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -141,8 +138,8 @@ public class GOOSEItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GOOSE"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/GOOSE" ) );
     }
 
     /**
@@ -152,11 +149,10 @@ public class GOOSEItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        GOOSE goose = (GOOSE)object;
-        return getString("_UI_GOOSE_type") + " " + goose.getLineNumber();
+    public String getText( Object object ) {
+        GOOSE goose = ( GOOSE ) object;
+        return getString( "_UI_GOOSE_type" ) + " " + goose.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -166,17 +162,17 @@ public class GOOSEItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(GOOSE.class)) {
-            case SclPackage.GOOSE__FIXED_OFFS:
-            case SclPackage.GOOSE__GOOSE:
-            case SclPackage.GOOSE__RGOOSE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( GOOSE.class ) ) {
+        case SclPackage.GOOSE__FIXED_OFFS:
+        case SclPackage.GOOSE__GOOSE:
+        case SclPackage.GOOSE__RGOOSE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -187,8 +183,8 @@ public class GOOSEItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GOOSESecurityItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GOOSESecurityItemProvider.java
index 6343cc8..25ed302 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GOOSESecurityItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GOOSESecurityItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class GOOSESecurityItemProvider extends CertificateItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public GOOSESecurityItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public GOOSESecurityItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class GOOSESecurityItemProvider extends CertificateItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class GOOSESecurityItemProvider extends CertificateItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GOOSESecurity"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/GOOSESecurity" ) );
     }
 
     /**
@@ -79,13 +78,11 @@ public class GOOSESecurityItemProvider extends CertificateItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((GOOSESecurity)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_GOOSESecurity_type") :
-            getString("_UI_GOOSESecurity_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( GOOSESecurity ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_GOOSESecurity_type" )
+                : getString( "_UI_GOOSESecurity_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -95,9 +92,8 @@ public class GOOSESecurityItemProvider extends CertificateItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -108,8 +104,8 @@ public class GOOSESecurityItemProvider extends CertificateItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEControlItemProvider.java
index 6fc372b..0f7646a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEControlItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEControlItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class GSEControlItemProvider extends ControlWithIEDNameItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public GSEControlItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public GSEControlItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,14 +56,14 @@ public class GSEControlItemProvider extends ControlWithIEDNameItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
-
-            addAppIDPropertyDescriptor(object);
-            addFixedOffsPropertyDescriptor(object);
-            addSecurityEnablePropertyDescriptor(object);
-            addTypePropertyDescriptor(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
+
+            addAppIDPropertyDescriptor( object );
+            addFixedOffsPropertyDescriptor( object );
+            addSecurityEnablePropertyDescriptor( object );
+            addTypePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class GSEControlItemProvider extends ControlWithIEDNameItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addAppIDPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GSEControl_appID_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GSEControl_appID_feature", "_UI_GSEControl_type"),
-                 SclPackage.eINSTANCE.getGSEControl_AppID(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addAppIDPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_GSEControl_appID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_GSEControl_appID_feature",
+                                "_UI_GSEControl_type" ),
+                        SclPackage.eINSTANCE.getGSEControl_AppID(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class GSEControlItemProvider extends ControlWithIEDNameItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addFixedOffsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GSEControl_fixedOffs_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GSEControl_fixedOffs_feature", "_UI_GSEControl_type"),
-                 SclPackage.eINSTANCE.getGSEControl_FixedOffs(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addFixedOffsPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_GSEControl_fixedOffs_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_GSEControl_fixedOffs_feature",
+                                "_UI_GSEControl_type" ),
+                        SclPackage.eINSTANCE.getGSEControl_FixedOffs(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,20 +118,20 @@ public class GSEControlItemProvider extends ControlWithIEDNameItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSecurityEnablePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GSEControl_securityEnable_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GSEControl_securityEnable_feature", "_UI_GSEControl_type"),
-                 SclPackage.eINSTANCE.getGSEControl_SecurityEnable(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSecurityEnablePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_GSEControl_securityEnable_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_GSEControl_securityEnable_feature",
+                                "_UI_GSEControl_type" ),
+                        SclPackage.eINSTANCE.getGSEControl_SecurityEnable(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -141,20 +140,20 @@ public class GSEControlItemProvider extends ControlWithIEDNameItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GSEControl_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GSEControl_type_feature", "_UI_GSEControl_type"),
-                 SclPackage.eINSTANCE.getGSEControl_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_GSEControl_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_GSEControl_type_feature",
+                                "_UI_GSEControl_type" ),
+                        SclPackage.eINSTANCE.getGSEControl_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -164,8 +163,8 @@ public class GSEControlItemProvider extends ControlWithIEDNameItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GSEControl"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/GSEControl" ) );
     }
 
     /**
@@ -175,13 +174,11 @@ public class GSEControlItemProvider extends ControlWithIEDNameItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((GSEControl)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_GSEControl_type") :
-            getString("_UI_GSEControl_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( GSEControl ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_GSEControl_type" )
+                : getString( "_UI_GSEControl_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -191,18 +188,18 @@ public class GSEControlItemProvider extends ControlWithIEDNameItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(GSEControl.class)) {
-            case SclPackage.GSE_CONTROL__APP_ID:
-            case SclPackage.GSE_CONTROL__FIXED_OFFS:
-            case SclPackage.GSE_CONTROL__SECURITY_ENABLE:
-            case SclPackage.GSE_CONTROL__TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( GSEControl.class ) ) {
+        case SclPackage.GSE_CONTROL__APP_ID:
+        case SclPackage.GSE_CONTROL__FIXED_OFFS:
+        case SclPackage.GSE_CONTROL__SECURITY_ENABLE:
+        case SclPackage.GSE_CONTROL__TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -213,8 +210,8 @@ public class GSEControlItemProvider extends ControlWithIEDNameItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEDirItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEDirItemProvider.java
index c3ea54c..117834b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEDirItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEDirItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.GSEDir;
  * <!-- end-user-doc -->
  * @generated
  */
-public class GSEDirItemProvider 
-    extends ServiceYesNoItemProvider {
+public class GSEDirItemProvider
+        extends ServiceYesNoItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public GSEDirItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public GSEDirItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class GSEDirItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class GSEDirItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GSEDir"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/GSEDir" ) );
     }
 
     /**
@@ -80,11 +79,10 @@ public class GSEDirItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        GSEDir gseDir = (GSEDir)object;
-        return getString("_UI_GSEDir_type") + " " + gseDir.getLineNumber();
+    public String getText( Object object ) {
+        GSEDir gseDir = ( GSEDir ) object;
+        return getString( "_UI_GSEDir_type" ) + " " + gseDir.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -94,9 +92,8 @@ public class GSEDirItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -107,8 +104,8 @@ public class GSEDirItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEItemProvider.java
index 9cfa23c..65e2532 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class GSEItemProvider extends ControlBlockItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public GSEItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public GSEItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,9 +56,9 @@ public class GSEItemProvider extends ControlBlockItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -74,11 +73,11 @@ public class GSEItemProvider extends ControlBlockItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getGSE_MinTime());
-            childrenFeatures.add(SclPackage.eINSTANCE.getGSE_MaxTime());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getGSE_MinTime() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getGSE_MaxTime() );
         }
         return childrenFeatures;
     }
@@ -89,11 +88,11 @@ public class GSEItemProvider extends ControlBlockItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -103,8 +102,8 @@ public class GSEItemProvider extends ControlBlockItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GSE"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/GSE" ) );
     }
 
     /**
@@ -114,13 +113,11 @@ public class GSEItemProvider extends ControlBlockItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((GSE)object).getCbName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_GSE_type") :
-            getString("_UI_GSE_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( GSE ) object ).getCbName();
+        return label == null || label.length() == 0 ? getString( "_UI_GSE_type" )
+                : getString( "_UI_GSE_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -130,16 +127,16 @@ public class GSEItemProvider extends ControlBlockItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(GSE.class)) {
-            case SclPackage.GSE__MIN_TIME:
-            case SclPackage.GSE__MAX_TIME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( GSE.class ) ) {
+        case SclPackage.GSE__MIN_TIME:
+        case SclPackage.GSE__MAX_TIME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -150,18 +147,14 @@ public class GSEItemProvider extends ControlBlockItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getGSE_MinTime(),
-                 SclFactory.eINSTANCE.createMinTime()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getGSE_MaxTime(),
-                 SclFactory.eINSTANCE.createMaxTime()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getGSE_MinTime(),
+                SclFactory.eINSTANCE.createMinTime() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getGSE_MaxTime(),
+                SclFactory.eINSTANCE.createMaxTime() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSESettingsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSESettingsItemProvider.java
index 2c8c791..7c23b53 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSESettingsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSESettingsItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -49,8 +48,8 @@ public class GSESettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public GSESettingsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public GSESettingsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -60,13 +59,13 @@ public class GSESettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addAppIDPropertyDescriptor(object);
-            addDataLabelPropertyDescriptor(object);
-            addKdaParticipantPropertyDescriptor(object);
+            addAppIDPropertyDescriptor( object );
+            addDataLabelPropertyDescriptor( object );
+            addKdaParticipantPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -77,20 +76,20 @@ public class GSESettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addAppIDPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GSESettings_appID_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GSESettings_appID_feature", "_UI_GSESettings_type"),
-                 SclPackage.eINSTANCE.getGSESettings_AppID(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addAppIDPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_GSESettings_appID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_GSESettings_appID_feature",
+                                "_UI_GSESettings_type" ),
+                        SclPackage.eINSTANCE.getGSESettings_AppID(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,20 +98,20 @@ public class GSESettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDataLabelPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GSESettings_dataLabel_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GSESettings_dataLabel_feature", "_UI_GSESettings_type"),
-                 SclPackage.eINSTANCE.getGSESettings_DataLabel(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDataLabelPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_GSESettings_dataLabel_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_GSESettings_dataLabel_feature",
+                                "_UI_GSESettings_type" ),
+                        SclPackage.eINSTANCE.getGSESettings_DataLabel(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -121,20 +120,20 @@ public class GSESettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addKdaParticipantPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GSESettings_kdaParticipant_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GSESettings_kdaParticipant_feature", "_UI_GSESettings_type"),
-                 SclPackage.eINSTANCE.getGSESettings_KdaParticipant(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addKdaParticipantPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_GSESettings_kdaParticipant_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_GSESettings_kdaParticipant_feature",
+                                "_UI_GSESettings_type" ),
+                        SclPackage.eINSTANCE.getGSESettings_KdaParticipant(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -146,10 +145,10 @@ public class GSESettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getGSESettings_McSecurity());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getGSESettings_McSecurity() );
         }
         return childrenFeatures;
     }
@@ -160,11 +159,11 @@ public class GSESettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -174,8 +173,8 @@ public class GSESettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GSESettings"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/GSESettings" ) );
     }
 
     /**
@@ -185,14 +184,12 @@ public class GSESettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ServiceSettingsNoDynEnum labelValue = ((GSESettings)object).getCbName();
+    public String getText( Object object ) {
+        ServiceSettingsNoDynEnum labelValue = ( ( GSESettings ) object ).getCbName();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ?
-            getString("_UI_GSESettings_type") :
-            getString("_UI_GSESettings_type") + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_GSESettings_type" )
+                : getString( "_UI_GSESettings_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -202,20 +199,20 @@ public class GSESettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(GSESettings.class)) {
-            case SclPackage.GSE_SETTINGS__APP_ID:
-            case SclPackage.GSE_SETTINGS__DATA_LABEL:
-            case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.GSE_SETTINGS__MC_SECURITY:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( GSESettings.class ) ) {
+        case SclPackage.GSE_SETTINGS__APP_ID:
+        case SclPackage.GSE_SETTINGS__DATA_LABEL:
+        case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.GSE_SETTINGS__MC_SECURITY:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -226,13 +223,11 @@ public class GSESettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getGSESettings_McSecurity(),
-                 SclFactory.eINSTANCE.createMcSecurity()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getGSESettings_McSecurity(),
+                SclFactory.eINSTANCE.createMcSecurity() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSSEItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSSEItemProvider.java
index ee0ccde..8451472 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSSEItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSSEItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class GSSEItemProvider extends ServiceWithMaxItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public GSSEItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public GSSEItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class GSSEItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class GSSEItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GSSE"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/GSSE" ) );
     }
 
     /**
@@ -79,11 +78,10 @@ public class GSSEItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        GSSE gsse = (GSSE)object;
-        return getString("_UI_GSSE_type") + " " + gsse.getLineNumber();
+    public String getText( Object object ) {
+        GSSE gsse = ( GSSE ) object;
+        return getString( "_UI_GSSE_type" ) + " " + gsse.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -93,9 +91,8 @@ public class GSSEItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -106,8 +103,8 @@ public class GSSEItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GeneralEquipmentContainerItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GeneralEquipmentContainerItemProvider.java
index e1dec20..17cd6ae 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GeneralEquipmentContainerItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GeneralEquipmentContainerItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class GeneralEquipmentContainerItemProvider extends PowerSystemResourceIt
      * <!-- end-user-doc -->
      * @generated
      */
-    public GeneralEquipmentContainerItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public GeneralEquipmentContainerItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,9 +56,9 @@ public class GeneralEquipmentContainerItemProvider extends PowerSystemResourceIt
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -74,11 +73,11 @@ public class GeneralEquipmentContainerItemProvider extends PowerSystemResourceIt
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getGeneralEquipmentContainer_Function());
-            childrenFeatures.add(SclPackage.eINSTANCE.getGeneralEquipmentContainer_GeneralEquipment());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getGeneralEquipmentContainer_Function() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getGeneralEquipmentContainer_GeneralEquipment() );
         }
         return childrenFeatures;
     }
@@ -89,11 +88,11 @@ public class GeneralEquipmentContainerItemProvider extends PowerSystemResourceIt
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -103,8 +102,8 @@ public class GeneralEquipmentContainerItemProvider extends PowerSystemResourceIt
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GeneralEquipmentContainer"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/GeneralEquipmentContainer" ) );
     }
 
     /**
@@ -114,13 +113,11 @@ public class GeneralEquipmentContainerItemProvider extends PowerSystemResourceIt
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((GeneralEquipmentContainer)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_GeneralEquipmentContainer_type") :
-            getString("_UI_GeneralEquipmentContainer_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( GeneralEquipmentContainer ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_GeneralEquipmentContainer_type" )
+                : getString( "_UI_GeneralEquipmentContainer_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -130,16 +127,16 @@ public class GeneralEquipmentContainerItemProvider extends PowerSystemResourceIt
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(GeneralEquipmentContainer.class)) {
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION:
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( GeneralEquipmentContainer.class ) ) {
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION:
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -150,18 +147,15 @@ public class GeneralEquipmentContainerItemProvider extends PowerSystemResourceIt
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getGeneralEquipmentContainer_Function(),
-                 SclFactory.eINSTANCE.createFunction()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getGeneralEquipmentContainer_GeneralEquipment(),
-                 SclFactory.eINSTANCE.createGeneralEquipment()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getGeneralEquipmentContainer_Function(),
+                SclFactory.eINSTANCE.createFunction() ) );
+
+        newChildDescriptors
+                .add( createChildParameter( SclPackage.eINSTANCE.getGeneralEquipmentContainer_GeneralEquipment(),
+                        SclFactory.eINSTANCE.createGeneralEquipment() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GeneralEquipmentItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GeneralEquipmentItemProvider.java
index 7ecc4d6..79ce31b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GeneralEquipmentItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GeneralEquipmentItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class GeneralEquipmentItemProvider extends EquipmentItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public GeneralEquipmentItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public GeneralEquipmentItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class GeneralEquipmentItemProvider extends EquipmentItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTypePropertyDescriptor(object);
+            addTypePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class GeneralEquipmentItemProvider extends EquipmentItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GeneralEquipment_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GeneralEquipment_type_feature", "_UI_GeneralEquipment_type"),
-                 SclPackage.eINSTANCE.getGeneralEquipment_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_GeneralEquipment_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_GeneralEquipment_type_feature",
+                                "_UI_GeneralEquipment_type" ),
+                        SclPackage.eINSTANCE.getGeneralEquipment_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,10 +98,10 @@ public class GeneralEquipmentItemProvider extends EquipmentItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getGeneralEquipment_EqFunction());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getGeneralEquipment_EqFunction() );
         }
         return childrenFeatures;
     }
@@ -113,11 +112,11 @@ public class GeneralEquipmentItemProvider extends EquipmentItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -127,8 +126,8 @@ public class GeneralEquipmentItemProvider extends EquipmentItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GeneralEquipment"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/GeneralEquipment" ) );
     }
 
     /**
@@ -138,13 +137,11 @@ public class GeneralEquipmentItemProvider extends EquipmentItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((GeneralEquipment)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_GeneralEquipment_type") :
-            getString("_UI_GeneralEquipment_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( GeneralEquipment ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_GeneralEquipment_type" )
+                : getString( "_UI_GeneralEquipment_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -154,18 +151,18 @@ public class GeneralEquipmentItemProvider extends EquipmentItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(GeneralEquipment.class)) {
-            case SclPackage.GENERAL_EQUIPMENT__TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( GeneralEquipment.class ) ) {
+        case SclPackage.GENERAL_EQUIPMENT__TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -176,13 +173,11 @@ public class GeneralEquipmentItemProvider extends EquipmentItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getGeneralEquipment_EqFunction(),
-                 SclFactory.eINSTANCE.createEqFunction()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getGeneralEquipment_EqFunction(),
+                SclFactory.eINSTANCE.createEqFunction() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetCBValuesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetCBValuesItemProvider.java
index 9a16c56..d0c0b60 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetCBValuesItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetCBValuesItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.GetCBValues;
  * <!-- end-user-doc -->
  * @generated
  */
-public class GetCBValuesItemProvider 
-    extends ServiceYesNoItemProvider {
+public class GetCBValuesItemProvider
+        extends ServiceYesNoItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public GetCBValuesItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public GetCBValuesItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class GetCBValuesItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class GetCBValuesItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GetCBValues"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/GetCBValues" ) );
     }
 
     /**
@@ -80,11 +79,10 @@ public class GetCBValuesItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        GetCBValues getCBValues = (GetCBValues)object;
-        return getString("_UI_GetCBValues_type") + " " + getCBValues.getLineNumber();
+    public String getText( Object object ) {
+        GetCBValues getCBValues = ( GetCBValues ) object;
+        return getString( "_UI_GetCBValues_type" ) + " " + getCBValues.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -94,9 +92,8 @@ public class GetCBValuesItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -107,8 +104,8 @@ public class GetCBValuesItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataObjectDefinitionItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataObjectDefinitionItemProvider.java
index ae32165..1b95c47 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataObjectDefinitionItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataObjectDefinitionItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.GetDataObjectDefinition;
  * <!-- end-user-doc -->
  * @generated
  */
-public class GetDataObjectDefinitionItemProvider 
-    extends ServiceYesNoItemProvider {
+public class GetDataObjectDefinitionItemProvider
+        extends ServiceYesNoItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public GetDataObjectDefinitionItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public GetDataObjectDefinitionItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class GetDataObjectDefinitionItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class GetDataObjectDefinitionItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GetDataObjectDefinition"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/GetDataObjectDefinition" ) );
     }
 
     /**
@@ -80,11 +79,10 @@ public class GetDataObjectDefinitionItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        GetDataObjectDefinition getDataObjectDefinition = (GetDataObjectDefinition)object;
-        return getString("_UI_GetDataObjectDefinition_type") + " " + getDataObjectDefinition.getLineNumber();
+    public String getText( Object object ) {
+        GetDataObjectDefinition getDataObjectDefinition = ( GetDataObjectDefinition ) object;
+        return getString( "_UI_GetDataObjectDefinition_type" ) + " " + getDataObjectDefinition.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -94,9 +92,8 @@ public class GetDataObjectDefinitionItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -107,8 +104,8 @@ public class GetDataObjectDefinitionItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataSetValueItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataSetValueItemProvider.java
index b7d86e7..7c8bd9f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataSetValueItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataSetValueItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.GetDataSetValue;
  * <!-- end-user-doc -->
  * @generated
  */
-public class GetDataSetValueItemProvider 
-    extends ServiceYesNoItemProvider {
+public class GetDataSetValueItemProvider
+        extends ServiceYesNoItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public GetDataSetValueItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public GetDataSetValueItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class GetDataSetValueItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class GetDataSetValueItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GetDataSetValue"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/GetDataSetValue" ) );
     }
 
     /**
@@ -80,11 +79,10 @@ public class GetDataSetValueItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        GetDataSetValue getDataSetValue = (GetDataSetValue)object;
-        return getString("_UI_GetDataSetValue_type") + " " + getDataSetValue.getLineNumber();
+    public String getText( Object object ) {
+        GetDataSetValue getDataSetValue = ( GetDataSetValue ) object;
+        return getString( "_UI_GetDataSetValue_type" ) + " " + getDataSetValue.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -94,9 +92,8 @@ public class GetDataSetValueItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -107,8 +104,8 @@ public class GetDataSetValueItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDirectoryItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDirectoryItemProvider.java
index cf3473b..710f9b1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDirectoryItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDirectoryItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.GetDirectory;
  * <!-- end-user-doc -->
  * @generated
  */
-public class GetDirectoryItemProvider 
-    extends ServiceYesNoItemProvider {
+public class GetDirectoryItemProvider
+        extends ServiceYesNoItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public GetDirectoryItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public GetDirectoryItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class GetDirectoryItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class GetDirectoryItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/GetDirectory"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/GetDirectory" ) );
     }
 
     /**
@@ -80,11 +79,10 @@ public class GetDirectoryItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        GetDirectory getDirectory = (GetDirectory)object;
-        return getString("_UI_GetDirectory_type") + " " + getDirectory.getLineNumber();
+    public String getText( Object object ) {
+        GetDirectory getDirectory = ( GetDirectory ) object;
+        return getString( "_UI_GetDirectory_type" ) + " " + getDirectory.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -94,9 +92,8 @@ public class GetDirectoryItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -107,8 +104,8 @@ public class GetDirectoryItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HeaderItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HeaderItemProvider.java
index f60b2b3..eee9db6 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HeaderItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HeaderItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -41,16 +40,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class HeaderItemProvider 
-    extends SclObjectItemProvider {
+public class HeaderItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public HeaderItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public HeaderItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -60,15 +59,15 @@ public class HeaderItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addIdPropertyDescriptor(object);
-            addNameStructurePropertyDescriptor(object);
-            addRevisionPropertyDescriptor(object);
-            addToolIDPropertyDescriptor(object);
-            addVersionPropertyDescriptor(object);
+            addIdPropertyDescriptor( object );
+            addNameStructurePropertyDescriptor( object );
+            addRevisionPropertyDescriptor( object );
+            addToolIDPropertyDescriptor( object );
+            addVersionPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -79,20 +78,19 @@ public class HeaderItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIdPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Header_id_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Header_id_feature", "_UI_Header_type"),
-                 SclPackage.eINSTANCE.getHeader_Id(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIdPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Header_id_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Header_id_feature", "_UI_Header_type" ),
+                        SclPackage.eINSTANCE.getHeader_Id(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -101,20 +99,20 @@ public class HeaderItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNameStructurePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Header_nameStructure_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Header_nameStructure_feature", "_UI_Header_type"),
-                 SclPackage.eINSTANCE.getHeader_NameStructure(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNameStructurePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Header_nameStructure_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Header_nameStructure_feature",
+                                "_UI_Header_type" ),
+                        SclPackage.eINSTANCE.getHeader_NameStructure(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -123,20 +121,20 @@ public class HeaderItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRevisionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Header_revision_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Header_revision_feature", "_UI_Header_type"),
-                 SclPackage.eINSTANCE.getHeader_Revision(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addRevisionPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Header_revision_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Header_revision_feature",
+                                "_UI_Header_type" ),
+                        SclPackage.eINSTANCE.getHeader_Revision(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -145,20 +143,20 @@ public class HeaderItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addToolIDPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Header_toolID_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Header_toolID_feature", "_UI_Header_type"),
-                 SclPackage.eINSTANCE.getHeader_ToolID(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addToolIDPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Header_toolID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Header_toolID_feature",
+                                "_UI_Header_type" ),
+                        SclPackage.eINSTANCE.getHeader_ToolID(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -167,20 +165,20 @@ public class HeaderItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addVersionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Header_version_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Header_version_feature", "_UI_Header_type"),
-                 SclPackage.eINSTANCE.getHeader_Version(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addVersionPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Header_version_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Header_version_feature",
+                                "_UI_Header_type" ),
+                        SclPackage.eINSTANCE.getHeader_Version(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -192,11 +190,11 @@ public class HeaderItemProvider
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getHeader_Text());
-            childrenFeatures.add(SclPackage.eINSTANCE.getHeader_History());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getHeader_Text() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getHeader_History() );
         }
         return childrenFeatures;
     }
@@ -207,11 +205,11 @@ public class HeaderItemProvider
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -221,8 +219,8 @@ public class HeaderItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Header"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Header" ) );
     }
 
     /**
@@ -232,13 +230,11 @@ public class HeaderItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((Header)object).getId();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Header_type") :
-            getString("_UI_Header_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( Header ) object ).getId();
+        return label == null || label.length() == 0 ? getString( "_UI_Header_type" )
+                : getString( "_UI_Header_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -248,23 +244,23 @@ public class HeaderItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(Header.class)) {
-            case SclPackage.HEADER__ID:
-            case SclPackage.HEADER__NAME_STRUCTURE:
-            case SclPackage.HEADER__REVISION:
-            case SclPackage.HEADER__TOOL_ID:
-            case SclPackage.HEADER__VERSION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.HEADER__TEXT:
-            case SclPackage.HEADER__HISTORY:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( Header.class ) ) {
+        case SclPackage.HEADER__ID:
+        case SclPackage.HEADER__NAME_STRUCTURE:
+        case SclPackage.HEADER__REVISION:
+        case SclPackage.HEADER__TOOL_ID:
+        case SclPackage.HEADER__VERSION:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.HEADER__TEXT:
+        case SclPackage.HEADER__HISTORY:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -275,18 +271,14 @@ public class HeaderItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getHeader_Text(),
-                 SclFactory.eINSTANCE.createText()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getHeader_Text(),
+                SclFactory.eINSTANCE.createText() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getHeader_History(),
-                 SclFactory.eINSTANCE.createHistory()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getHeader_History(),
+                SclFactory.eINSTANCE.createHistory() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HistoryItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HistoryItemProvider.java
index 8954b31..10ebff2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HistoryItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HistoryItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class HistoryItemProvider 
-    extends SclObjectItemProvider {
+public class HistoryItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public HistoryItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public HistoryItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,9 +57,9 @@ public class HistoryItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -75,10 +74,10 @@ public class HistoryItemProvider
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getHistory_Hitem());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getHistory_Hitem() );
         }
         return childrenFeatures;
     }
@@ -89,11 +88,11 @@ public class HistoryItemProvider
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -103,8 +102,8 @@ public class HistoryItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/History"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/History" ) );
     }
 
     /**
@@ -114,11 +113,10 @@ public class HistoryItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        History history = (History)object;
-        return getString("_UI_History_type") + " " + history.getLineNumber();
+    public String getText( Object object ) {
+        History history = ( History ) object;
+        return getString( "_UI_History_type" ) + " " + history.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -128,15 +126,15 @@ public class HistoryItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(History.class)) {
-            case SclPackage.HISTORY__HITEM:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( History.class ) ) {
+        case SclPackage.HISTORY__HITEM:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -147,13 +145,11 @@ public class HistoryItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getHistory_Hitem(),
-                 SclFactory.eINSTANCE.createHitem()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getHistory_Hitem(),
+                SclFactory.eINSTANCE.createHitem() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HitemItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HitemItemProvider.java
index ff45811..104ce98 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HitemItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HitemItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class HitemItemProvider 
-    extends SclObjectItemProvider {
+public class HitemItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public HitemItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public HitemItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,16 +57,16 @@ public class HitemItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addRevisionPropertyDescriptor(object);
-            addVersionPropertyDescriptor(object);
-            addWhatPropertyDescriptor(object);
-            addWhenPropertyDescriptor(object);
-            addWhoPropertyDescriptor(object);
-            addWhyPropertyDescriptor(object);
+            addRevisionPropertyDescriptor( object );
+            addVersionPropertyDescriptor( object );
+            addWhatPropertyDescriptor( object );
+            addWhenPropertyDescriptor( object );
+            addWhoPropertyDescriptor( object );
+            addWhyPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -78,20 +77,20 @@ public class HitemItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRevisionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Hitem_revision_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Hitem_revision_feature", "_UI_Hitem_type"),
-                 SclPackage.eINSTANCE.getHitem_Revision(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addRevisionPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Hitem_revision_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Hitem_revision_feature",
+                                "_UI_Hitem_type" ),
+                        SclPackage.eINSTANCE.getHitem_Revision(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -100,20 +99,20 @@ public class HitemItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addVersionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Hitem_version_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Hitem_version_feature", "_UI_Hitem_type"),
-                 SclPackage.eINSTANCE.getHitem_Version(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addVersionPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Hitem_version_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Hitem_version_feature",
+                                "_UI_Hitem_type" ),
+                        SclPackage.eINSTANCE.getHitem_Version(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -122,20 +121,19 @@ public class HitemItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addWhatPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Hitem_what_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Hitem_what_feature", "_UI_Hitem_type"),
-                 SclPackage.eINSTANCE.getHitem_What(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addWhatPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Hitem_what_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Hitem_what_feature", "_UI_Hitem_type" ),
+                        SclPackage.eINSTANCE.getHitem_What(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -144,20 +142,19 @@ public class HitemItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addWhenPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Hitem_when_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Hitem_when_feature", "_UI_Hitem_type"),
-                 SclPackage.eINSTANCE.getHitem_When(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addWhenPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Hitem_when_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Hitem_when_feature", "_UI_Hitem_type" ),
+                        SclPackage.eINSTANCE.getHitem_When(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -166,20 +163,19 @@ public class HitemItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addWhoPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Hitem_who_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Hitem_who_feature", "_UI_Hitem_type"),
-                 SclPackage.eINSTANCE.getHitem_Who(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addWhoPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Hitem_who_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Hitem_who_feature", "_UI_Hitem_type" ),
+                        SclPackage.eINSTANCE.getHitem_Who(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -188,20 +184,19 @@ public class HitemItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addWhyPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Hitem_why_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Hitem_why_feature", "_UI_Hitem_type"),
-                 SclPackage.eINSTANCE.getHitem_Why(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addWhyPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Hitem_why_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Hitem_why_feature", "_UI_Hitem_type" ),
+                        SclPackage.eINSTANCE.getHitem_Why(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -211,8 +206,8 @@ public class HitemItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Hitem"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Hitem" ) );
     }
 
     /**
@@ -222,11 +217,10 @@ public class HitemItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Hitem hitem = (Hitem)object;
-        return getString("_UI_Hitem_type") + " " + hitem.getLineNumber();
+    public String getText( Object object ) {
+        Hitem hitem = ( Hitem ) object;
+        return getString( "_UI_Hitem_type" ) + " " + hitem.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -236,20 +230,20 @@ public class HitemItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(Hitem.class)) {
-            case SclPackage.HITEM__REVISION:
-            case SclPackage.HITEM__VERSION:
-            case SclPackage.HITEM__WHAT:
-            case SclPackage.HITEM__WHEN:
-            case SclPackage.HITEM__WHO:
-            case SclPackage.HITEM__WHY:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( Hitem.class ) ) {
+        case SclPackage.HITEM__REVISION:
+        case SclPackage.HITEM__VERSION:
+        case SclPackage.HITEM__WHAT:
+        case SclPackage.HITEM__WHEN:
+        case SclPackage.HITEM__WHO:
+        case SclPackage.HITEM__WHY:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -260,8 +254,8 @@ public class HitemItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IDNamingItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IDNamingItemProvider.java
index 246b18c..21e8ac2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IDNamingItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IDNamingItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class IDNamingItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public IDNamingItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public IDNamingItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,12 +56,12 @@ public class IDNamingItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addDescPropertyDescriptor(object);
-            addIdPropertyDescriptor(object);
+            addDescPropertyDescriptor( object );
+            addIdPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -73,20 +72,20 @@ public class IDNamingItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIdPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IDNaming_id_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IDNaming_id_feature", "_UI_IDNaming_type"),
-                 SclPackage.eINSTANCE.getIDNaming_Id(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIdPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IDNaming_id_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IDNaming_id_feature",
+                                "_UI_IDNaming_type" ),
+                        SclPackage.eINSTANCE.getIDNaming_Id(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -95,20 +94,19 @@ public class IDNamingItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDescPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgDesc_desc_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type"),
-                 SclPackage.eINSTANCE.getAgDesc_Desc(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDescPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgDesc_desc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type" ),
+                        SclPackage.eINSTANCE.getAgDesc_Desc(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -118,8 +116,8 @@ public class IDNamingItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/IDNaming"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/IDNaming" ) );
     }
 
     /**
@@ -129,13 +127,11 @@ public class IDNamingItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((IDNaming)object).getId();
-        return label == null || label.length() == 0 ?
-            getString("_UI_IDNaming_type") :
-            getString("_UI_IDNaming_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( IDNaming ) object ).getId();
+        return label == null || label.length() == 0 ? getString( "_UI_IDNaming_type" )
+                : getString( "_UI_IDNaming_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -145,16 +141,16 @@ public class IDNamingItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(IDNaming.class)) {
-            case SclPackage.ID_NAMING__DESC:
-            case SclPackage.ID_NAMING__ID:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( IDNaming.class ) ) {
+        case SclPackage.ID_NAMING__DESC:
+        case SclPackage.ID_NAMING__ID:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -165,8 +161,8 @@ public class IDNamingItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IEDItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IEDItemProvider.java
index 785a812..e26d846 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IEDItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IEDItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public IEDItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public IEDItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,20 +58,20 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addConfigVersionPropertyDescriptor(object);
-            addEngRightPropertyDescriptor(object);
-            addManufacturerPropertyDescriptor(object);
-            addOriginalSclRevisionPropertyDescriptor(object);
-            addOriginalSclVersionPropertyDescriptor(object);
-            addOwnerPropertyDescriptor(object);
-            addTypePropertyDescriptor(object);
-            addNamePropertyDescriptor(object);
-            addOriginalSclReleasePropertyDescriptor(object);
-            addReferredByIEDNamePropertyDescriptor(object);
+            addConfigVersionPropertyDescriptor( object );
+            addEngRightPropertyDescriptor( object );
+            addManufacturerPropertyDescriptor( object );
+            addOriginalSclRevisionPropertyDescriptor( object );
+            addOriginalSclVersionPropertyDescriptor( object );
+            addOwnerPropertyDescriptor( object );
+            addTypePropertyDescriptor( object );
+            addNamePropertyDescriptor( object );
+            addOriginalSclReleasePropertyDescriptor( object );
+            addReferredByIEDNamePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -83,20 +82,20 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addConfigVersionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IED_configVersion_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IED_configVersion_feature", "_UI_IED_type"),
-                 SclPackage.eINSTANCE.getIED_ConfigVersion(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addConfigVersionPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IED_configVersion_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IED_configVersion_feature",
+                                "_UI_IED_type" ),
+                        SclPackage.eINSTANCE.getIED_ConfigVersion(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -105,20 +104,19 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addEngRightPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IED_engRight_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IED_engRight_feature", "_UI_IED_type"),
-                 SclPackage.eINSTANCE.getIED_EngRight(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addEngRightPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IED_engRight_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IED_engRight_feature", "_UI_IED_type" ),
+                        SclPackage.eINSTANCE.getIED_EngRight(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -127,20 +125,20 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addManufacturerPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IED_manufacturer_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IED_manufacturer_feature", "_UI_IED_type"),
-                 SclPackage.eINSTANCE.getIED_Manufacturer(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addManufacturerPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IED_manufacturer_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IED_manufacturer_feature",
+                                "_UI_IED_type" ),
+                        SclPackage.eINSTANCE.getIED_Manufacturer(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -149,20 +147,20 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addOriginalSclRevisionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IED_originalSclRevision_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IED_originalSclRevision_feature", "_UI_IED_type"),
-                 SclPackage.eINSTANCE.getIED_OriginalSclRevision(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addOriginalSclRevisionPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IED_originalSclRevision_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IED_originalSclRevision_feature",
+                                "_UI_IED_type" ),
+                        SclPackage.eINSTANCE.getIED_OriginalSclRevision(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -171,20 +169,20 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addOriginalSclVersionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IED_originalSclVersion_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IED_originalSclVersion_feature", "_UI_IED_type"),
-                 SclPackage.eINSTANCE.getIED_OriginalSclVersion(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addOriginalSclVersionPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IED_originalSclVersion_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IED_originalSclVersion_feature",
+                                "_UI_IED_type" ),
+                        SclPackage.eINSTANCE.getIED_OriginalSclVersion(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -193,20 +191,19 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addOwnerPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IED_owner_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IED_owner_feature", "_UI_IED_type"),
-                 SclPackage.eINSTANCE.getIED_Owner(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addOwnerPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IED_owner_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IED_owner_feature", "_UI_IED_type" ),
+                        SclPackage.eINSTANCE.getIED_Owner(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -215,20 +212,19 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IED_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IED_type_feature", "_UI_IED_type"),
-                 SclPackage.eINSTANCE.getIED_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IED_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IED_type_feature", "_UI_IED_type" ),
+                        SclPackage.eINSTANCE.getIED_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -237,20 +233,19 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IED_name_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IED_name_feature", "_UI_IED_type"),
-                 SclPackage.eINSTANCE.getIED_Name(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IED_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IED_name_feature", "_UI_IED_type" ),
+                        SclPackage.eINSTANCE.getIED_Name(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -259,20 +254,20 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addOriginalSclReleasePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IED_originalSclRelease_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IED_originalSclRelease_feature", "_UI_IED_type"),
-                 SclPackage.eINSTANCE.getIED_OriginalSclRelease(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addOriginalSclReleasePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IED_originalSclRelease_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IED_originalSclRelease_feature",
+                                "_UI_IED_type" ),
+                        SclPackage.eINSTANCE.getIED_OriginalSclRelease(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -281,20 +276,20 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByIEDNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IED_ReferredByIEDName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IED_ReferredByIEDName_feature", "_UI_IED_type"),
-                 SclPackage.eINSTANCE.getIED_ReferredByIEDName(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByIEDNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IED_ReferredByIEDName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IED_ReferredByIEDName_feature",
+                                "_UI_IED_type" ),
+                        SclPackage.eINSTANCE.getIED_ReferredByIEDName(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -306,12 +301,12 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getIED_AccessPoint());
-            childrenFeatures.add(SclPackage.eINSTANCE.getIED_KDC());
-            childrenFeatures.add(SclPackage.eINSTANCE.getIED_Services());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getIED_AccessPoint() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getIED_KDC() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getIED_Services() );
         }
         return childrenFeatures;
     }
@@ -322,11 +317,11 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -336,8 +331,8 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/IED"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/IED" ) );
     }
 
     /**
@@ -347,13 +342,11 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((IED)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_IED_type") :
-            getString("_UI_IED_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( IED ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_IED_type" )
+                : getString( "_UI_IED_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -363,28 +356,28 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(IED.class)) {
-            case SclPackage.IED__CONFIG_VERSION:
-            case SclPackage.IED__ENG_RIGHT:
-            case SclPackage.IED__MANUFACTURER:
-            case SclPackage.IED__ORIGINAL_SCL_REVISION:
-            case SclPackage.IED__ORIGINAL_SCL_VERSION:
-            case SclPackage.IED__OWNER:
-            case SclPackage.IED__TYPE:
-            case SclPackage.IED__NAME:
-            case SclPackage.IED__ORIGINAL_SCL_RELEASE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.IED__ACCESS_POINT:
-            case SclPackage.IED__KDC:
-            case SclPackage.IED__SERVICES:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( IED.class ) ) {
+        case SclPackage.IED__CONFIG_VERSION:
+        case SclPackage.IED__ENG_RIGHT:
+        case SclPackage.IED__MANUFACTURER:
+        case SclPackage.IED__ORIGINAL_SCL_REVISION:
+        case SclPackage.IED__ORIGINAL_SCL_VERSION:
+        case SclPackage.IED__OWNER:
+        case SclPackage.IED__TYPE:
+        case SclPackage.IED__NAME:
+        case SclPackage.IED__ORIGINAL_SCL_RELEASE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.IED__ACCESS_POINT:
+        case SclPackage.IED__KDC:
+        case SclPackage.IED__SERVICES:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -395,23 +388,17 @@ public class IEDItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getIED_AccessPoint(),
-                 SclFactory.eINSTANCE.createAccessPoint()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getIED_AccessPoint(),
+                SclFactory.eINSTANCE.createAccessPoint() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getIED_KDC(),
-                 SclFactory.eINSTANCE.createKDC()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getIED_KDC(),
+                SclFactory.eINSTANCE.createKDC() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getIED_Services(),
-                 SclFactory.eINSTANCE.createServices()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getIED_Services(),
+                SclFactory.eINSTANCE.createServices() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IEDNameItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IEDNameItemProvider.java
index f9a5bbc..afc02fa 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IEDNameItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IEDNameItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class IEDNameItemProvider 
-    extends SclObjectItemProvider {
+public class IEDNameItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public IEDNameItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public IEDNameItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,19 +57,19 @@ public class IEDNameItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addApRefPropertyDescriptor(object);
-            addLdInstPropertyDescriptor(object);
-            addLnClassPropertyDescriptor(object);
-            addLnInstPropertyDescriptor(object);
-            addPrefixPropertyDescriptor(object);
-            addRefersToAnyLNPropertyDescriptor(object);
-            addValuePropertyDescriptor(object);
-            addRefersToIEDPropertyDescriptor(object);
-            addRefersToLDevicePropertyDescriptor(object);
+            addApRefPropertyDescriptor( object );
+            addLdInstPropertyDescriptor( object );
+            addLnClassPropertyDescriptor( object );
+            addLnInstPropertyDescriptor( object );
+            addPrefixPropertyDescriptor( object );
+            addRefersToAnyLNPropertyDescriptor( object );
+            addValuePropertyDescriptor( object );
+            addRefersToIEDPropertyDescriptor( object );
+            addRefersToLDevicePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -81,20 +80,20 @@ public class IEDNameItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addApRefPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IEDName_apRef_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IEDName_apRef_feature", "_UI_IEDName_type"),
-                 SclPackage.eINSTANCE.getIEDName_ApRef(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addApRefPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IEDName_apRef_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IEDName_apRef_feature",
+                                "_UI_IEDName_type" ),
+                        SclPackage.eINSTANCE.getIEDName_ApRef(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -103,20 +102,20 @@ public class IEDNameItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLdInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IEDName_ldInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IEDName_ldInst_feature", "_UI_IEDName_type"),
-                 SclPackage.eINSTANCE.getIEDName_LdInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLdInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IEDName_ldInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IEDName_ldInst_feature",
+                                "_UI_IEDName_type" ),
+                        SclPackage.eINSTANCE.getIEDName_LdInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -125,20 +124,20 @@ public class IEDNameItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IEDName_lnClass_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IEDName_lnClass_feature", "_UI_IEDName_type"),
-                 SclPackage.eINSTANCE.getIEDName_LnClass(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnClassPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IEDName_lnClass_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IEDName_lnClass_feature",
+                                "_UI_IEDName_type" ),
+                        SclPackage.eINSTANCE.getIEDName_LnClass(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -147,20 +146,20 @@ public class IEDNameItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IEDName_lnInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IEDName_lnInst_feature", "_UI_IEDName_type"),
-                 SclPackage.eINSTANCE.getIEDName_LnInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IEDName_lnInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IEDName_lnInst_feature",
+                                "_UI_IEDName_type" ),
+                        SclPackage.eINSTANCE.getIEDName_LnInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -169,20 +168,20 @@ public class IEDNameItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPrefixPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IEDName_prefix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IEDName_prefix_feature", "_UI_IEDName_type"),
-                 SclPackage.eINSTANCE.getIEDName_Prefix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPrefixPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IEDName_prefix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IEDName_prefix_feature",
+                                "_UI_IEDName_type" ),
+                        SclPackage.eINSTANCE.getIEDName_Prefix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -191,20 +190,20 @@ public class IEDNameItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToAnyLNPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IEDName_RefersToAnyLN_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IEDName_RefersToAnyLN_feature", "_UI_IEDName_type"),
-                 SclPackage.eINSTANCE.getIEDName_RefersToAnyLN(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToAnyLNPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IEDName_RefersToAnyLN_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IEDName_RefersToAnyLN_feature",
+                                "_UI_IEDName_type" ),
+                        SclPackage.eINSTANCE.getIEDName_RefersToAnyLN(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -213,20 +212,20 @@ public class IEDNameItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addValuePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IEDName_value_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IEDName_value_feature", "_UI_IEDName_type"),
-                 SclPackage.eINSTANCE.getIEDName_Value(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValuePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IEDName_value_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IEDName_value_feature",
+                                "_UI_IEDName_type" ),
+                        SclPackage.eINSTANCE.getIEDName_Value(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -235,20 +234,20 @@ public class IEDNameItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToIEDPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IEDName_RefersToIED_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IEDName_RefersToIED_feature", "_UI_IEDName_type"),
-                 SclPackage.eINSTANCE.getIEDName_RefersToIED(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToIEDPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IEDName_RefersToIED_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IEDName_RefersToIED_feature",
+                                "_UI_IEDName_type" ),
+                        SclPackage.eINSTANCE.getIEDName_RefersToIED(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -257,20 +256,20 @@ public class IEDNameItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToLDevicePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_IEDName_RefersToLDevice_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_IEDName_RefersToLDevice_feature", "_UI_IEDName_type"),
-                 SclPackage.eINSTANCE.getIEDName_RefersToLDevice(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToLDevicePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_IEDName_RefersToLDevice_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_IEDName_RefersToLDevice_feature",
+                                "_UI_IEDName_type" ),
+                        SclPackage.eINSTANCE.getIEDName_RefersToLDevice(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -280,8 +279,8 @@ public class IEDNameItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/IEDName"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/IEDName" ) );
     }
 
     /**
@@ -291,11 +290,10 @@ public class IEDNameItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        IEDName iedName = (IEDName)object;
-        return getString("_UI_IEDName_type") + " " + iedName.getLineNumber();
+    public String getText( Object object ) {
+        IEDName iedName = ( IEDName ) object;
+        return getString( "_UI_IEDName_type" ) + " " + iedName.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -305,20 +303,20 @@ public class IEDNameItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(IEDName.class)) {
-            case SclPackage.IED_NAME__AP_REF:
-            case SclPackage.IED_NAME__LD_INST:
-            case SclPackage.IED_NAME__LN_CLASS:
-            case SclPackage.IED_NAME__LN_INST:
-            case SclPackage.IED_NAME__PREFIX:
-            case SclPackage.IED_NAME__VALUE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( IEDName.class ) ) {
+        case SclPackage.IED_NAME__AP_REF:
+        case SclPackage.IED_NAME__LD_INST:
+        case SclPackage.IED_NAME__LN_CLASS:
+        case SclPackage.IED_NAME__LN_INST:
+        case SclPackage.IED_NAME__PREFIX:
+        case SclPackage.IED_NAME__VALUE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -329,8 +327,8 @@ public class IEDNameItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/InputsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/InputsItemProvider.java
index 238dbc0..c07f93b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/InputsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/InputsItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class InputsItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public InputsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public InputsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,9 +56,9 @@ public class InputsItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -74,10 +73,10 @@ public class InputsItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getInputs_ExtRef());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getInputs_ExtRef() );
         }
         return childrenFeatures;
     }
@@ -88,11 +87,11 @@ public class InputsItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -102,8 +101,8 @@ public class InputsItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Inputs"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Inputs" ) );
     }
 
     /**
@@ -113,11 +112,10 @@ public class InputsItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Inputs inputs = (Inputs)object;
-        return getString("_UI_Inputs_type") + " " + inputs.getLineNumber();
+    public String getText( Object object ) {
+        Inputs inputs = ( Inputs ) object;
+        return getString( "_UI_Inputs_type" ) + " " + inputs.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -127,15 +125,15 @@ public class InputsItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(Inputs.class)) {
-            case SclPackage.INPUTS__EXT_REF:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( Inputs.class ) ) {
+        case SclPackage.INPUTS__EXT_REF:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -146,13 +144,11 @@ public class InputsItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getInputs_ExtRef(),
-                 SclFactory.eINSTANCE.createExtRef()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getInputs_ExtRef(),
+                SclFactory.eINSTANCE.createExtRef() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IssuerNameItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IssuerNameItemProvider.java
index f5e3568..6a39473 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IssuerNameItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IssuerNameItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.IssuerName;
  * <!-- end-user-doc -->
  * @generated
  */
-public class IssuerNameItemProvider 
-    extends CertItemProvider {
+public class IssuerNameItemProvider
+        extends CertItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public IssuerNameItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public IssuerNameItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class IssuerNameItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class IssuerNameItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/IssuerName"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/IssuerName" ) );
     }
 
     /**
@@ -80,13 +79,11 @@ public class IssuerNameItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((IssuerName)object).getCommonName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_IssuerName_type") :
-            getString("_UI_IssuerName_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( IssuerName ) object ).getCommonName();
+        return label == null || label.length() == 0 ? getString( "_UI_IssuerName_type" )
+                : getString( "_UI_IssuerName_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -96,9 +93,8 @@ public class IssuerNameItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -109,8 +105,8 @@ public class IssuerNameItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/KDCItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/KDCItemProvider.java
index 8ea1d17..27ce2e0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/KDCItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/KDCItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class KDCItemProvider 
-    extends SclObjectItemProvider {
+public class KDCItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public KDCItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public KDCItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,13 +57,13 @@ public class KDCItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addApNamePropertyDescriptor(object);
-            addIedNamePropertyDescriptor(object);
-            addRefersToAccessPointPropertyDescriptor(object);
+            addApNamePropertyDescriptor( object );
+            addIedNamePropertyDescriptor( object );
+            addRefersToAccessPointPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,19 @@ public class KDCItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addApNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_KDC_apName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_KDC_apName_feature", "_UI_KDC_type"),
-                 SclPackage.eINSTANCE.getKDC_ApName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addApNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_KDC_apName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_KDC_apName_feature", "_UI_KDC_type" ),
+                        SclPackage.eINSTANCE.getKDC_ApName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +95,19 @@ public class KDCItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIedNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_KDC_iedName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_KDC_iedName_feature", "_UI_KDC_type"),
-                 SclPackage.eINSTANCE.getKDC_IedName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIedNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_KDC_iedName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_KDC_iedName_feature", "_UI_KDC_type" ),
+                        SclPackage.eINSTANCE.getKDC_IedName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,20 +116,20 @@ public class KDCItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToAccessPointPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_KDC_RefersToAccessPoint_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_KDC_RefersToAccessPoint_feature", "_UI_KDC_type"),
-                 SclPackage.eINSTANCE.getKDC_RefersToAccessPoint(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToAccessPointPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_KDC_RefersToAccessPoint_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_KDC_RefersToAccessPoint_feature",
+                                "_UI_KDC_type" ),
+                        SclPackage.eINSTANCE.getKDC_RefersToAccessPoint(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -142,8 +139,8 @@ public class KDCItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/KDC"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/KDC" ) );
     }
 
     /**
@@ -153,13 +150,11 @@ public class KDCItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((KDC)object).getApName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_KDC_type") :
-            getString("_UI_KDC_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( KDC ) object ).getApName();
+        return label == null || label.length() == 0 ? getString( "_UI_KDC_type" )
+                : getString( "_UI_KDC_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -169,16 +164,16 @@ public class KDCItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(KDC.class)) {
-            case SclPackage.KDC__AP_NAME:
-            case SclPackage.KDC__IED_NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( KDC.class ) ) {
+        case SclPackage.KDC__AP_NAME:
+        case SclPackage.KDC__IED_NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -189,8 +184,8 @@ public class KDCItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LDeviceItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LDeviceItemProvider.java
index 875d228..0cf301f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LDeviceItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LDeviceItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public LDeviceItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public LDeviceItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,13 +58,13 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addInstPropertyDescriptor(object);
-            addLdNamePropertyDescriptor(object);
-            addReferredByIEDNamePropertyDescriptor(object);
+            addInstPropertyDescriptor( object );
+            addLdNamePropertyDescriptor( object );
+            addReferredByIEDNamePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -76,20 +75,20 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LDevice_inst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LDevice_inst_feature", "_UI_LDevice_type"),
-                 SclPackage.eINSTANCE.getLDevice_Inst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LDevice_inst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LDevice_inst_feature",
+                                "_UI_LDevice_type" ),
+                        SclPackage.eINSTANCE.getLDevice_Inst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -98,20 +97,20 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLdNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LDevice_ldName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LDevice_ldName_feature", "_UI_LDevice_type"),
-                 SclPackage.eINSTANCE.getLDevice_LdName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLdNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LDevice_ldName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LDevice_ldName_feature",
+                                "_UI_LDevice_type" ),
+                        SclPackage.eINSTANCE.getLDevice_LdName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -120,20 +119,20 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByIEDNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LDevice_ReferredByIEDName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LDevice_ReferredByIEDName_feature", "_UI_LDevice_type"),
-                 SclPackage.eINSTANCE.getLDevice_ReferredByIEDName(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByIEDNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LDevice_ReferredByIEDName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LDevice_ReferredByIEDName_feature",
+                                "_UI_LDevice_type" ),
+                        SclPackage.eINSTANCE.getLDevice_ReferredByIEDName(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -145,12 +144,12 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getLDevice_AccessControl());
-            childrenFeatures.add(SclPackage.eINSTANCE.getLDevice_LN0());
-            childrenFeatures.add(SclPackage.eINSTANCE.getLDevice_LN());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getLDevice_AccessControl() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getLDevice_LN0() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getLDevice_LN() );
         }
         return childrenFeatures;
     }
@@ -161,11 +160,11 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -175,8 +174,8 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LDevice"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/LDevice" ) );
     }
 
     /**
@@ -186,13 +185,11 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((LDevice)object).getLdName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_LDevice_type") :
-            getString("_UI_LDevice_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( LDevice ) object ).getLdName();
+        return label == null || label.length() == 0 ? getString( "_UI_LDevice_type" )
+                : getString( "_UI_LDevice_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -202,21 +199,21 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(LDevice.class)) {
-            case SclPackage.LDEVICE__INST:
-            case SclPackage.LDEVICE__LD_NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.LDEVICE__ACCESS_CONTROL:
-            case SclPackage.LDEVICE__LN0:
-            case SclPackage.LDEVICE__LN:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( LDevice.class ) ) {
+        case SclPackage.LDEVICE__INST:
+        case SclPackage.LDEVICE__LD_NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.LDEVICE__ACCESS_CONTROL:
+        case SclPackage.LDEVICE__LN0:
+        case SclPackage.LDEVICE__LN:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -227,23 +224,17 @@ public class LDeviceItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getLDevice_AccessControl(),
-                 SclFactory.eINSTANCE.createAccessControl()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getLDevice_LN0(),
-                 SclFactory.eINSTANCE.createLN0()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getLDevice_LN(),
-                 SclFactory.eINSTANCE.createLN()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getLDevice_AccessControl(),
+                SclFactory.eINSTANCE.createAccessControl() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getLDevice_LN0(),
+                SclFactory.eINSTANCE.createLN0() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getLDevice_LN(),
+                SclFactory.eINSTANCE.createLN() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LN0ItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LN0ItemProvider.java
index 61ed100..8ed2608 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LN0ItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LN0ItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class LN0ItemProvider extends AnyLNItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public LN0ItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public LN0ItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,9 +56,9 @@ public class LN0ItemProvider extends AnyLNItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -74,12 +73,12 @@ public class LN0ItemProvider extends AnyLNItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getLN0_GSEControl());
-            childrenFeatures.add(SclPackage.eINSTANCE.getLN0_SampledValueControl());
-            childrenFeatures.add(SclPackage.eINSTANCE.getLN0_SettingControl());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getLN0_GSEControl() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getLN0_SampledValueControl() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getLN0_SettingControl() );
         }
         return childrenFeatures;
     }
@@ -90,11 +89,11 @@ public class LN0ItemProvider extends AnyLNItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -104,8 +103,8 @@ public class LN0ItemProvider extends AnyLNItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LN0"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/LN0" ) );
     }
 
     /**
@@ -115,11 +114,10 @@ public class LN0ItemProvider extends AnyLNItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        LN0 ln0 = (LN0)object;
-        return getString("_UI_LN0_type") + " " + ln0.getLineNumber();
+    public String getText( Object object ) {
+        LN0 ln0 = ( LN0 ) object;
+        return getString( "_UI_LN0_type" ) + " " + ln0.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -129,17 +127,17 @@ public class LN0ItemProvider extends AnyLNItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(LN0.class)) {
-            case SclPackage.LN0__GSE_CONTROL:
-            case SclPackage.LN0__SAMPLED_VALUE_CONTROL:
-            case SclPackage.LN0__SETTING_CONTROL:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( LN0.class ) ) {
+        case SclPackage.LN0__GSE_CONTROL:
+        case SclPackage.LN0__SAMPLED_VALUE_CONTROL:
+        case SclPackage.LN0__SETTING_CONTROL:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -150,23 +148,17 @@ public class LN0ItemProvider extends AnyLNItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getLN0_GSEControl(),
-                 SclFactory.eINSTANCE.createGSEControl()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getLN0_SampledValueControl(),
-                 SclFactory.eINSTANCE.createSampledValueControl()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getLN0_SettingControl(),
-                 SclFactory.eINSTANCE.createSettingControl()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getLN0_GSEControl(),
+                SclFactory.eINSTANCE.createGSEControl() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getLN0_SampledValueControl(),
+                SclFactory.eINSTANCE.createSampledValueControl() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getLN0_SettingControl(),
+                SclFactory.eINSTANCE.createSettingControl() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNItemProvider.java
index 49d818f..02b9ced 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class LNItemProvider extends AnyLNItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public LNItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public LNItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,11 +56,11 @@ public class LNItemProvider extends AnyLNItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addPrefixPropertyDescriptor(object);
+            addPrefixPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -72,20 +71,19 @@ public class LNItemProvider extends AnyLNItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPrefixPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LN_prefix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LN_prefix_feature", "_UI_LN_type"),
-                 SclPackage.eINSTANCE.getLN_Prefix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPrefixPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LN_prefix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LN_prefix_feature", "_UI_LN_type" ),
+                        SclPackage.eINSTANCE.getLN_Prefix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -95,8 +93,8 @@ public class LNItemProvider extends AnyLNItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LN"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/LN" ) );
     }
 
     /**
@@ -106,11 +104,10 @@ public class LNItemProvider extends AnyLNItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        LN ln = (LN)object;
-        return getString("_UI_LN_type") + " " + ln.getLineNumber();
+    public String getText( Object object ) {
+        LN ln = ( LN ) object;
+        return getString( "_UI_LN_type" ) + " " + ln.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -120,15 +117,15 @@ public class LNItemProvider extends AnyLNItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(LN.class)) {
-            case SclPackage.LN__PREFIX:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( LN.class ) ) {
+        case SclPackage.LN__PREFIX:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -139,8 +136,8 @@ public class LNItemProvider extends AnyLNItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeContainerItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeContainerItemProvider.java
index 5ba7737..1cbf235 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeContainerItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeContainerItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class LNodeContainerItemProvider extends NamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public LNodeContainerItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public LNodeContainerItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,9 +56,9 @@ public class LNodeContainerItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -74,10 +73,10 @@ public class LNodeContainerItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getLNodeContainer_LNode());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getLNodeContainer_LNode() );
         }
         return childrenFeatures;
     }
@@ -88,11 +87,11 @@ public class LNodeContainerItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -102,8 +101,8 @@ public class LNodeContainerItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LNodeContainer"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/LNodeContainer" ) );
     }
 
     /**
@@ -113,13 +112,11 @@ public class LNodeContainerItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((LNodeContainer)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_LNodeContainer_type") :
-            getString("_UI_LNodeContainer_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( LNodeContainer ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_LNodeContainer_type" )
+                : getString( "_UI_LNodeContainer_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -129,15 +126,15 @@ public class LNodeContainerItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(LNodeContainer.class)) {
-            case SclPackage.LNODE_CONTAINER__LNODE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( LNodeContainer.class ) ) {
+        case SclPackage.LNODE_CONTAINER__LNODE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -148,13 +145,11 @@ public class LNodeContainerItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getLNodeContainer_LNode(),
-                 SclFactory.eINSTANCE.createLNode()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getLNodeContainer_LNode(),
+                SclFactory.eINSTANCE.createLNode() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeItemProvider.java
index 67fd1ee..ec06805 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class LNodeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public LNodeItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public LNodeItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,18 +56,18 @@ public class LNodeItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addIedNamePropertyDescriptor(object);
-            addLdInstPropertyDescriptor(object);
-            addLnClassPropertyDescriptor(object);
-            addLnInstPropertyDescriptor(object);
-            addLnTypePropertyDescriptor(object);
-            addPrefixPropertyDescriptor(object);
-            addRefersToAnyLNPropertyDescriptor(object);
-            addRefersToLNodeTypePropertyDescriptor(object);
+            addIedNamePropertyDescriptor( object );
+            addLdInstPropertyDescriptor( object );
+            addLnClassPropertyDescriptor( object );
+            addLnInstPropertyDescriptor( object );
+            addLnTypePropertyDescriptor( object );
+            addPrefixPropertyDescriptor( object );
+            addRefersToAnyLNPropertyDescriptor( object );
+            addRefersToLNodeTypePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -79,20 +78,20 @@ public class LNodeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIedNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LNode_iedName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LNode_iedName_feature", "_UI_LNode_type"),
-                 SclPackage.eINSTANCE.getLNode_IedName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIedNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LNode_iedName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNode_iedName_feature",
+                                "_UI_LNode_type" ),
+                        SclPackage.eINSTANCE.getLNode_IedName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -101,20 +100,19 @@ public class LNodeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLdInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LNode_ldInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LNode_ldInst_feature", "_UI_LNode_type"),
-                 SclPackage.eINSTANCE.getLNode_LdInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLdInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LNode_ldInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNode_ldInst_feature", "_UI_LNode_type" ),
+                        SclPackage.eINSTANCE.getLNode_LdInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -123,20 +121,20 @@ public class LNodeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LNode_lnClass_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LNode_lnClass_feature", "_UI_LNode_type"),
-                 SclPackage.eINSTANCE.getLNode_LnClass(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnClassPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LNode_lnClass_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNode_lnClass_feature",
+                                "_UI_LNode_type" ),
+                        SclPackage.eINSTANCE.getLNode_LnClass(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -145,20 +143,19 @@ public class LNodeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LNode_lnInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LNode_lnInst_feature", "_UI_LNode_type"),
-                 SclPackage.eINSTANCE.getLNode_LnInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LNode_lnInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNode_lnInst_feature", "_UI_LNode_type" ),
+                        SclPackage.eINSTANCE.getLNode_LnInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -167,20 +164,19 @@ public class LNodeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LNode_lnType_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LNode_lnType_feature", "_UI_LNode_type"),
-                 SclPackage.eINSTANCE.getLNode_LnType(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LNode_lnType_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNode_lnType_feature", "_UI_LNode_type" ),
+                        SclPackage.eINSTANCE.getLNode_LnType(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -189,20 +185,19 @@ public class LNodeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPrefixPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LNode_prefix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LNode_prefix_feature", "_UI_LNode_type"),
-                 SclPackage.eINSTANCE.getLNode_Prefix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPrefixPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LNode_prefix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNode_prefix_feature", "_UI_LNode_type" ),
+                        SclPackage.eINSTANCE.getLNode_Prefix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -211,20 +206,20 @@ public class LNodeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToAnyLNPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LNode_RefersToAnyLN_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LNode_RefersToAnyLN_feature", "_UI_LNode_type"),
-                 SclPackage.eINSTANCE.getLNode_RefersToAnyLN(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToAnyLNPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LNode_RefersToAnyLN_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNode_RefersToAnyLN_feature",
+                                "_UI_LNode_type" ),
+                        SclPackage.eINSTANCE.getLNode_RefersToAnyLN(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -233,20 +228,20 @@ public class LNodeItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToLNodeTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LNode_RefersToLNodeType_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LNode_RefersToLNodeType_feature", "_UI_LNode_type"),
-                 SclPackage.eINSTANCE.getLNode_RefersToLNodeType(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToLNodeTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LNode_RefersToLNodeType_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNode_RefersToLNodeType_feature",
+                                "_UI_LNode_type" ),
+                        SclPackage.eINSTANCE.getLNode_RefersToLNodeType(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -256,8 +251,8 @@ public class LNodeItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LNode"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/LNode" ) );
     }
 
     /**
@@ -267,13 +262,11 @@ public class LNodeItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((LNode)object).getIedName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_LNode_type") :
-            getString("_UI_LNode_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( LNode ) object ).getIedName();
+        return label == null || label.length() == 0 ? getString( "_UI_LNode_type" )
+                : getString( "_UI_LNode_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -283,20 +276,20 @@ public class LNodeItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(LNode.class)) {
-            case SclPackage.LNODE__IED_NAME:
-            case SclPackage.LNODE__LD_INST:
-            case SclPackage.LNODE__LN_CLASS:
-            case SclPackage.LNODE__LN_INST:
-            case SclPackage.LNODE__LN_TYPE:
-            case SclPackage.LNODE__PREFIX:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( LNode.class ) ) {
+        case SclPackage.LNODE__IED_NAME:
+        case SclPackage.LNODE__LD_INST:
+        case SclPackage.LNODE__LN_CLASS:
+        case SclPackage.LNODE__LN_INST:
+        case SclPackage.LNODE__LN_TYPE:
+        case SclPackage.LNODE__PREFIX:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -307,8 +300,8 @@ public class LNodeItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeTypeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeTypeItemProvider.java
index efe93fc..28cb479 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeTypeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeTypeItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class LNodeTypeItemProvider extends IDNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public LNodeTypeItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public LNodeTypeItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,14 +58,14 @@ public class LNodeTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
-
-            addIedTypePropertyDescriptor(object);
-            addLnClassPropertyDescriptor(object);
-            addReferredByAnyLNPropertyDescriptor(object);
-            addReferredByLNodePropertyDescriptor(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
+
+            addIedTypePropertyDescriptor( object );
+            addLnClassPropertyDescriptor( object );
+            addReferredByAnyLNPropertyDescriptor( object );
+            addReferredByLNodePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -77,20 +76,20 @@ public class LNodeTypeItemProvider extends IDNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIedTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LNodeType_iedType_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LNodeType_iedType_feature", "_UI_LNodeType_type"),
-                 SclPackage.eINSTANCE.getLNodeType_IedType(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIedTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LNodeType_iedType_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNodeType_iedType_feature",
+                                "_UI_LNodeType_type" ),
+                        SclPackage.eINSTANCE.getLNodeType_IedType(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,20 +98,20 @@ public class LNodeTypeItemProvider extends IDNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LNodeType_lnClass_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LNodeType_lnClass_feature", "_UI_LNodeType_type"),
-                 SclPackage.eINSTANCE.getLNodeType_LnClass(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnClassPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LNodeType_lnClass_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNodeType_lnClass_feature",
+                                "_UI_LNodeType_type" ),
+                        SclPackage.eINSTANCE.getLNodeType_LnClass(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -121,20 +120,20 @@ public class LNodeTypeItemProvider extends IDNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByAnyLNPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LNodeType_ReferredByAnyLN_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LNodeType_ReferredByAnyLN_feature", "_UI_LNodeType_type"),
-                 SclPackage.eINSTANCE.getLNodeType_ReferredByAnyLN(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByAnyLNPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LNodeType_ReferredByAnyLN_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNodeType_ReferredByAnyLN_feature",
+                                "_UI_LNodeType_type" ),
+                        SclPackage.eINSTANCE.getLNodeType_ReferredByAnyLN(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -143,20 +142,20 @@ public class LNodeTypeItemProvider extends IDNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByLNodePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LNodeType_ReferredByLNode_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LNodeType_ReferredByLNode_feature", "_UI_LNodeType_type"),
-                 SclPackage.eINSTANCE.getLNodeType_ReferredByLNode(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByLNodePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LNodeType_ReferredByLNode_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LNodeType_ReferredByLNode_feature",
+                                "_UI_LNodeType_type" ),
+                        SclPackage.eINSTANCE.getLNodeType_ReferredByLNode(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -168,10 +167,10 @@ public class LNodeTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getLNodeType_DO());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getLNodeType_DO() );
         }
         return childrenFeatures;
     }
@@ -182,11 +181,11 @@ public class LNodeTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -196,8 +195,8 @@ public class LNodeTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LNodeType"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/LNodeType" ) );
     }
 
     /**
@@ -207,13 +206,11 @@ public class LNodeTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((LNodeType)object).getId();
-        return label == null || label.length() == 0 ?
-            getString("_UI_LNodeType_type") :
-            getString("_UI_LNodeType_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( LNodeType ) object ).getId();
+        return label == null || label.length() == 0 ? getString( "_UI_LNodeType_type" )
+                : getString( "_UI_LNodeType_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -223,19 +220,19 @@ public class LNodeTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(LNodeType.class)) {
-            case SclPackage.LNODE_TYPE__IED_TYPE:
-            case SclPackage.LNODE_TYPE__LN_CLASS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.LNODE_TYPE__DO:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( LNodeType.class ) ) {
+        case SclPackage.LNODE_TYPE__IED_TYPE:
+        case SclPackage.LNODE_TYPE__LN_CLASS:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.LNODE_TYPE__DO:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -246,13 +243,11 @@ public class LNodeTypeItemProvider extends IDNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getLNodeType_DO(),
-                 SclFactory.eINSTANCE.createDO()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getLNodeType_DO(),
+                SclFactory.eINSTANCE.createDO() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LineItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LineItemProvider.java
index a51c176..1fca842 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LineItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LineItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class LineItemProvider extends GeneralEquipmentContainerItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public LineItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public LineItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,13 +58,13 @@ public class LineItemProvider extends GeneralEquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTypePropertyDescriptor(object);
-            addNomFreqPropertyDescriptor(object);
-            addNumPhasesPropertyDescriptor(object);
+            addTypePropertyDescriptor( object );
+            addNomFreqPropertyDescriptor( object );
+            addNumPhasesPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -76,20 +75,19 @@ public class LineItemProvider extends GeneralEquipmentContainerItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Line_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Line_type_feature", "_UI_Line_type"),
-                 SclPackage.eINSTANCE.getLine_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Line_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Line_type_feature", "_UI_Line_type" ),
+                        SclPackage.eINSTANCE.getLine_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -98,20 +96,19 @@ public class LineItemProvider extends GeneralEquipmentContainerItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNomFreqPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Line_nomFreq_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Line_nomFreq_feature", "_UI_Line_type"),
-                 SclPackage.eINSTANCE.getLine_NomFreq(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNomFreqPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Line_nomFreq_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Line_nomFreq_feature", "_UI_Line_type" ),
+                        SclPackage.eINSTANCE.getLine_NomFreq(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -120,20 +117,20 @@ public class LineItemProvider extends GeneralEquipmentContainerItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNumPhasesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Line_numPhases_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Line_numPhases_feature", "_UI_Line_type"),
-                 SclPackage.eINSTANCE.getLine_NumPhases(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNumPhasesPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Line_numPhases_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Line_numPhases_feature",
+                                "_UI_Line_type" ),
+                        SclPackage.eINSTANCE.getLine_NumPhases(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -145,12 +142,12 @@ public class LineItemProvider extends GeneralEquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getLine_ConnectivityNode());
-            childrenFeatures.add(SclPackage.eINSTANCE.getLine_ConductingEquipment());
-            childrenFeatures.add(SclPackage.eINSTANCE.getLine_Voltage());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getLine_ConnectivityNode() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getLine_ConductingEquipment() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getLine_Voltage() );
         }
         return childrenFeatures;
     }
@@ -161,11 +158,11 @@ public class LineItemProvider extends GeneralEquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -175,8 +172,8 @@ public class LineItemProvider extends GeneralEquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Line"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Line" ) );
     }
 
     /**
@@ -186,13 +183,11 @@ public class LineItemProvider extends GeneralEquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((Line)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Line_type") :
-            getString("_UI_Line_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( Line ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_Line_type" )
+                : getString( "_UI_Line_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -202,22 +197,22 @@ public class LineItemProvider extends GeneralEquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(Line.class)) {
-            case SclPackage.LINE__TYPE:
-            case SclPackage.LINE__NOM_FREQ:
-            case SclPackage.LINE__NUM_PHASES:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.LINE__CONNECTIVITY_NODE:
-            case SclPackage.LINE__CONDUCTING_EQUIPMENT:
-            case SclPackage.LINE__VOLTAGE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( Line.class ) ) {
+        case SclPackage.LINE__TYPE:
+        case SclPackage.LINE__NOM_FREQ:
+        case SclPackage.LINE__NUM_PHASES:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.LINE__CONNECTIVITY_NODE:
+        case SclPackage.LINE__CONDUCTING_EQUIPMENT:
+        case SclPackage.LINE__VOLTAGE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -228,23 +223,17 @@ public class LineItemProvider extends GeneralEquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getLine_ConnectivityNode(),
-                 SclFactory.eINSTANCE.createConnectivityNode()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getLine_ConductingEquipment(),
-                 SclFactory.eINSTANCE.createConductingEquipment()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getLine_Voltage(),
-                 SclFactory.eINSTANCE.createVoltage()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getLine_ConnectivityNode(),
+                SclFactory.eINSTANCE.createConnectivityNode() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getLine_ConductingEquipment(),
+                SclFactory.eINSTANCE.createConductingEquipment() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getLine_Voltage(),
+                SclFactory.eINSTANCE.createVoltage() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogControlItemProvider.java
index 61f028c..15500c7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogControlItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogControlItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public LogControlItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public LogControlItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,20 +56,20 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addBufTimePropertyDescriptor(object);
-            addLdInstPropertyDescriptor(object);
-            addLnClassPropertyDescriptor(object);
-            addLnInstPropertyDescriptor(object);
-            addLogEnaPropertyDescriptor(object);
-            addLogNamePropertyDescriptor(object);
-            addPrefixPropertyDescriptor(object);
-            addReasonCodePropertyDescriptor(object);
-            addRefersToAnyLNPropertyDescriptor(object);
-            addRefersToLogPropertyDescriptor(object);
+            addBufTimePropertyDescriptor( object );
+            addLdInstPropertyDescriptor( object );
+            addLnClassPropertyDescriptor( object );
+            addLnInstPropertyDescriptor( object );
+            addLogEnaPropertyDescriptor( object );
+            addLogNamePropertyDescriptor( object );
+            addPrefixPropertyDescriptor( object );
+            addReasonCodePropertyDescriptor( object );
+            addRefersToAnyLNPropertyDescriptor( object );
+            addRefersToLogPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -81,20 +80,20 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addBufTimePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LogControl_bufTime_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LogControl_bufTime_feature", "_UI_LogControl_type"),
-                 SclPackage.eINSTANCE.getLogControl_BufTime(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addBufTimePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LogControl_bufTime_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LogControl_bufTime_feature",
+                                "_UI_LogControl_type" ),
+                        SclPackage.eINSTANCE.getLogControl_BufTime(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -103,20 +102,20 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLdInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LogControl_ldInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LogControl_ldInst_feature", "_UI_LogControl_type"),
-                 SclPackage.eINSTANCE.getLogControl_LdInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLdInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LogControl_ldInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LogControl_ldInst_feature",
+                                "_UI_LogControl_type" ),
+                        SclPackage.eINSTANCE.getLogControl_LdInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -125,20 +124,20 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LogControl_lnClass_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LogControl_lnClass_feature", "_UI_LogControl_type"),
-                 SclPackage.eINSTANCE.getLogControl_LnClass(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnClassPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LogControl_lnClass_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LogControl_lnClass_feature",
+                                "_UI_LogControl_type" ),
+                        SclPackage.eINSTANCE.getLogControl_LnClass(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -147,20 +146,20 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLnInstPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LogControl_lnInst_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LogControl_lnInst_feature", "_UI_LogControl_type"),
-                 SclPackage.eINSTANCE.getLogControl_LnInst(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLnInstPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LogControl_lnInst_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LogControl_lnInst_feature",
+                                "_UI_LogControl_type" ),
+                        SclPackage.eINSTANCE.getLogControl_LnInst(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -169,20 +168,20 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLogEnaPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LogControl_logEna_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LogControl_logEna_feature", "_UI_LogControl_type"),
-                 SclPackage.eINSTANCE.getLogControl_LogEna(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLogEnaPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LogControl_logEna_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LogControl_logEna_feature",
+                                "_UI_LogControl_type" ),
+                        SclPackage.eINSTANCE.getLogControl_LogEna(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -191,20 +190,20 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLogNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LogControl_logName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LogControl_logName_feature", "_UI_LogControl_type"),
-                 SclPackage.eINSTANCE.getLogControl_LogName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLogNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LogControl_logName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LogControl_logName_feature",
+                                "_UI_LogControl_type" ),
+                        SclPackage.eINSTANCE.getLogControl_LogName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -213,20 +212,20 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPrefixPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LogControl_prefix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LogControl_prefix_feature", "_UI_LogControl_type"),
-                 SclPackage.eINSTANCE.getLogControl_Prefix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPrefixPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LogControl_prefix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LogControl_prefix_feature",
+                                "_UI_LogControl_type" ),
+                        SclPackage.eINSTANCE.getLogControl_Prefix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -235,20 +234,20 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReasonCodePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LogControl_reasonCode_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LogControl_reasonCode_feature", "_UI_LogControl_type"),
-                 SclPackage.eINSTANCE.getLogControl_ReasonCode(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addReasonCodePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LogControl_reasonCode_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LogControl_reasonCode_feature",
+                                "_UI_LogControl_type" ),
+                        SclPackage.eINSTANCE.getLogControl_ReasonCode(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -257,20 +256,20 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToAnyLNPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LogControl_RefersToAnyLN_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LogControl_RefersToAnyLN_feature", "_UI_LogControl_type"),
-                 SclPackage.eINSTANCE.getLogControl_RefersToAnyLN(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToAnyLNPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LogControl_RefersToAnyLN_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LogControl_RefersToAnyLN_feature",
+                                "_UI_LogControl_type" ),
+                        SclPackage.eINSTANCE.getLogControl_RefersToAnyLN(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -279,20 +278,20 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToLogPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LogControl_RefersToLog_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LogControl_RefersToLog_feature", "_UI_LogControl_type"),
-                 SclPackage.eINSTANCE.getLogControl_RefersToLog(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToLogPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LogControl_RefersToLog_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LogControl_RefersToLog_feature",
+                                "_UI_LogControl_type" ),
+                        SclPackage.eINSTANCE.getLogControl_RefersToLog(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -302,8 +301,8 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LogControl"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/LogControl" ) );
     }
 
     /**
@@ -313,13 +312,11 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((LogControl)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_LogControl_type") :
-            getString("_UI_LogControl_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( LogControl ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_LogControl_type" )
+                : getString( "_UI_LogControl_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -329,22 +326,22 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(LogControl.class)) {
-            case SclPackage.LOG_CONTROL__BUF_TIME:
-            case SclPackage.LOG_CONTROL__LD_INST:
-            case SclPackage.LOG_CONTROL__LN_CLASS:
-            case SclPackage.LOG_CONTROL__LN_INST:
-            case SclPackage.LOG_CONTROL__LOG_ENA:
-            case SclPackage.LOG_CONTROL__LOG_NAME:
-            case SclPackage.LOG_CONTROL__PREFIX:
-            case SclPackage.LOG_CONTROL__REASON_CODE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( LogControl.class ) ) {
+        case SclPackage.LOG_CONTROL__BUF_TIME:
+        case SclPackage.LOG_CONTROL__LD_INST:
+        case SclPackage.LOG_CONTROL__LN_CLASS:
+        case SclPackage.LOG_CONTROL__LN_INST:
+        case SclPackage.LOG_CONTROL__LOG_ENA:
+        case SclPackage.LOG_CONTROL__LOG_NAME:
+        case SclPackage.LOG_CONTROL__PREFIX:
+        case SclPackage.LOG_CONTROL__REASON_CODE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -355,8 +352,8 @@ public class LogControlItemProvider extends ControlWithTriggerOptItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogItemProvider.java
index 714726e..961ef3c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class LogItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public LogItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public LogItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,12 +56,12 @@ public class LogItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addNamePropertyDescriptor(object);
-            addReferredByLogControlPropertyDescriptor(object);
+            addNamePropertyDescriptor( object );
+            addReferredByLogControlPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -73,20 +72,19 @@ public class LogItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Log_name_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Log_name_feature", "_UI_Log_type"),
-                 SclPackage.eINSTANCE.getLog_Name(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Log_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Log_name_feature", "_UI_Log_type" ),
+                        SclPackage.eINSTANCE.getLog_Name(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -95,20 +93,20 @@ public class LogItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredByLogControlPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Log_ReferredByLogControl_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Log_ReferredByLogControl_feature", "_UI_Log_type"),
-                 SclPackage.eINSTANCE.getLog_ReferredByLogControl(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredByLogControlPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Log_ReferredByLogControl_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Log_ReferredByLogControl_feature",
+                                "_UI_Log_type" ),
+                        SclPackage.eINSTANCE.getLog_ReferredByLogControl(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -118,8 +116,8 @@ public class LogItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Log"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Log" ) );
     }
 
     /**
@@ -129,13 +127,11 @@ public class LogItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((Log)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Log_type") :
-            getString("_UI_Log_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( Log ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_Log_type" )
+                : getString( "_UI_Log_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -145,15 +141,15 @@ public class LogItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(Log.class)) {
-            case SclPackage.LOG__NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( Log.class ) ) {
+        case SclPackage.LOG__NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -164,8 +160,8 @@ public class LogItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogSettingsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogSettingsItemProvider.java
index 4051318..9c03402 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogSettingsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogSettingsItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -47,8 +46,8 @@ public class LogSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public LogSettingsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public LogSettingsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,13 +57,13 @@ public class LogSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addIntgPdPropertyDescriptor(object);
-            addLogEnaPropertyDescriptor(object);
-            addTrgOpsPropertyDescriptor(object);
+            addIntgPdPropertyDescriptor( object );
+            addLogEnaPropertyDescriptor( object );
+            addTrgOpsPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class LogSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIntgPdPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LogSettings_intgPd_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LogSettings_intgPd_feature", "_UI_LogSettings_type"),
-                 SclPackage.eINSTANCE.getLogSettings_IntgPd(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIntgPdPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LogSettings_intgPd_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LogSettings_intgPd_feature",
+                                "_UI_LogSettings_type" ),
+                        SclPackage.eINSTANCE.getLogSettings_IntgPd(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class LogSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addLogEnaPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LogSettings_logEna_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LogSettings_logEna_feature", "_UI_LogSettings_type"),
-                 SclPackage.eINSTANCE.getLogSettings_LogEna(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLogEnaPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LogSettings_logEna_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LogSettings_logEna_feature",
+                                "_UI_LogSettings_type" ),
+                        SclPackage.eINSTANCE.getLogSettings_LogEna(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,20 +118,20 @@ public class LogSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTrgOpsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_LogSettings_trgOps_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_LogSettings_trgOps_feature", "_UI_LogSettings_type"),
-                 SclPackage.eINSTANCE.getLogSettings_TrgOps(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTrgOpsPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_LogSettings_trgOps_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_LogSettings_trgOps_feature",
+                                "_UI_LogSettings_type" ),
+                        SclPackage.eINSTANCE.getLogSettings_TrgOps(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -142,8 +141,8 @@ public class LogSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/LogSettings"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/LogSettings" ) );
     }
 
     /**
@@ -153,14 +152,12 @@ public class LogSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ServiceSettingsNoDynEnum labelValue = ((LogSettings)object).getCbName();
+    public String getText( Object object ) {
+        ServiceSettingsNoDynEnum labelValue = ( ( LogSettings ) object ).getCbName();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ?
-            getString("_UI_LogSettings_type") :
-            getString("_UI_LogSettings_type") + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_LogSettings_type" )
+                : getString( "_UI_LogSettings_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -170,17 +167,17 @@ public class LogSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(LogSettings.class)) {
-            case SclPackage.LOG_SETTINGS__INTG_PD:
-            case SclPackage.LOG_SETTINGS__LOG_ENA:
-            case SclPackage.LOG_SETTINGS__TRG_OPS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( LogSettings.class ) ) {
+        case SclPackage.LOG_SETTINGS__INTG_PD:
+        case SclPackage.LOG_SETTINGS__LOG_ENA:
+        case SclPackage.LOG_SETTINGS__TRG_OPS:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -191,8 +188,8 @@ public class LogSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MaxTimeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MaxTimeItemProvider.java
index 9c8f232..f5e8fed 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MaxTimeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MaxTimeItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,8 +43,8 @@ public class MaxTimeItemProvider extends DurationInMilliSecItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public MaxTimeItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public MaxTimeItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -55,9 +54,9 @@ public class MaxTimeItemProvider extends DurationInMilliSecItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -70,8 +69,8 @@ public class MaxTimeItemProvider extends DurationInMilliSecItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/MaxTime"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/MaxTime" ) );
     }
 
     /**
@@ -81,11 +80,10 @@ public class MaxTimeItemProvider extends DurationInMilliSecItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        MaxTime maxTime = (MaxTime)object;
-        return getString("_UI_MaxTime_type") + " " + maxTime.getLineNumber();
+    public String getText( Object object ) {
+        MaxTime maxTime = ( MaxTime ) object;
+        return getString( "_UI_MaxTime_type" ) + " " + maxTime.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -95,9 +93,8 @@ public class MaxTimeItemProvider extends DurationInMilliSecItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -108,8 +105,8 @@ public class MaxTimeItemProvider extends DurationInMilliSecItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/McSecurityItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/McSecurityItemProvider.java
index 639472a..b023919 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/McSecurityItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/McSecurityItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.McSecurity;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 
@@ -48,8 +47,8 @@ public class McSecurityItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public McSecurityItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public McSecurityItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,12 +58,12 @@ public class McSecurityItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addSignaturePropertyDescriptor(object);
-            addEncryptionPropertyDescriptor(object);
+            addSignaturePropertyDescriptor( object );
+            addEncryptionPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class McSecurityItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSignaturePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_McSecurity_signature_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_McSecurity_signature_feature", "_UI_McSecurity_type"),
-                 SclPackage.eINSTANCE.getMcSecurity_Signature(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSignaturePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_McSecurity_signature_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_McSecurity_signature_feature",
+                                "_UI_McSecurity_type" ),
+                        SclPackage.eINSTANCE.getMcSecurity_Signature(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class McSecurityItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addEncryptionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_McSecurity_encryption_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_McSecurity_encryption_feature", "_UI_McSecurity_type"),
-                 SclPackage.eINSTANCE.getMcSecurity_Encryption(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addEncryptionPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_McSecurity_encryption_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_McSecurity_encryption_feature",
+                                "_UI_McSecurity_type" ),
+                        SclPackage.eINSTANCE.getMcSecurity_Encryption(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -120,8 +119,8 @@ public class McSecurityItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/McSecurity"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/McSecurity" ) );
     }
 
     /**
@@ -131,12 +130,11 @@ public class McSecurityItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        McSecurity mcSecurity = (McSecurity)object;
-        return getString("_UI_McSecurity_type") + " " + mcSecurity.getLineNumber();
+    public String getText( Object object ) {
+        McSecurity mcSecurity = ( McSecurity ) object;
+        return getString( "_UI_McSecurity_type" ) + " " + mcSecurity.getLineNumber();
     }
 
-
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
      * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
@@ -145,16 +143,16 @@ public class McSecurityItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(McSecurity.class)) {
-            case SclPackage.MC_SECURITY__SIGNATURE:
-            case SclPackage.MC_SECURITY__ENCRYPTION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( McSecurity.class ) ) {
+        case SclPackage.MC_SECURITY__SIGNATURE:
+        case SclPackage.MC_SECURITY__ENCRYPTION:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -165,8 +163,8 @@ public class McSecurityItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MinTimeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MinTimeItemProvider.java
index 44b1980..f4ddce2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MinTimeItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MinTimeItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,8 +43,8 @@ public class MinTimeItemProvider extends DurationInMilliSecItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public MinTimeItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public MinTimeItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -55,9 +54,9 @@ public class MinTimeItemProvider extends DurationInMilliSecItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -70,8 +69,8 @@ public class MinTimeItemProvider extends DurationInMilliSecItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/MinTime"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/MinTime" ) );
     }
 
     /**
@@ -81,11 +80,10 @@ public class MinTimeItemProvider extends DurationInMilliSecItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        MinTime minTime = (MinTime)object;
-        return getString("_UI_MinTime_type") + " " + minTime.getLineNumber();
+    public String getText( Object object ) {
+        MinTime minTime = ( MinTime ) object;
+        return getString( "_UI_MinTime_type" ) + " " + minTime.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -95,9 +93,8 @@ public class MinTimeItemProvider extends DurationInMilliSecItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -108,8 +105,8 @@ public class MinTimeItemProvider extends DurationInMilliSecItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/NamingItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/NamingItemProvider.java
index c9d123a..2caafc4 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/NamingItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/NamingItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class NamingItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NamingItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public NamingItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,12 +56,12 @@ public class NamingItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addDescPropertyDescriptor(object);
-            addNamePropertyDescriptor(object);
+            addDescPropertyDescriptor( object );
+            addNamePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -73,20 +72,19 @@ public class NamingItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Naming_name_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Naming_name_feature", "_UI_Naming_type"),
-                 SclPackage.eINSTANCE.getNaming_Name(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Naming_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Naming_name_feature", "_UI_Naming_type" ),
+                        SclPackage.eINSTANCE.getNaming_Name(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -95,20 +93,19 @@ public class NamingItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDescPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgDesc_desc_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type"),
-                 SclPackage.eINSTANCE.getAgDesc_Desc(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDescPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgDesc_desc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type" ),
+                        SclPackage.eINSTANCE.getAgDesc_Desc(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -118,8 +115,8 @@ public class NamingItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Naming"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Naming" ) );
     }
 
     /**
@@ -129,13 +126,11 @@ public class NamingItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((Naming)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Naming_type") :
-            getString("_UI_Naming_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( Naming ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_Naming_type" )
+                : getString( "_UI_Naming_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -145,16 +140,16 @@ public class NamingItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(Naming.class)) {
-            case SclPackage.NAMING__DESC:
-            case SclPackage.NAMING__NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( Naming.class ) ) {
+        case SclPackage.NAMING__DESC:
+        case SclPackage.NAMING__NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -165,8 +160,8 @@ public class NamingItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/NeutralPointItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/NeutralPointItemProvider.java
index 2fa4287..7ee83f9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/NeutralPointItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/NeutralPointItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class NeutralPointItemProvider extends TerminalItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NeutralPointItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public NeutralPointItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class NeutralPointItemProvider extends TerminalItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class NeutralPointItemProvider extends TerminalItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/NeutralPoint"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/NeutralPoint" ) );
     }
 
     /**
@@ -79,13 +78,11 @@ public class NeutralPointItemProvider extends TerminalItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((NeutralPoint)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_NeutralPoint_type") :
-            getString("_UI_NeutralPoint_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( NeutralPoint ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_NeutralPoint_type" )
+                : getString( "_UI_NeutralPoint_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -95,9 +92,8 @@ public class NeutralPointItemProvider extends TerminalItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -108,8 +104,8 @@ public class NeutralPointItemProvider extends TerminalItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/OptFieldsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/OptFieldsItemProvider.java
index 02e289f..d1b8c6d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/OptFieldsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/OptFieldsItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class OptFieldsItemProvider 
-    extends SclObjectItemProvider {
+public class OptFieldsItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public OptFieldsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public OptFieldsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,19 +57,19 @@ public class OptFieldsItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addBufOvflPropertyDescriptor(object);
-            addConfigRefPropertyDescriptor(object);
-            addDataRefPropertyDescriptor(object);
-            addDataSetPropertyDescriptor(object);
-            addEntryIDPropertyDescriptor(object);
-            addReasonCodePropertyDescriptor(object);
-            addSeqNumPropertyDescriptor(object);
-            addTimeStampPropertyDescriptor(object);
-            addSegmentationPropertyDescriptor(object);
+            addBufOvflPropertyDescriptor( object );
+            addConfigRefPropertyDescriptor( object );
+            addDataRefPropertyDescriptor( object );
+            addDataSetPropertyDescriptor( object );
+            addEntryIDPropertyDescriptor( object );
+            addReasonCodePropertyDescriptor( object );
+            addSeqNumPropertyDescriptor( object );
+            addTimeStampPropertyDescriptor( object );
+            addSegmentationPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -81,20 +80,20 @@ public class OptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addBufOvflPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_bufOvfl_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_bufOvfl_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_BufOvfl(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addBufOvflPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_bufOvfl_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_bufOvfl_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_BufOvfl(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -103,20 +102,20 @@ public class OptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addConfigRefPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_configRef_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_configRef_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_ConfigRef(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addConfigRefPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_configRef_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_configRef_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_ConfigRef(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -125,20 +124,20 @@ public class OptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDataRefPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_dataRef_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_dataRef_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_DataRef(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDataRefPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_dataRef_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_dataRef_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_DataRef(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -147,20 +146,20 @@ public class OptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDataSetPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_dataSet_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_dataSet_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_DataSet(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDataSetPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_dataSet_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_dataSet_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_DataSet(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -169,20 +168,20 @@ public class OptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addEntryIDPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_entryID_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_entryID_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_EntryID(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addEntryIDPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_entryID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_entryID_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_EntryID(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -191,20 +190,20 @@ public class OptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReasonCodePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_reasonCode_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_reasonCode_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_ReasonCode(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addReasonCodePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_reasonCode_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_reasonCode_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_ReasonCode(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -213,20 +212,20 @@ public class OptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSeqNumPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_seqNum_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_seqNum_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_SeqNum(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSeqNumPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_seqNum_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_seqNum_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_SeqNum(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -235,20 +234,20 @@ public class OptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTimeStampPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_timeStamp_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_timeStamp_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_TimeStamp(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTimeStampPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_timeStamp_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_timeStamp_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_TimeStamp(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -257,20 +256,20 @@ public class OptFieldsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSegmentationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgOptFields_segmentation_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgOptFields_segmentation_feature", "_UI_AgOptFields_type"),
-                 SclPackage.eINSTANCE.getAgOptFields_Segmentation(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSegmentationPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgOptFields_segmentation_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgOptFields_segmentation_feature",
+                                "_UI_AgOptFields_type" ),
+                        SclPackage.eINSTANCE.getAgOptFields_Segmentation(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -280,8 +279,8 @@ public class OptFieldsItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/OptFields"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/OptFields" ) );
     }
 
     /**
@@ -291,11 +290,10 @@ public class OptFieldsItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        OptFields optFields = (OptFields)object;
-        return getString("_UI_OptFields_type") + " " + optFields.getLineNumber();
+    public String getText( Object object ) {
+        OptFields optFields = ( OptFields ) object;
+        return getString( "_UI_OptFields_type" ) + " " + optFields.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -305,23 +303,23 @@ public class OptFieldsItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(OptFields.class)) {
-            case SclPackage.OPT_FIELDS__BUF_OVFL:
-            case SclPackage.OPT_FIELDS__CONFIG_REF:
-            case SclPackage.OPT_FIELDS__DATA_REF:
-            case SclPackage.OPT_FIELDS__DATA_SET:
-            case SclPackage.OPT_FIELDS__ENTRY_ID:
-            case SclPackage.OPT_FIELDS__REASON_CODE:
-            case SclPackage.OPT_FIELDS__SEQ_NUM:
-            case SclPackage.OPT_FIELDS__TIME_STAMP:
-            case SclPackage.OPT_FIELDS__SEGMENTATION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( OptFields.class ) ) {
+        case SclPackage.OPT_FIELDS__BUF_OVFL:
+        case SclPackage.OPT_FIELDS__CONFIG_REF:
+        case SclPackage.OPT_FIELDS__DATA_REF:
+        case SclPackage.OPT_FIELDS__DATA_SET:
+        case SclPackage.OPT_FIELDS__ENTRY_ID:
+        case SclPackage.OPT_FIELDS__REASON_CODE:
+        case SclPackage.OPT_FIELDS__SEQ_NUM:
+        case SclPackage.OPT_FIELDS__TIME_STAMP:
+        case SclPackage.OPT_FIELDS__SEGMENTATION:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -332,8 +330,8 @@ public class OptFieldsItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PAddrItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PAddrItemProvider.java
index 3d79922..640e315 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PAddrItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PAddrItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class PAddrItemProvider 
-    extends SclObjectItemProvider {
+public class PAddrItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public PAddrItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public PAddrItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,12 +57,12 @@ public class PAddrItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTypePropertyDescriptor(object);
-            addValuePropertyDescriptor(object);
+            addTypePropertyDescriptor( object );
+            addValuePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,19 @@ public class PAddrItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_PAddr_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_PAddr_type_feature", "_UI_PAddr_type"),
-                 SclPackage.eINSTANCE.getPAddr_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_PAddr_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_PAddr_type_feature", "_UI_PAddr_type" ),
+                        SclPackage.eINSTANCE.getPAddr_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,20 +94,19 @@ public class PAddrItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addValuePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_PAddr_value_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_PAddr_value_feature", "_UI_PAddr_type"),
-                 SclPackage.eINSTANCE.getPAddr_Value(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValuePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_PAddr_value_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_PAddr_value_feature", "_UI_PAddr_type" ),
+                        SclPackage.eINSTANCE.getPAddr_Value(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,8 +116,8 @@ public class PAddrItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/PAddr"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/PAddr" ) );
     }
 
     /**
@@ -130,11 +127,10 @@ public class PAddrItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        PAddr pAddr = (PAddr)object;
-        return getString("_UI_PAddr_type") + " " + pAddr.getLineNumber();
+    public String getText( Object object ) {
+        PAddr pAddr = ( PAddr ) object;
+        return getString( "_UI_PAddr_type" ) + " " + pAddr.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -144,16 +140,16 @@ public class PAddrItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(PAddr.class)) {
-            case SclPackage.PADDR__TYPE:
-            case SclPackage.PADDR__VALUE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( PAddr.class ) ) {
+        case SclPackage.PADDR__TYPE:
+        case SclPackage.PADDR__VALUE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -164,8 +160,8 @@ public class PAddrItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PItemProvider.java
index 112c1ca..e116607 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class PItemProvider extends PAddrItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public PItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public PItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class PItemProvider extends PAddrItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class PItemProvider extends PAddrItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/P"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/P" ) );
     }
 
     /**
@@ -79,11 +78,10 @@ public class PItemProvider extends PAddrItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        P p = (P)object;
-        return getString("_UI_P_type") + " " + p.getLineNumber();
+    public String getText( Object object ) {
+        P p = ( P ) object;
+        return getString( "_UI_P_type" ) + " " + p.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -93,9 +91,8 @@ public class PItemProvider extends PAddrItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -106,8 +103,8 @@ public class PItemProvider extends PAddrItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/P_PhysConnItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/P_PhysConnItemProvider.java
index 905acfb..3f1ed98 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/P_PhysConnItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/P_PhysConnItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class P_PhysConnItemProvider extends PAddrItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public P_PhysConnItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public P_PhysConnItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class P_PhysConnItemProvider extends PAddrItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class P_PhysConnItemProvider extends PAddrItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/P_PhysConn"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/P_PhysConn" ) );
     }
 
     /**
@@ -79,11 +78,10 @@ public class P_PhysConnItemProvider extends PAddrItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        P_PhysConn p_PhysConn = (P_PhysConn)object;
-        return getString("_UI_P_PhysConn_type") + " " + p_PhysConn.getLineNumber();
+    public String getText( Object object ) {
+        P_PhysConn p_PhysConn = ( P_PhysConn ) object;
+        return getString( "_UI_P_PhysConn_type" ) + " " + p_PhysConn.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -93,9 +91,8 @@ public class P_PhysConnItemProvider extends PAddrItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -106,8 +103,8 @@ public class P_PhysConnItemProvider extends PAddrItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PhysConnItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PhysConnItemProvider.java
index 1424b23..1ad9fa2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PhysConnItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PhysConnItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class PhysConnItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public PhysConnItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public PhysConnItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class PhysConnItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTypePropertyDescriptor(object);
+            addTypePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class PhysConnItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_PhysConn_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_PhysConn_type_feature", "_UI_PhysConn_type"),
-                 SclPackage.eINSTANCE.getPhysConn_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_PhysConn_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_PhysConn_type_feature",
+                                "_UI_PhysConn_type" ),
+                        SclPackage.eINSTANCE.getPhysConn_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,10 +98,10 @@ public class PhysConnItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getPhysConn_P());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getPhysConn_P() );
         }
         return childrenFeatures;
     }
@@ -113,11 +112,11 @@ public class PhysConnItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -127,8 +126,8 @@ public class PhysConnItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/PhysConn"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/PhysConn" ) );
     }
 
     /**
@@ -138,11 +137,10 @@ public class PhysConnItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        PhysConn physConn = (PhysConn)object;
-        return getString("_UI_PhysConn_type") + " " + physConn.getLineNumber();
+    public String getText( Object object ) {
+        PhysConn physConn = ( PhysConn ) object;
+        return getString( "_UI_PhysConn_type" ) + " " + physConn.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -152,18 +150,18 @@ public class PhysConnItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(PhysConn.class)) {
-            case SclPackage.PHYS_CONN__TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.PHYS_CONN__P:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( PhysConn.class ) ) {
+        case SclPackage.PHYS_CONN__TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.PHYS_CONN__P:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -174,13 +172,11 @@ public class PhysConnItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getPhysConn_P(),
-                 SclFactory.eINSTANCE.createP_PhysConn()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getPhysConn_P(),
+                SclFactory.eINSTANCE.createP_PhysConn() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PowerSystemResourceItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PowerSystemResourceItemProvider.java
index afb9d64..920d2e5 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PowerSystemResourceItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PowerSystemResourceItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class PowerSystemResourceItemProvider extends LNodeContainerItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    public PowerSystemResourceItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public PowerSystemResourceItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class PowerSystemResourceItemProvider extends LNodeContainerItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class PowerSystemResourceItemProvider extends LNodeContainerItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/PowerSystemResource"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/PowerSystemResource" ) );
     }
 
     /**
@@ -79,13 +78,11 @@ public class PowerSystemResourceItemProvider extends LNodeContainerItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((PowerSystemResource)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_PowerSystemResource_type") :
-            getString("_UI_PowerSystemResource_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( PowerSystemResource ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_PowerSystemResource_type" )
+                : getString( "_UI_PowerSystemResource_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -95,9 +92,8 @@ public class PowerSystemResourceItemProvider extends LNodeContainerItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -108,8 +104,8 @@ public class PowerSystemResourceItemProvider extends LNodeContainerItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PowerTransformerItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PowerTransformerItemProvider.java
index 435e1c1..cab8a4c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PowerTransformerItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PowerTransformerItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class PowerTransformerItemProvider extends EquipmentItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public PowerTransformerItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public PowerTransformerItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class PowerTransformerItemProvider extends EquipmentItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTypePropertyDescriptor(object);
+            addTypePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class PowerTransformerItemProvider extends EquipmentItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_PowerTransformer_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_PowerTransformer_type_feature", "_UI_PowerTransformer_type"),
-                 SclPackage.eINSTANCE.getPowerTransformer_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_PowerTransformer_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_PowerTransformer_type_feature",
+                                "_UI_PowerTransformer_type" ),
+                        SclPackage.eINSTANCE.getPowerTransformer_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,12 +98,12 @@ public class PowerTransformerItemProvider extends EquipmentItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getPowerTransformer_EqFunction());
-            childrenFeatures.add(SclPackage.eINSTANCE.getPowerTransformer_SubEquipment());
-            childrenFeatures.add(SclPackage.eINSTANCE.getPowerTransformer_TransformerWinding());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getPowerTransformer_EqFunction() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getPowerTransformer_SubEquipment() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getPowerTransformer_TransformerWinding() );
         }
         return childrenFeatures;
     }
@@ -115,11 +114,11 @@ public class PowerTransformerItemProvider extends EquipmentItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -129,8 +128,8 @@ public class PowerTransformerItemProvider extends EquipmentItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/PowerTransformer"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/PowerTransformer" ) );
     }
 
     /**
@@ -140,13 +139,11 @@ public class PowerTransformerItemProvider extends EquipmentItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((PowerTransformer)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_PowerTransformer_type") :
-            getString("_UI_PowerTransformer_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( PowerTransformer ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_PowerTransformer_type" )
+                : getString( "_UI_PowerTransformer_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -156,20 +153,20 @@ public class PowerTransformerItemProvider extends EquipmentItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(PowerTransformer.class)) {
-            case SclPackage.POWER_TRANSFORMER__TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.POWER_TRANSFORMER__EQ_FUNCTION:
-            case SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT:
-            case SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( PowerTransformer.class ) ) {
+        case SclPackage.POWER_TRANSFORMER__TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.POWER_TRANSFORMER__EQ_FUNCTION:
+        case SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT:
+        case SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -180,23 +177,17 @@ public class PowerTransformerItemProvider extends EquipmentItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getPowerTransformer_EqFunction(),
-                 SclFactory.eINSTANCE.createEqFunction()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getPowerTransformer_SubEquipment(),
-                 SclFactory.eINSTANCE.createSubEquipment()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getPowerTransformer_TransformerWinding(),
-                 SclFactory.eINSTANCE.createTransformerWinding()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getPowerTransformer_EqFunction(),
+                SclFactory.eINSTANCE.createEqFunction() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getPowerTransformer_SubEquipment(),
+                SclFactory.eINSTANCE.createSubEquipment() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getPowerTransformer_TransformerWinding(),
+                SclFactory.eINSTANCE.createTransformerWinding() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PrivateItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PrivateItemProvider.java
index 796a9f9..9b6dd43 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PrivateItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PrivateItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class PrivateItemProvider 
-    extends AnyContentFromOtherNamespaceItemProvider {
+public class PrivateItemProvider
+        extends AnyContentFromOtherNamespaceItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public PrivateItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public PrivateItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,12 +57,12 @@ public class PrivateItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addSourcePropertyDescriptor(object);
-            addTypePropertyDescriptor(object);
+            addSourcePropertyDescriptor( object );
+            addTypePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class PrivateItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSourcePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Private_source_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Private_source_feature", "_UI_Private_type"),
-                 SclPackage.eINSTANCE.getPrivate_Source(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSourcePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Private_source_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Private_source_feature",
+                                "_UI_Private_type" ),
+                        SclPackage.eINSTANCE.getPrivate_Source(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,20 +95,20 @@ public class PrivateItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Private_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Private_type_feature", "_UI_Private_type"),
-                 SclPackage.eINSTANCE.getPrivate_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Private_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Private_type_feature",
+                                "_UI_Private_type" ),
+                        SclPackage.eINSTANCE.getPrivate_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,8 +118,8 @@ public class PrivateItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Private"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Private" ) );
     }
 
     /**
@@ -130,11 +129,10 @@ public class PrivateItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Private private_ = (Private)object;
-        return getString("_UI_Private_type") + " " + private_.getLineNumber();
+    public String getText( Object object ) {
+        Private private_ = ( Private ) object;
+        return getString( "_UI_Private_type" ) + " " + private_.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -144,16 +142,16 @@ public class PrivateItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(Private.class)) {
-            case SclPackage.PRIVATE__SOURCE:
-            case SclPackage.PRIVATE__TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( Private.class ) ) {
+        case SclPackage.PRIVATE__SOURCE:
+        case SclPackage.PRIVATE__TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -164,8 +162,8 @@ public class PrivateItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProcessItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProcessItemProvider.java
index 06b75e6..47fc1c2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProcessItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProcessItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -47,8 +46,8 @@ public class ProcessItemProvider extends GeneralEquipmentContainerItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ProcessItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ProcessItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,11 +57,11 @@ public class ProcessItemProvider extends GeneralEquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTypePropertyDescriptor(object);
+            addTypePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -73,20 +72,20 @@ public class ProcessItemProvider extends GeneralEquipmentContainerItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Process_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Process_type_feature", "_UI_Process_type"),
-                 SclPackage.eINSTANCE.getProcess_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Process_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Process_type_feature",
+                                "_UI_Process_type" ),
+                        SclPackage.eINSTANCE.getProcess_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -98,13 +97,13 @@ public class ProcessItemProvider extends GeneralEquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getProcess_Line());
-            childrenFeatures.add(SclPackage.eINSTANCE.getProcess_ConductingEquipment());
-            childrenFeatures.add(SclPackage.eINSTANCE.getProcess_Substation());
-            childrenFeatures.add(SclPackage.eINSTANCE.getProcess_SubProcesses());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getProcess_Line() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getProcess_ConductingEquipment() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getProcess_Substation() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getProcess_SubProcesses() );
         }
         return childrenFeatures;
     }
@@ -115,11 +114,11 @@ public class ProcessItemProvider extends GeneralEquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -129,8 +128,8 @@ public class ProcessItemProvider extends GeneralEquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Process"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Process" ) );
     }
 
     /**
@@ -140,13 +139,11 @@ public class ProcessItemProvider extends GeneralEquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Process_type") :
-            getString("_UI_Process_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_Process_type" )
+                : getString( "_UI_Process_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -156,21 +153,21 @@ public class ProcessItemProvider extends GeneralEquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class)) {
-            case SclPackage.PROCESS__TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.PROCESS__LINE:
-            case SclPackage.PROCESS__CONDUCTING_EQUIPMENT:
-            case SclPackage.PROCESS__SUBSTATION:
-            case SclPackage.PROCESS__SUB_PROCESSES:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class ) ) {
+        case SclPackage.PROCESS__TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.PROCESS__LINE:
+        case SclPackage.PROCESS__CONDUCTING_EQUIPMENT:
+        case SclPackage.PROCESS__SUBSTATION:
+        case SclPackage.PROCESS__SUB_PROCESSES:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -181,28 +178,20 @@ public class ProcessItemProvider extends GeneralEquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getProcess_Line(),
-                 SclFactory.eINSTANCE.createLine()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getProcess_ConductingEquipment(),
-                 SclFactory.eINSTANCE.createConductingEquipment()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getProcess_Substation(),
-                 SclFactory.eINSTANCE.createSubstation()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getProcess_SubProcesses(),
-                 SclFactory.eINSTANCE.createProcess()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getProcess_Line(),
+                SclFactory.eINSTANCE.createLine() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getProcess_ConductingEquipment(),
+                SclFactory.eINSTANCE.createConductingEquipment() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getProcess_Substation(),
+                SclFactory.eINSTANCE.createSubstation() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getProcess_SubProcesses(),
+                SclFactory.eINSTANCE.createProcess() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtNsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtNsItemProvider.java
index 2beace5..d61cec4 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtNsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtNsItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ProtNsItemProvider 
-    extends SclObjectItemProvider {
+public class ProtNsItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public ProtNsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ProtNsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,12 +57,12 @@ public class ProtNsItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTypePropertyDescriptor(object);
-            addValuePropertyDescriptor(object);
+            addTypePropertyDescriptor( object );
+            addValuePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,19 @@ public class ProtNsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ProtNs_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ProtNs_type_feature", "_UI_ProtNs_type"),
-                 SclPackage.eINSTANCE.getProtNs_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ProtNs_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ProtNs_type_feature", "_UI_ProtNs_type" ),
+                        SclPackage.eINSTANCE.getProtNs_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,20 +94,20 @@ public class ProtNsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addValuePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ProtNs_value_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ProtNs_value_feature", "_UI_ProtNs_type"),
-                 SclPackage.eINSTANCE.getProtNs_Value(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValuePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ProtNs_value_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ProtNs_value_feature",
+                                "_UI_ProtNs_type" ),
+                        SclPackage.eINSTANCE.getProtNs_Value(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,8 +117,8 @@ public class ProtNsItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ProtNs"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ProtNs" ) );
     }
 
     /**
@@ -130,11 +128,10 @@ public class ProtNsItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ProtNs protNs = (ProtNs)object;
-        return getString("_UI_ProtNs_type") + " " + protNs.getLineNumber();
+    public String getText( Object object ) {
+        ProtNs protNs = ( ProtNs ) object;
+        return getString( "_UI_ProtNs_type" ) + " " + protNs.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -144,16 +141,16 @@ public class ProtNsItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ProtNs.class)) {
-            case SclPackage.PROT_NS__TYPE:
-            case SclPackage.PROT_NS__VALUE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ProtNs.class ) ) {
+        case SclPackage.PROT_NS__TYPE:
+        case SclPackage.PROT_NS__VALUE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -164,8 +161,8 @@ public class ProtNsItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtocolItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtocolItemProvider.java
index d89a122..42a185f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtocolItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtocolItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ProtocolItemProvider 
-    extends SclObjectItemProvider {
+public class ProtocolItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public ProtocolItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ProtocolItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,11 +57,11 @@ public class ProtocolItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addMustUnderstandPropertyDescriptor(object);
+            addMustUnderstandPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -73,20 +72,20 @@ public class ProtocolItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMustUnderstandPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Protocol_mustUnderstand_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Protocol_mustUnderstand_feature", "_UI_Protocol_type"),
-                 SclPackage.eINSTANCE.getProtocol_MustUnderstand(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMustUnderstandPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Protocol_mustUnderstand_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Protocol_mustUnderstand_feature",
+                                "_UI_Protocol_type" ),
+                        SclPackage.eINSTANCE.getProtocol_MustUnderstand(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,8 +95,8 @@ public class ProtocolItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Protocol"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Protocol" ) );
     }
 
     /**
@@ -107,11 +106,10 @@ public class ProtocolItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Protocol protocol = (Protocol)object;
-        return getString("_UI_Protocol_type") + " " + protocol.getLineNumber();
+    public String getText( Object object ) {
+        Protocol protocol = ( Protocol ) object;
+        return getString( "_UI_Protocol_type" ) + " " + protocol.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -121,15 +119,15 @@ public class ProtocolItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(Protocol.class)) {
-            case SclPackage.PROTOCOL__MUST_UNDERSTAND:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( Protocol.class ) ) {
+        case SclPackage.PROTOCOL__MUST_UNDERSTAND:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -140,8 +138,8 @@ public class ProtocolItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReadWriteItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReadWriteItemProvider.java
index 2beba7f..8fc41f7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReadWriteItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReadWriteItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.ReadWrite;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ReadWriteItemProvider 
-    extends ServiceYesNoItemProvider {
+public class ReadWriteItemProvider
+        extends ServiceYesNoItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public ReadWriteItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ReadWriteItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class ReadWriteItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class ReadWriteItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ReadWrite"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ReadWrite" ) );
     }
 
     /**
@@ -80,11 +79,10 @@ public class ReadWriteItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ReadWrite readWrite = (ReadWrite)object;
-        return getString("_UI_ReadWrite_type") + " " + readWrite.getLineNumber();
+    public String getText( Object object ) {
+        ReadWrite readWrite = ( ReadWrite ) object;
+        return getString( "_UI_ReadWrite_type" ) + " " + readWrite.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -94,9 +92,8 @@ public class ReadWriteItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -107,8 +104,8 @@ public class ReadWriteItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/RedProtItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/RedProtItemProvider.java
index 79b2f19..b68f2be 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/RedProtItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/RedProtItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class RedProtItemProvider 
-    extends SclObjectItemProvider {
+public class RedProtItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public RedProtItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public RedProtItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,13 +57,13 @@ public class RedProtItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addHsrPropertyDescriptor(object);
-            addPrpPropertyDescriptor(object);
-            addRstpPropertyDescriptor(object);
+            addHsrPropertyDescriptor( object );
+            addPrpPropertyDescriptor( object );
+            addRstpPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class RedProtItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addHsrPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_RedProt_hsr_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_RedProt_hsr_feature", "_UI_RedProt_type"),
-                 SclPackage.eINSTANCE.getRedProt_Hsr(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addHsrPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_RedProt_hsr_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_RedProt_hsr_feature",
+                                "_UI_RedProt_type" ),
+                        SclPackage.eINSTANCE.getRedProt_Hsr(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class RedProtItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPrpPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_RedProt_prp_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_RedProt_prp_feature", "_UI_RedProt_type"),
-                 SclPackage.eINSTANCE.getRedProt_Prp(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPrpPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_RedProt_prp_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_RedProt_prp_feature",
+                                "_UI_RedProt_type" ),
+                        SclPackage.eINSTANCE.getRedProt_Prp(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,20 +118,20 @@ public class RedProtItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRstpPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_RedProt_rstp_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_RedProt_rstp_feature", "_UI_RedProt_type"),
-                 SclPackage.eINSTANCE.getRedProt_Rstp(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addRstpPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_RedProt_rstp_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_RedProt_rstp_feature",
+                                "_UI_RedProt_type" ),
+                        SclPackage.eINSTANCE.getRedProt_Rstp(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -142,8 +141,8 @@ public class RedProtItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/RedProt"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/RedProt" ) );
     }
 
     /**
@@ -153,11 +152,10 @@ public class RedProtItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        RedProt redProt = (RedProt)object;
-        return getString("_UI_RedProt_type") + " " + redProt.getLineNumber();
+    public String getText( Object object ) {
+        RedProt redProt = ( RedProt ) object;
+        return getString( "_UI_RedProt_type" ) + " " + redProt.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -167,17 +165,17 @@ public class RedProtItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(RedProt.class)) {
-            case SclPackage.RED_PROT__HSR:
-            case SclPackage.RED_PROT__PRP:
-            case SclPackage.RED_PROT__RSTP:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( RedProt.class ) ) {
+        case SclPackage.RED_PROT__HSR:
+        case SclPackage.RED_PROT__PRP:
+        case SclPackage.RED_PROT__RSTP:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -188,8 +186,8 @@ public class RedProtItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReportControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReportControlItemProvider.java
index 30f8669..bbd5a13 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReportControlItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReportControlItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class ReportControlItemProvider extends ControlWithTriggerOptItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    public ReportControlItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ReportControlItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,15 +58,15 @@ public class ReportControlItemProvider extends ControlWithTriggerOptItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addBufferedPropertyDescriptor(object);
-            addBufTimePropertyDescriptor(object);
-            addConfRevPropertyDescriptor(object);
-            addIndexedPropertyDescriptor(object);
-            addRptIDPropertyDescriptor(object);
+            addBufferedPropertyDescriptor( object );
+            addBufTimePropertyDescriptor( object );
+            addConfRevPropertyDescriptor( object );
+            addIndexedPropertyDescriptor( object );
+            addRptIDPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -78,20 +77,20 @@ public class ReportControlItemProvider extends ControlWithTriggerOptItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addBufferedPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ReportControl_buffered_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ReportControl_buffered_feature", "_UI_ReportControl_type"),
-                 SclPackage.eINSTANCE.getReportControl_Buffered(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addBufferedPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ReportControl_buffered_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ReportControl_buffered_feature",
+                                "_UI_ReportControl_type" ),
+                        SclPackage.eINSTANCE.getReportControl_Buffered(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -100,20 +99,20 @@ public class ReportControlItemProvider extends ControlWithTriggerOptItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addBufTimePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ReportControl_bufTime_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ReportControl_bufTime_feature", "_UI_ReportControl_type"),
-                 SclPackage.eINSTANCE.getReportControl_BufTime(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addBufTimePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ReportControl_bufTime_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ReportControl_bufTime_feature",
+                                "_UI_ReportControl_type" ),
+                        SclPackage.eINSTANCE.getReportControl_BufTime(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -122,20 +121,20 @@ public class ReportControlItemProvider extends ControlWithTriggerOptItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addConfRevPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ReportControl_confRev_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ReportControl_confRev_feature", "_UI_ReportControl_type"),
-                 SclPackage.eINSTANCE.getReportControl_ConfRev(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addConfRevPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ReportControl_confRev_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ReportControl_confRev_feature",
+                                "_UI_ReportControl_type" ),
+                        SclPackage.eINSTANCE.getReportControl_ConfRev(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -144,20 +143,20 @@ public class ReportControlItemProvider extends ControlWithTriggerOptItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIndexedPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ReportControl_indexed_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ReportControl_indexed_feature", "_UI_ReportControl_type"),
-                 SclPackage.eINSTANCE.getReportControl_Indexed(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIndexedPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ReportControl_indexed_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ReportControl_indexed_feature",
+                                "_UI_ReportControl_type" ),
+                        SclPackage.eINSTANCE.getReportControl_Indexed(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -166,20 +165,20 @@ public class ReportControlItemProvider extends ControlWithTriggerOptItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRptIDPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ReportControl_rptID_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ReportControl_rptID_feature", "_UI_ReportControl_type"),
-                 SclPackage.eINSTANCE.getReportControl_RptID(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addRptIDPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ReportControl_rptID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ReportControl_rptID_feature",
+                                "_UI_ReportControl_type" ),
+                        SclPackage.eINSTANCE.getReportControl_RptID(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -191,11 +190,11 @@ public class ReportControlItemProvider extends ControlWithTriggerOptItemProvider
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getReportControl_OptFields());
-            childrenFeatures.add(SclPackage.eINSTANCE.getReportControl_RptEnabled());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getReportControl_OptFields() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getReportControl_RptEnabled() );
         }
         return childrenFeatures;
     }
@@ -206,11 +205,11 @@ public class ReportControlItemProvider extends ControlWithTriggerOptItemProvider
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -220,8 +219,8 @@ public class ReportControlItemProvider extends ControlWithTriggerOptItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ReportControl"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ReportControl" ) );
     }
 
     /**
@@ -231,13 +230,11 @@ public class ReportControlItemProvider extends ControlWithTriggerOptItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((ReportControl)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_ReportControl_type") :
-            getString("_UI_ReportControl_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( ReportControl ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_ReportControl_type" )
+                : getString( "_UI_ReportControl_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -247,23 +244,23 @@ public class ReportControlItemProvider extends ControlWithTriggerOptItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ReportControl.class)) {
-            case SclPackage.REPORT_CONTROL__BUFFERED:
-            case SclPackage.REPORT_CONTROL__BUF_TIME:
-            case SclPackage.REPORT_CONTROL__CONF_REV:
-            case SclPackage.REPORT_CONTROL__INDEXED:
-            case SclPackage.REPORT_CONTROL__RPT_ID:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.REPORT_CONTROL__OPT_FIELDS:
-            case SclPackage.REPORT_CONTROL__RPT_ENABLED:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( ReportControl.class ) ) {
+        case SclPackage.REPORT_CONTROL__BUFFERED:
+        case SclPackage.REPORT_CONTROL__BUF_TIME:
+        case SclPackage.REPORT_CONTROL__CONF_REV:
+        case SclPackage.REPORT_CONTROL__INDEXED:
+        case SclPackage.REPORT_CONTROL__RPT_ID:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.REPORT_CONTROL__OPT_FIELDS:
+        case SclPackage.REPORT_CONTROL__RPT_ENABLED:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -274,18 +271,14 @@ public class ReportControlItemProvider extends ControlWithTriggerOptItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getReportControl_OptFields(),
-                 SclFactory.eINSTANCE.createOptFields()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getReportControl_OptFields(),
+                SclFactory.eINSTANCE.createOptFields() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getReportControl_RptEnabled(),
-                 SclFactory.eINSTANCE.createRptEnabled()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getReportControl_RptEnabled(),
+                SclFactory.eINSTANCE.createRptEnabled() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReportSettingsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReportSettingsItemProvider.java
index 2c7c308..de8107c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReportSettingsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReportSettingsItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -47,8 +46,8 @@ public class ReportSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ReportSettingsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ReportSettingsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,17 +57,17 @@ public class ReportSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addBufTimePropertyDescriptor(object);
-            addIntgPdPropertyDescriptor(object);
-            addOptFieldsPropertyDescriptor(object);
-            addOwnerPropertyDescriptor(object);
-            addResvTmsPropertyDescriptor(object);
-            addRptIDPropertyDescriptor(object);
-            addTrgOpsPropertyDescriptor(object);
+            addBufTimePropertyDescriptor( object );
+            addIntgPdPropertyDescriptor( object );
+            addOptFieldsPropertyDescriptor( object );
+            addOwnerPropertyDescriptor( object );
+            addResvTmsPropertyDescriptor( object );
+            addRptIDPropertyDescriptor( object );
+            addTrgOpsPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -79,20 +78,20 @@ public class ReportSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addBufTimePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ReportSettings_bufTime_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ReportSettings_bufTime_feature", "_UI_ReportSettings_type"),
-                 SclPackage.eINSTANCE.getReportSettings_BufTime(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addBufTimePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ReportSettings_bufTime_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ReportSettings_bufTime_feature",
+                                "_UI_ReportSettings_type" ),
+                        SclPackage.eINSTANCE.getReportSettings_BufTime(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -101,20 +100,20 @@ public class ReportSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIntgPdPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ReportSettings_intgPd_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ReportSettings_intgPd_feature", "_UI_ReportSettings_type"),
-                 SclPackage.eINSTANCE.getReportSettings_IntgPd(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIntgPdPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ReportSettings_intgPd_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ReportSettings_intgPd_feature",
+                                "_UI_ReportSettings_type" ),
+                        SclPackage.eINSTANCE.getReportSettings_IntgPd(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -123,20 +122,20 @@ public class ReportSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addOptFieldsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ReportSettings_optFields_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ReportSettings_optFields_feature", "_UI_ReportSettings_type"),
-                 SclPackage.eINSTANCE.getReportSettings_OptFields(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addOptFieldsPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ReportSettings_optFields_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ReportSettings_optFields_feature",
+                                "_UI_ReportSettings_type" ),
+                        SclPackage.eINSTANCE.getReportSettings_OptFields(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -145,20 +144,20 @@ public class ReportSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addOwnerPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ReportSettings_owner_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ReportSettings_owner_feature", "_UI_ReportSettings_type"),
-                 SclPackage.eINSTANCE.getReportSettings_Owner(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addOwnerPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ReportSettings_owner_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ReportSettings_owner_feature",
+                                "_UI_ReportSettings_type" ),
+                        SclPackage.eINSTANCE.getReportSettings_Owner(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -167,20 +166,20 @@ public class ReportSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addResvTmsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ReportSettings_resvTms_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ReportSettings_resvTms_feature", "_UI_ReportSettings_type"),
-                 SclPackage.eINSTANCE.getReportSettings_ResvTms(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addResvTmsPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ReportSettings_resvTms_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ReportSettings_resvTms_feature",
+                                "_UI_ReportSettings_type" ),
+                        SclPackage.eINSTANCE.getReportSettings_ResvTms(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -189,20 +188,20 @@ public class ReportSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRptIDPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ReportSettings_rptID_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ReportSettings_rptID_feature", "_UI_ReportSettings_type"),
-                 SclPackage.eINSTANCE.getReportSettings_RptID(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addRptIDPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ReportSettings_rptID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ReportSettings_rptID_feature",
+                                "_UI_ReportSettings_type" ),
+                        SclPackage.eINSTANCE.getReportSettings_RptID(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -211,20 +210,20 @@ public class ReportSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTrgOpsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ReportSettings_trgOps_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ReportSettings_trgOps_feature", "_UI_ReportSettings_type"),
-                 SclPackage.eINSTANCE.getReportSettings_TrgOps(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTrgOpsPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ReportSettings_trgOps_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ReportSettings_trgOps_feature",
+                                "_UI_ReportSettings_type" ),
+                        SclPackage.eINSTANCE.getReportSettings_TrgOps(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -234,8 +233,8 @@ public class ReportSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ReportSettings"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ReportSettings" ) );
     }
 
     /**
@@ -245,14 +244,12 @@ public class ReportSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ServiceSettingsNoDynEnum labelValue = ((ReportSettings)object).getCbName();
+    public String getText( Object object ) {
+        ServiceSettingsNoDynEnum labelValue = ( ( ReportSettings ) object ).getCbName();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ?
-            getString("_UI_ReportSettings_type") :
-            getString("_UI_ReportSettings_type") + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_ReportSettings_type" )
+                : getString( "_UI_ReportSettings_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -262,21 +259,21 @@ public class ReportSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ReportSettings.class)) {
-            case SclPackage.REPORT_SETTINGS__BUF_TIME:
-            case SclPackage.REPORT_SETTINGS__INTG_PD:
-            case SclPackage.REPORT_SETTINGS__OPT_FIELDS:
-            case SclPackage.REPORT_SETTINGS__OWNER:
-            case SclPackage.REPORT_SETTINGS__RESV_TMS:
-            case SclPackage.REPORT_SETTINGS__RPT_ID:
-            case SclPackage.REPORT_SETTINGS__TRG_OPS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ReportSettings.class ) ) {
+        case SclPackage.REPORT_SETTINGS__BUF_TIME:
+        case SclPackage.REPORT_SETTINGS__INTG_PD:
+        case SclPackage.REPORT_SETTINGS__OPT_FIELDS:
+        case SclPackage.REPORT_SETTINGS__OWNER:
+        case SclPackage.REPORT_SETTINGS__RESV_TMS:
+        case SclPackage.REPORT_SETTINGS__RPT_ID:
+        case SclPackage.REPORT_SETTINGS__TRG_OPS:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -287,8 +284,8 @@ public class ReportSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/RptEnabledItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/RptEnabledItemProvider.java
index d149cd3..12a5617 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/RptEnabledItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/RptEnabledItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class RptEnabledItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public RptEnabledItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public RptEnabledItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class RptEnabledItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addMaxPropertyDescriptor(object);
+            addMaxPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class RptEnabledItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMaxPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_RptEnabled_max_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_RptEnabled_max_feature", "_UI_RptEnabled_type"),
-                 SclPackage.eINSTANCE.getRptEnabled_Max(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMaxPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_RptEnabled_max_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_RptEnabled_max_feature",
+                                "_UI_RptEnabled_type" ),
+                        SclPackage.eINSTANCE.getRptEnabled_Max(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,10 +98,10 @@ public class RptEnabledItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getRptEnabled_ClientLN());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getRptEnabled_ClientLN() );
         }
         return childrenFeatures;
     }
@@ -113,11 +112,11 @@ public class RptEnabledItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -127,8 +126,8 @@ public class RptEnabledItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/RptEnabled"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/RptEnabled" ) );
     }
 
     /**
@@ -138,11 +137,10 @@ public class RptEnabledItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        RptEnabled rptEnabled = (RptEnabled)object;
-        return getString("_UI_RptEnabled_type") + " " + rptEnabled.getLineNumber();
+    public String getText( Object object ) {
+        RptEnabled rptEnabled = ( RptEnabled ) object;
+        return getString( "_UI_RptEnabled_type" ) + " " + rptEnabled.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -152,18 +150,18 @@ public class RptEnabledItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(RptEnabled.class)) {
-            case SclPackage.RPT_ENABLED__MAX:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.RPT_ENABLED__CLIENT_LN:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( RptEnabled.class ) ) {
+        case SclPackage.RPT_ENABLED__MAX:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.RPT_ENABLED__CLIENT_LN:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -174,13 +172,11 @@ public class RptEnabledItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getRptEnabled_ClientLN(),
-                 SclFactory.eINSTANCE.createClientLN()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getRptEnabled_ClientLN(),
+                SclFactory.eINSTANCE.createClientLN() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SCLEditPlugin.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SCLEditPlugin.java
index a725919..d466281 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SCLEditPlugin.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SCLEditPlugin.java
@@ -54,9 +54,8 @@ public final class SCLEditPlugin extends EMFPlugin {
      * @generated
      */
     public SCLEditPlugin() {
-        super
-          (new ResourceLocator [] {
-           });
+        super( new ResourceLocator[] {
+        } );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SCLItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SCLItemProvider.java
index 9b72535..98dc52b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SCLItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SCLItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class SCLItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SCLItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SCLItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,13 +58,13 @@ public class SCLItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addRevisionPropertyDescriptor(object);
-            addVersionPropertyDescriptor(object);
-            addReleasePropertyDescriptor(object);
+            addRevisionPropertyDescriptor( object );
+            addVersionPropertyDescriptor( object );
+            addReleasePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -76,20 +75,19 @@ public class SCLItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRevisionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SCL_revision_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SCL_revision_feature", "_UI_SCL_type"),
-                 SclPackage.eINSTANCE.getSCL_Revision(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addRevisionPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SCL_revision_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SCL_revision_feature", "_UI_SCL_type" ),
+                        SclPackage.eINSTANCE.getSCL_Revision(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -98,20 +96,19 @@ public class SCLItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addVersionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SCL_version_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SCL_version_feature", "_UI_SCL_type"),
-                 SclPackage.eINSTANCE.getSCL_Version(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addVersionPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SCL_version_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SCL_version_feature", "_UI_SCL_type" ),
+                        SclPackage.eINSTANCE.getSCL_Version(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -120,20 +117,19 @@ public class SCLItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReleasePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SCL_release_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SCL_release_feature", "_UI_SCL_type"),
-                 SclPackage.eINSTANCE.getSCL_Release(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addReleasePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SCL_release_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SCL_release_feature", "_UI_SCL_type" ),
+                        SclPackage.eINSTANCE.getSCL_Release(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -145,16 +141,16 @@ public class SCLItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getSCL_Header());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSCL_Line());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSCL_Process());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSCL_IED());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSCL_DataTypeTemplates());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSCL_Communication());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSCL_Substation());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSCL_Header() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSCL_Line() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSCL_Process() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSCL_IED() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSCL_DataTypeTemplates() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSCL_Communication() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSCL_Substation() );
         }
         return childrenFeatures;
     }
@@ -165,11 +161,11 @@ public class SCLItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -179,8 +175,8 @@ public class SCLItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SCL"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SCL" ) );
     }
 
     /**
@@ -190,11 +186,10 @@ public class SCLItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        SCL scl = (SCL)object;
-        return getString("_UI_SCL_type") + " " + scl.getLineNumber();
+    public String getText( Object object ) {
+        SCL scl = ( SCL ) object;
+        return getString( "_UI_SCL_type" ) + " " + scl.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -204,26 +199,26 @@ public class SCLItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(SCL.class)) {
-            case SclPackage.SCL__REVISION:
-            case SclPackage.SCL__VERSION:
-            case SclPackage.SCL__RELEASE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.SCL__HEADER:
-            case SclPackage.SCL__LINE:
-            case SclPackage.SCL__PROCESS:
-            case SclPackage.SCL__IED:
-            case SclPackage.SCL__DATA_TYPE_TEMPLATES:
-            case SclPackage.SCL__COMMUNICATION:
-            case SclPackage.SCL__SUBSTATION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( SCL.class ) ) {
+        case SclPackage.SCL__REVISION:
+        case SclPackage.SCL__VERSION:
+        case SclPackage.SCL__RELEASE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.SCL__HEADER:
+        case SclPackage.SCL__LINE:
+        case SclPackage.SCL__PROCESS:
+        case SclPackage.SCL__IED:
+        case SclPackage.SCL__DATA_TYPE_TEMPLATES:
+        case SclPackage.SCL__COMMUNICATION:
+        case SclPackage.SCL__SUBSTATION:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -234,43 +229,29 @@ public class SCLItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSCL_Header(),
-                 SclFactory.eINSTANCE.createHeader()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSCL_Header(),
+                SclFactory.eINSTANCE.createHeader() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSCL_Line(),
-                 SclFactory.eINSTANCE.createLine()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSCL_Line(),
+                SclFactory.eINSTANCE.createLine() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSCL_Process(),
-                 SclFactory.eINSTANCE.createProcess()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSCL_Process(),
+                SclFactory.eINSTANCE.createProcess() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSCL_IED(),
-                 SclFactory.eINSTANCE.createIED()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSCL_IED(),
+                SclFactory.eINSTANCE.createIED() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSCL_DataTypeTemplates(),
-                 SclFactory.eINSTANCE.createDataTypeTemplates()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSCL_DataTypeTemplates(),
+                SclFactory.eINSTANCE.createDataTypeTemplates() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSCL_Communication(),
-                 SclFactory.eINSTANCE.createCommunication()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSCL_Communication(),
+                SclFactory.eINSTANCE.createCommunication() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSCL_Substation(),
-                 SclFactory.eINSTANCE.createSubstation()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSCL_Substation(),
+                SclFactory.eINSTANCE.createSubstation() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SDIItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SDIItemProvider.java
index 66abeb3..644096d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SDIItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SDIItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class SDIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SDIItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SDIItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,15 +58,15 @@ public class SDIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addIxPropertyDescriptor(object);
-            addSAddrPropertyDescriptor(object);
-            addNamePropertyDescriptor(object);
-            addRefersToSDOPropertyDescriptor(object);
-            addRefersToAbstractDataAttributePropertyDescriptor(object);
+            addIxPropertyDescriptor( object );
+            addSAddrPropertyDescriptor( object );
+            addNamePropertyDescriptor( object );
+            addRefersToSDOPropertyDescriptor( object );
+            addRefersToAbstractDataAttributePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -78,20 +77,19 @@ public class SDIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIxPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SDI_ix_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SDI_ix_feature", "_UI_SDI_type"),
-                 SclPackage.eINSTANCE.getSDI_Ix(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIxPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SDI_ix_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SDI_ix_feature", "_UI_SDI_type" ),
+                        SclPackage.eINSTANCE.getSDI_Ix(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -100,20 +98,19 @@ public class SDIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSAddrPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SDI_sAddr_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SDI_sAddr_feature", "_UI_SDI_type"),
-                 SclPackage.eINSTANCE.getSDI_SAddr(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSAddrPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SDI_sAddr_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SDI_sAddr_feature", "_UI_SDI_type" ),
+                        SclPackage.eINSTANCE.getSDI_SAddr(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -122,20 +119,19 @@ public class SDIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SDI_name_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SDI_name_feature", "_UI_SDI_type"),
-                 SclPackage.eINSTANCE.getSDI_Name(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SDI_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SDI_name_feature", "_UI_SDI_type" ),
+                        SclPackage.eINSTANCE.getSDI_Name(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -144,20 +140,20 @@ public class SDIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToSDOPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SDI_RefersToSDO_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SDI_RefersToSDO_feature", "_UI_SDI_type"),
-                 SclPackage.eINSTANCE.getSDI_RefersToSDO(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToSDOPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SDI_RefersToSDO_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SDI_RefersToSDO_feature",
+                                "_UI_SDI_type" ),
+                        SclPackage.eINSTANCE.getSDI_RefersToSDO(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -166,20 +162,20 @@ public class SDIItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToAbstractDataAttributePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SDI_RefersToAbstractDataAttribute_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SDI_RefersToAbstractDataAttribute_feature", "_UI_SDI_type"),
-                 SclPackage.eINSTANCE.getSDI_RefersToAbstractDataAttribute(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToAbstractDataAttributePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SDI_RefersToAbstractDataAttribute_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_SDI_RefersToAbstractDataAttribute_feature", "_UI_SDI_type" ),
+                        SclPackage.eINSTANCE.getSDI_RefersToAbstractDataAttribute(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -191,11 +187,11 @@ public class SDIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getSDI_DAI());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSDI_SubSDI());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSDI_DAI() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSDI_SubSDI() );
         }
         return childrenFeatures;
     }
@@ -206,11 +202,11 @@ public class SDIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -220,8 +216,8 @@ public class SDIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SDI"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SDI" ) );
     }
 
     /**
@@ -231,13 +227,11 @@ public class SDIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((SDI)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_SDI_type") :
-            getString("_UI_SDI_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( SDI ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_SDI_type" )
+                : getString( "_UI_SDI_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -247,21 +241,21 @@ public class SDIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(SDI.class)) {
-            case SclPackage.SDI__IX:
-            case SclPackage.SDI__SADDR:
-            case SclPackage.SDI__NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.SDI__DAI:
-            case SclPackage.SDI__SUB_SDI:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( SDI.class ) ) {
+        case SclPackage.SDI__IX:
+        case SclPackage.SDI__SADDR:
+        case SclPackage.SDI__NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.SDI__DAI:
+        case SclPackage.SDI__SUB_SDI:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -272,18 +266,14 @@ public class SDIItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSDI_DAI(),
-                 SclFactory.eINSTANCE.createDAI()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSDI_DAI(),
+                SclFactory.eINSTANCE.createDAI() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSDI_SubSDI(),
-                 SclFactory.eINSTANCE.createSDI()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSDI_SubSDI(),
+                SclFactory.eINSTANCE.createSDI() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SDOItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SDOItemProvider.java
index 0f3d98d..5fa39ca 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SDOItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SDOItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class SDOItemProvider extends AbstractDataObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SDOItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SDOItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,12 +56,12 @@ public class SDOItemProvider extends AbstractDataObjectItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addCountPropertyDescriptor(object);
-            addReferredBySDIPropertyDescriptor(object);
+            addCountPropertyDescriptor( object );
+            addReferredBySDIPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -73,20 +72,19 @@ public class SDOItemProvider extends AbstractDataObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addCountPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SDO_count_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SDO_count_feature", "_UI_SDO_type"),
-                 SclPackage.eINSTANCE.getSDO_Count(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addCountPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SDO_count_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SDO_count_feature", "_UI_SDO_type" ),
+                        SclPackage.eINSTANCE.getSDO_Count(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -95,20 +93,20 @@ public class SDOItemProvider extends AbstractDataObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addReferredBySDIPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SDO_ReferredBySDI_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SDO_ReferredBySDI_feature", "_UI_SDO_type"),
-                 SclPackage.eINSTANCE.getSDO_ReferredBySDI(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addReferredBySDIPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SDO_ReferredBySDI_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SDO_ReferredBySDI_feature",
+                                "_UI_SDO_type" ),
+                        SclPackage.eINSTANCE.getSDO_ReferredBySDI(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -118,8 +116,8 @@ public class SDOItemProvider extends AbstractDataObjectItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SDO"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SDO" ) );
     }
 
     /**
@@ -129,13 +127,11 @@ public class SDOItemProvider extends AbstractDataObjectItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((SDO)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_SDO_type") :
-            getString("_UI_SDO_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( SDO ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_SDO_type" )
+                : getString( "_UI_SDO_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -145,15 +141,15 @@ public class SDOItemProvider extends AbstractDataObjectItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(SDO.class)) {
-            case SclPackage.SDO__COUNT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( SDO.class ) ) {
+        case SclPackage.SDO__COUNT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -164,8 +160,8 @@ public class SDOItemProvider extends AbstractDataObjectItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SGEditItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SGEditItemProvider.java
index 7e808a0..fae4986 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SGEditItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SGEditItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class SGEditItemProvider 
-    extends SclObjectItemProvider {
+public class SGEditItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public SGEditItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SGEditItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,11 +57,11 @@ public class SGEditItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addResvTmsPropertyDescriptor(object);
+            addResvTmsPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -73,20 +72,20 @@ public class SGEditItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addResvTmsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SGEdit_resvTms_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SGEdit_resvTms_feature", "_UI_SGEdit_type"),
-                 SclPackage.eINSTANCE.getSGEdit_ResvTms(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addResvTmsPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SGEdit_resvTms_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SGEdit_resvTms_feature",
+                                "_UI_SGEdit_type" ),
+                        SclPackage.eINSTANCE.getSGEdit_ResvTms(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,8 +95,8 @@ public class SGEditItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SGEdit"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SGEdit" ) );
     }
 
     /**
@@ -107,11 +106,10 @@ public class SGEditItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        SGEdit sgEdit = (SGEdit)object;
-        return getString("_UI_SGEdit_type") + " " + sgEdit.getLineNumber();
+    public String getText( Object object ) {
+        SGEdit sgEdit = ( SGEdit ) object;
+        return getString( "_UI_SGEdit_type" ) + " " + sgEdit.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -121,15 +119,15 @@ public class SGEditItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(SGEdit.class)) {
-            case SclPackage.SG_EDIT__RESV_TMS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( SGEdit.class ) ) {
+        case SclPackage.SG_EDIT__RESV_TMS:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -140,8 +138,8 @@ public class SGEditItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVItemProvider.java
index 277e55e..ee8f070 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class SMVItemProvider extends ControlBlockItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SMVItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SMVItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class SMVItemProvider extends ControlBlockItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class SMVItemProvider extends ControlBlockItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SMV"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SMV" ) );
     }
 
     /**
@@ -79,13 +78,11 @@ public class SMVItemProvider extends ControlBlockItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((SMV)object).getCbName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_SMV_type") :
-            getString("_UI_SMV_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( SMV ) object ).getCbName();
+        return label == null || label.length() == 0 ? getString( "_UI_SMV_type" )
+                : getString( "_UI_SMV_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -95,9 +92,8 @@ public class SMVItemProvider extends ControlBlockItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -108,8 +104,8 @@ public class SMVItemProvider extends ControlBlockItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVSecurityItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVSecurityItemProvider.java
index 8af48bf..48ee39d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVSecurityItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVSecurityItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -42,8 +41,8 @@ public class SMVSecurityItemProvider extends CertificateItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SMVSecurityItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SMVSecurityItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -53,9 +52,9 @@ public class SMVSecurityItemProvider extends CertificateItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -68,8 +67,8 @@ public class SMVSecurityItemProvider extends CertificateItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SMVSecurity"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SMVSecurity" ) );
     }
 
     /**
@@ -79,13 +78,11 @@ public class SMVSecurityItemProvider extends CertificateItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((SMVSecurity)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_SMVSecurity_type") :
-            getString("_UI_SMVSecurity_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( SMVSecurity ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_SMVSecurity_type" )
+                : getString( "_UI_SMVSecurity_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -95,9 +92,8 @@ public class SMVSecurityItemProvider extends CertificateItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -108,8 +104,8 @@ public class SMVSecurityItemProvider extends CertificateItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVSettingsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVSettingsItemProvider.java
index e35ab75..06fbfeb 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVSettingsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVSettingsItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -49,8 +48,8 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SMVSettingsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SMVSettingsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -60,18 +59,18 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addSvIDPropertyDescriptor(object);
-            addOptFieldsPropertyDescriptor(object);
-            addSmpRateAttributePropertyDescriptor(object);
-            addSamplesPerSecAttributePropertyDescriptor(object);
-            addPdcTimeStampPropertyDescriptor(object);
-            addSynchSrcIdPropertyDescriptor(object);
-            addNofASDUPropertyDescriptor(object);
-            addKdaParticipantPropertyDescriptor(object);
+            addSvIDPropertyDescriptor( object );
+            addOptFieldsPropertyDescriptor( object );
+            addSmpRateAttributePropertyDescriptor( object );
+            addSamplesPerSecAttributePropertyDescriptor( object );
+            addPdcTimeStampPropertyDescriptor( object );
+            addSynchSrcIdPropertyDescriptor( object );
+            addNofASDUPropertyDescriptor( object );
+            addKdaParticipantPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -82,20 +81,20 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSvIDPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SMVSettings_svID_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SMVSettings_svID_feature", "_UI_SMVSettings_type"),
-                 SclPackage.eINSTANCE.getSMVSettings_SvID(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSvIDPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SMVSettings_svID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SMVSettings_svID_feature",
+                                "_UI_SMVSettings_type" ),
+                        SclPackage.eINSTANCE.getSMVSettings_SvID(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -104,20 +103,20 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addOptFieldsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SMVSettings_optFields_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SMVSettings_optFields_feature", "_UI_SMVSettings_type"),
-                 SclPackage.eINSTANCE.getSMVSettings_OptFields(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addOptFieldsPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SMVSettings_optFields_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SMVSettings_optFields_feature",
+                                "_UI_SMVSettings_type" ),
+                        SclPackage.eINSTANCE.getSMVSettings_OptFields(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -126,20 +125,20 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSmpRateAttributePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SMVSettings_smpRateAttribute_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SMVSettings_smpRateAttribute_feature", "_UI_SMVSettings_type"),
-                 SclPackage.eINSTANCE.getSMVSettings_SmpRateAttribute(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSmpRateAttributePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SMVSettings_smpRateAttribute_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SMVSettings_smpRateAttribute_feature",
+                                "_UI_SMVSettings_type" ),
+                        SclPackage.eINSTANCE.getSMVSettings_SmpRateAttribute(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -148,20 +147,20 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSamplesPerSecAttributePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SMVSettings_samplesPerSecAttribute_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SMVSettings_samplesPerSecAttribute_feature", "_UI_SMVSettings_type"),
-                 SclPackage.eINSTANCE.getSMVSettings_SamplesPerSecAttribute(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSamplesPerSecAttributePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SMVSettings_samplesPerSecAttribute_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_SMVSettings_samplesPerSecAttribute_feature", "_UI_SMVSettings_type" ),
+                        SclPackage.eINSTANCE.getSMVSettings_SamplesPerSecAttribute(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -170,20 +169,20 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPdcTimeStampPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SMVSettings_pdcTimeStamp_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SMVSettings_pdcTimeStamp_feature", "_UI_SMVSettings_type"),
-                 SclPackage.eINSTANCE.getSMVSettings_PdcTimeStamp(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPdcTimeStampPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SMVSettings_pdcTimeStamp_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SMVSettings_pdcTimeStamp_feature",
+                                "_UI_SMVSettings_type" ),
+                        SclPackage.eINSTANCE.getSMVSettings_PdcTimeStamp(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -192,20 +191,20 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSynchSrcIdPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SMVSettings_synchSrcId_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SMVSettings_synchSrcId_feature", "_UI_SMVSettings_type"),
-                 SclPackage.eINSTANCE.getSMVSettings_SynchSrcId(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSynchSrcIdPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SMVSettings_synchSrcId_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SMVSettings_synchSrcId_feature",
+                                "_UI_SMVSettings_type" ),
+                        SclPackage.eINSTANCE.getSMVSettings_SynchSrcId(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -214,20 +213,20 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNofASDUPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SMVSettings_nofASDU_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SMVSettings_nofASDU_feature", "_UI_SMVSettings_type"),
-                 SclPackage.eINSTANCE.getSMVSettings_NofASDU(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNofASDUPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SMVSettings_nofASDU_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SMVSettings_nofASDU_feature",
+                                "_UI_SMVSettings_type" ),
+                        SclPackage.eINSTANCE.getSMVSettings_NofASDU(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -236,20 +235,20 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addKdaParticipantPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SMVSettings_kdaParticipant_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SMVSettings_kdaParticipant_feature", "_UI_SMVSettings_type"),
-                 SclPackage.eINSTANCE.getSMVSettings_KdaParticipant(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addKdaParticipantPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SMVSettings_kdaParticipant_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SMVSettings_kdaParticipant_feature",
+                                "_UI_SMVSettings_type" ),
+                        SclPackage.eINSTANCE.getSMVSettings_KdaParticipant(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -261,13 +260,13 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getSMVSettings_SmpRate());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSMVSettings_SamplesPerSec());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSMVSettings_SecPerSamples());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSMVSettings_McSecurity());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSMVSettings_SmpRate() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSMVSettings_SamplesPerSec() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSMVSettings_SecPerSamples() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSMVSettings_McSecurity() );
         }
         return childrenFeatures;
     }
@@ -278,11 +277,11 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -292,8 +291,8 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SMVSettings"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SMVSettings" ) );
     }
 
     /**
@@ -303,14 +302,12 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ServiceSettingsNoDynEnum labelValue = ((SMVSettings)object).getCbName();
+    public String getText( Object object ) {
+        ServiceSettingsNoDynEnum labelValue = ( ( SMVSettings ) object ).getCbName();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ?
-            getString("_UI_SMVSettings_type") :
-            getString("_UI_SMVSettings_type") + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_SMVSettings_type" )
+                : getString( "_UI_SMVSettings_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -320,28 +317,28 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(SMVSettings.class)) {
-            case SclPackage.SMV_SETTINGS__SV_ID:
-            case SclPackage.SMV_SETTINGS__OPT_FIELDS:
-            case SclPackage.SMV_SETTINGS__SMP_RATE_ATTRIBUTE:
-            case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC_ATTRIBUTE:
-            case SclPackage.SMV_SETTINGS__PDC_TIME_STAMP:
-            case SclPackage.SMV_SETTINGS__SYNCH_SRC_ID:
-            case SclPackage.SMV_SETTINGS__NOF_ASDU:
-            case SclPackage.SMV_SETTINGS__KDA_PARTICIPANT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.SMV_SETTINGS__SMP_RATE:
-            case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC:
-            case SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES:
-            case SclPackage.SMV_SETTINGS__MC_SECURITY:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( SMVSettings.class ) ) {
+        case SclPackage.SMV_SETTINGS__SV_ID:
+        case SclPackage.SMV_SETTINGS__OPT_FIELDS:
+        case SclPackage.SMV_SETTINGS__SMP_RATE_ATTRIBUTE:
+        case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC_ATTRIBUTE:
+        case SclPackage.SMV_SETTINGS__PDC_TIME_STAMP:
+        case SclPackage.SMV_SETTINGS__SYNCH_SRC_ID:
+        case SclPackage.SMV_SETTINGS__NOF_ASDU:
+        case SclPackage.SMV_SETTINGS__KDA_PARTICIPANT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.SMV_SETTINGS__SMP_RATE:
+        case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC:
+        case SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES:
+        case SclPackage.SMV_SETTINGS__MC_SECURITY:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -352,28 +349,20 @@ public class SMVSettingsItemProvider extends ServiceSettingsItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSMVSettings_SmpRate(),
-                 SclFactory.eINSTANCE.createSmpRate()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSMVSettings_SmpRate(),
+                SclFactory.eINSTANCE.createSmpRate() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSMVSettings_SamplesPerSec(),
-                 SclFactory.eINSTANCE.createSamplesPerSec()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSMVSettings_SamplesPerSec(),
+                SclFactory.eINSTANCE.createSamplesPerSec() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSMVSettings_SecPerSamples(),
-                 SclFactory.eINSTANCE.createSecPerSamples()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSMVSettings_SecPerSamples(),
+                SclFactory.eINSTANCE.createSecPerSamples() ) );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSMVSettings_McSecurity(),
-                 SclFactory.eINSTANCE.createMcSecurity()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSMVSettings_McSecurity(),
+                SclFactory.eINSTANCE.createMcSecurity() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVscItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVscItemProvider.java
index 942a3d4..e5227b4 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVscItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVscItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class SMVscItemProvider extends ServiceWithMaxItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SMVscItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SMVscItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,14 +56,14 @@ public class SMVscItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
-
-            addDeliveryPropertyDescriptor(object);
-            addDeliveryConfPropertyDescriptor(object);
-            addSvPropertyDescriptor(object);
-            addRSVPropertyDescriptor(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
+
+            addDeliveryPropertyDescriptor( object );
+            addDeliveryConfPropertyDescriptor( object );
+            addSvPropertyDescriptor( object );
+            addRSVPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class SMVscItemProvider extends ServiceWithMaxItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDeliveryPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SMVsc_delivery_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SMVsc_delivery_feature", "_UI_SMVsc_type"),
-                 SclPackage.eINSTANCE.getSMVsc_Delivery(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDeliveryPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SMVsc_delivery_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SMVsc_delivery_feature",
+                                "_UI_SMVsc_type" ),
+                        SclPackage.eINSTANCE.getSMVsc_Delivery(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class SMVscItemProvider extends ServiceWithMaxItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDeliveryConfPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SMVsc_deliveryConf_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SMVsc_deliveryConf_feature", "_UI_SMVsc_type"),
-                 SclPackage.eINSTANCE.getSMVsc_DeliveryConf(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDeliveryConfPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SMVsc_deliveryConf_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SMVsc_deliveryConf_feature",
+                                "_UI_SMVsc_type" ),
+                        SclPackage.eINSTANCE.getSMVsc_DeliveryConf(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,20 +118,19 @@ public class SMVscItemProvider extends ServiceWithMaxItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSvPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SMVsc_sv_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SMVsc_sv_feature", "_UI_SMVsc_type"),
-                 SclPackage.eINSTANCE.getSMVsc_Sv(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSvPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SMVsc_sv_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SMVsc_sv_feature", "_UI_SMVsc_type" ),
+                        SclPackage.eINSTANCE.getSMVsc_Sv(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -141,20 +139,19 @@ public class SMVscItemProvider extends ServiceWithMaxItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRSVPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SMVsc_rSV_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SMVsc_rSV_feature", "_UI_SMVsc_type"),
-                 SclPackage.eINSTANCE.getSMVsc_RSV(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addRSVPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SMVsc_rSV_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SMVsc_rSV_feature", "_UI_SMVsc_type" ),
+                        SclPackage.eINSTANCE.getSMVsc_RSV(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -164,8 +161,8 @@ public class SMVscItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SMVsc"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SMVsc" ) );
     }
 
     /**
@@ -175,11 +172,10 @@ public class SMVscItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        SMVsc smVsc = (SMVsc)object;
-        return getString("_UI_SMVsc_type") + " " + smVsc.getLineNumber();
+    public String getText( Object object ) {
+        SMVsc smVsc = ( SMVsc ) object;
+        return getString( "_UI_SMVsc_type" ) + " " + smVsc.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -189,18 +185,18 @@ public class SMVscItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(SMVsc.class)) {
-            case SclPackage.SM_VSC__DELIVERY:
-            case SclPackage.SM_VSC__DELIVERY_CONF:
-            case SclPackage.SM_VSC__SV:
-            case SclPackage.SM_VSC__RSV:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( SMVsc.class ) ) {
+        case SclPackage.SM_VSC__DELIVERY:
+        case SclPackage.SM_VSC__DELIVERY_CONF:
+        case SclPackage.SM_VSC__SV:
+        case SclPackage.SM_VSC__RSV:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -211,8 +207,8 @@ public class SMVscItemProvider extends ServiceWithMaxItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SampledValueControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SampledValueControlItemProvider.java
index b2dad22..bec5962 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SampledValueControlItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SampledValueControlItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class SampledValueControlItemProvider extends ControlWithIEDNameItemProvi
      * <!-- end-user-doc -->
      * @generated
      */
-    public SampledValueControlItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SampledValueControlItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,16 +58,16 @@ public class SampledValueControlItemProvider extends ControlWithIEDNameItemProvi
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addMulticastPropertyDescriptor(object);
-            addNofASDUPropertyDescriptor(object);
-            addSecurityEnablePropertyDescriptor(object);
-            addSmpModPropertyDescriptor(object);
-            addSmpRatePropertyDescriptor(object);
-            addSmvIDPropertyDescriptor(object);
+            addMulticastPropertyDescriptor( object );
+            addNofASDUPropertyDescriptor( object );
+            addSecurityEnablePropertyDescriptor( object );
+            addSmpModPropertyDescriptor( object );
+            addSmpRatePropertyDescriptor( object );
+            addSmvIDPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -79,20 +78,20 @@ public class SampledValueControlItemProvider extends ControlWithIEDNameItemProvi
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMulticastPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SampledValueControl_multicast_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SampledValueControl_multicast_feature", "_UI_SampledValueControl_type"),
-                 SclPackage.eINSTANCE.getSampledValueControl_Multicast(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMulticastPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SampledValueControl_multicast_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SampledValueControl_multicast_feature",
+                                "_UI_SampledValueControl_type" ),
+                        SclPackage.eINSTANCE.getSampledValueControl_Multicast(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -101,20 +100,20 @@ public class SampledValueControlItemProvider extends ControlWithIEDNameItemProvi
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNofASDUPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SampledValueControl_nofASDU_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SampledValueControl_nofASDU_feature", "_UI_SampledValueControl_type"),
-                 SclPackage.eINSTANCE.getSampledValueControl_NofASDU(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNofASDUPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SampledValueControl_nofASDU_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SampledValueControl_nofASDU_feature",
+                                "_UI_SampledValueControl_type" ),
+                        SclPackage.eINSTANCE.getSampledValueControl_NofASDU(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -123,20 +122,20 @@ public class SampledValueControlItemProvider extends ControlWithIEDNameItemProvi
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSecurityEnablePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SampledValueControl_securityEnable_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SampledValueControl_securityEnable_feature", "_UI_SampledValueControl_type"),
-                 SclPackage.eINSTANCE.getSampledValueControl_SecurityEnable(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSecurityEnablePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SampledValueControl_securityEnable_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_SampledValueControl_securityEnable_feature", "_UI_SampledValueControl_type" ),
+                        SclPackage.eINSTANCE.getSampledValueControl_SecurityEnable(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -145,20 +144,20 @@ public class SampledValueControlItemProvider extends ControlWithIEDNameItemProvi
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSmpModPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SampledValueControl_smpMod_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SampledValueControl_smpMod_feature", "_UI_SampledValueControl_type"),
-                 SclPackage.eINSTANCE.getSampledValueControl_SmpMod(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSmpModPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SampledValueControl_smpMod_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SampledValueControl_smpMod_feature",
+                                "_UI_SampledValueControl_type" ),
+                        SclPackage.eINSTANCE.getSampledValueControl_SmpMod(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -167,20 +166,20 @@ public class SampledValueControlItemProvider extends ControlWithIEDNameItemProvi
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSmpRatePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SampledValueControl_smpRate_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SampledValueControl_smpRate_feature", "_UI_SampledValueControl_type"),
-                 SclPackage.eINSTANCE.getSampledValueControl_SmpRate(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSmpRatePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SampledValueControl_smpRate_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SampledValueControl_smpRate_feature",
+                                "_UI_SampledValueControl_type" ),
+                        SclPackage.eINSTANCE.getSampledValueControl_SmpRate(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -189,20 +188,20 @@ public class SampledValueControlItemProvider extends ControlWithIEDNameItemProvi
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSmvIDPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SampledValueControl_smvID_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SampledValueControl_smvID_feature", "_UI_SampledValueControl_type"),
-                 SclPackage.eINSTANCE.getSampledValueControl_SmvID(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSmvIDPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SampledValueControl_smvID_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SampledValueControl_smvID_feature",
+                                "_UI_SampledValueControl_type" ),
+                        SclPackage.eINSTANCE.getSampledValueControl_SmvID(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -214,10 +213,10 @@ public class SampledValueControlItemProvider extends ControlWithIEDNameItemProvi
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getSampledValueControl_SmvOpts());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSampledValueControl_SmvOpts() );
         }
         return childrenFeatures;
     }
@@ -228,11 +227,11 @@ public class SampledValueControlItemProvider extends ControlWithIEDNameItemProvi
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -242,8 +241,8 @@ public class SampledValueControlItemProvider extends ControlWithIEDNameItemProvi
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SampledValueControl"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SampledValueControl" ) );
     }
 
     /**
@@ -253,13 +252,11 @@ public class SampledValueControlItemProvider extends ControlWithIEDNameItemProvi
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((SampledValueControl)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_SampledValueControl_type") :
-            getString("_UI_SampledValueControl_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( SampledValueControl ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_SampledValueControl_type" )
+                : getString( "_UI_SampledValueControl_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -269,23 +266,23 @@ public class SampledValueControlItemProvider extends ControlWithIEDNameItemProvi
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(SampledValueControl.class)) {
-            case SclPackage.SAMPLED_VALUE_CONTROL__MULTICAST:
-            case SclPackage.SAMPLED_VALUE_CONTROL__NOF_ASDU:
-            case SclPackage.SAMPLED_VALUE_CONTROL__SECURITY_ENABLE:
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMP_MOD:
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMP_RATE:
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMV_ID:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        switch( notification.getFeatureID( SampledValueControl.class ) ) {
+        case SclPackage.SAMPLED_VALUE_CONTROL__MULTICAST:
+        case SclPackage.SAMPLED_VALUE_CONTROL__NOF_ASDU:
+        case SclPackage.SAMPLED_VALUE_CONTROL__SECURITY_ENABLE:
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMP_MOD:
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMP_RATE:
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMV_ID:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -296,13 +293,11 @@ public class SampledValueControlItemProvider extends ControlWithIEDNameItemProvi
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSampledValueControl_SmvOpts(),
-                 SclFactory.eINSTANCE.createSmvOpts()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSampledValueControl_SmvOpts(),
+                SclFactory.eINSTANCE.createSmvOpts() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SamplesPerSecItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SamplesPerSecItemProvider.java
index ea1e0e7..39daf01 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SamplesPerSecItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SamplesPerSecItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -48,8 +47,8 @@ public class SamplesPerSecItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SamplesPerSecItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SamplesPerSecItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class SamplesPerSecItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addValuePropertyDescriptor(object);
+            addValuePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class SamplesPerSecItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addValuePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SamplesPerSec_value_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SamplesPerSec_value_feature", "_UI_SamplesPerSec_type"),
-                 SclPackage.eINSTANCE.getSamplesPerSec_Value(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValuePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SamplesPerSec_value_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SamplesPerSec_value_feature",
+                                "_UI_SamplesPerSec_type" ),
+                        SclPackage.eINSTANCE.getSamplesPerSec_Value(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,8 +96,8 @@ public class SamplesPerSecItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SamplesPerSec"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SamplesPerSec" ) );
     }
 
     /**
@@ -108,11 +107,10 @@ public class SamplesPerSecItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        SamplesPerSec samplesPerSec = (SamplesPerSec)object;
-        return getString("_UI_SamplesPerSec_type") + " " + samplesPerSec.getLineNumber();
+    public String getText( Object object ) {
+        SamplesPerSec samplesPerSec = ( SamplesPerSec ) object;
+        return getString( "_UI_SamplesPerSec_type" ) + " " + samplesPerSec.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -122,15 +120,15 @@ public class SamplesPerSecItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(SamplesPerSec.class)) {
-            case SclPackage.SAMPLES_PER_SEC__VALUE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( SamplesPerSec.class ) ) {
+        case SclPackage.SAMPLES_PER_SEC__VALUE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -141,8 +139,8 @@ public class SamplesPerSecItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SclItemProviderAdapterFactory.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SclItemProviderAdapterFactory.java
index 844191b..7fc1e77 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SclItemProviderAdapterFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SclItemProviderAdapterFactory.java
@@ -50,7 +50,8 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclAdapterFactory;
  * <!-- end-user-doc -->
  * @generated
  */
-public class SclItemProviderAdapterFactory extends SclAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class SclItemProviderAdapterFactory extends SclAdapterFactory
+        implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
     /**
      * This keeps track of the root adapter factory that delegates to this adapter factory.
      * <!-- begin-user-doc -->
@@ -73,7 +74,7 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      * <!-- end-user-doc -->
      * @generated
      */
-    protected Collection<Object> supportedTypes = new ArrayList<Object>();
+    protected Collection< Object > supportedTypes = new ArrayList< Object >();
 
     /**
      * This constructs an instance.
@@ -82,11 +83,11 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      * @generated
      */
     public SclItemProviderAdapterFactory() {
-        supportedTypes.add(IEditingDomainItemProvider.class);
-        supportedTypes.add(IStructuredItemContentProvider.class);
-        supportedTypes.add(ITreeItemContentProvider.class);
-        supportedTypes.add(IItemLabelProvider.class);
-        supportedTypes.add(IItemPropertySource.class);
+        supportedTypes.add( IEditingDomainItemProvider.class );
+        supportedTypes.add( IStructuredItemContentProvider.class );
+        supportedTypes.add( ITreeItemContentProvider.class );
+        supportedTypes.add( IItemLabelProvider.class );
+        supportedTypes.add( IItemPropertySource.class );
     }
 
     /**
@@ -105,8 +106,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createHeaderAdapter() {
-        if (headerItemProvider == null) {
-            headerItemProvider = new HeaderItemProvider(this);
+        if( headerItemProvider == null ) {
+            headerItemProvider = new HeaderItemProvider( this );
         }
 
         return headerItemProvider;
@@ -128,8 +129,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createHistoryAdapter() {
-        if (historyItemProvider == null) {
-            historyItemProvider = new HistoryItemProvider(this);
+        if( historyItemProvider == null ) {
+            historyItemProvider = new HistoryItemProvider( this );
         }
 
         return historyItemProvider;
@@ -151,8 +152,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createHitemAdapter() {
-        if (hitemItemProvider == null) {
-            hitemItemProvider = new HitemItemProvider(this);
+        if( hitemItemProvider == null ) {
+            hitemItemProvider = new HitemItemProvider( this );
         }
 
         return hitemItemProvider;
@@ -174,8 +175,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createIDNamingAdapter() {
-        if (idNamingItemProvider == null) {
-            idNamingItemProvider = new IDNamingItemProvider(this);
+        if( idNamingItemProvider == null ) {
+            idNamingItemProvider = new IDNamingItemProvider( this );
         }
 
         return idNamingItemProvider;
@@ -197,8 +198,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createLineAdapter() {
-        if (lineItemProvider == null) {
-            lineItemProvider = new LineItemProvider(this);
+        if( lineItemProvider == null ) {
+            lineItemProvider = new LineItemProvider( this );
         }
 
         return lineItemProvider;
@@ -220,8 +221,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createPrivateAdapter() {
-        if (privateItemProvider == null) {
-            privateItemProvider = new PrivateItemProvider(this);
+        if( privateItemProvider == null ) {
+            privateItemProvider = new PrivateItemProvider( this );
         }
 
         return privateItemProvider;
@@ -243,8 +244,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createProcessAdapter() {
-        if (processItemProvider == null) {
-            processItemProvider = new ProcessItemProvider(this);
+        if( processItemProvider == null ) {
+            processItemProvider = new ProcessItemProvider( this );
         }
 
         return processItemProvider;
@@ -266,8 +267,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSCLAdapter() {
-        if (sclItemProvider == null) {
-            sclItemProvider = new SCLItemProvider(this);
+        if( sclItemProvider == null ) {
+            sclItemProvider = new SCLItemProvider( this );
         }
 
         return sclItemProvider;
@@ -289,8 +290,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createTextAdapter() {
-        if (textItemProvider == null) {
-            textItemProvider = new TextItemProvider(this);
+        if( textItemProvider == null ) {
+            textItemProvider = new TextItemProvider( this );
         }
 
         return textItemProvider;
@@ -312,8 +313,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createAddressAdapter() {
-        if (addressItemProvider == null) {
-            addressItemProvider = new AddressItemProvider(this);
+        if( addressItemProvider == null ) {
+            addressItemProvider = new AddressItemProvider( this );
         }
 
         return addressItemProvider;
@@ -335,8 +336,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createCommunicationAdapter() {
-        if (communicationItemProvider == null) {
-            communicationItemProvider = new CommunicationItemProvider(this);
+        if( communicationItemProvider == null ) {
+            communicationItemProvider = new CommunicationItemProvider( this );
         }
 
         return communicationItemProvider;
@@ -358,8 +359,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createConnectedAPAdapter() {
-        if (connectedAPItemProvider == null) {
-            connectedAPItemProvider = new ConnectedAPItemProvider(this);
+        if( connectedAPItemProvider == null ) {
+            connectedAPItemProvider = new ConnectedAPItemProvider( this );
         }
 
         return connectedAPItemProvider;
@@ -381,8 +382,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createGSEAdapter() {
-        if (gseItemProvider == null) {
-            gseItemProvider = new GSEItemProvider(this);
+        if( gseItemProvider == null ) {
+            gseItemProvider = new GSEItemProvider( this );
         }
 
         return gseItemProvider;
@@ -404,8 +405,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createPAdapter() {
-        if (pItemProvider == null) {
-            pItemProvider = new PItemProvider(this);
+        if( pItemProvider == null ) {
+            pItemProvider = new PItemProvider( this );
         }
 
         return pItemProvider;
@@ -427,8 +428,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createPAddrAdapter() {
-        if (pAddrItemProvider == null) {
-            pAddrItemProvider = new PAddrItemProvider(this);
+        if( pAddrItemProvider == null ) {
+            pAddrItemProvider = new PAddrItemProvider( this );
         }
 
         return pAddrItemProvider;
@@ -450,8 +451,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createP_PhysConnAdapter() {
-        if (p_PhysConnItemProvider == null) {
-            p_PhysConnItemProvider = new P_PhysConnItemProvider(this);
+        if( p_PhysConnItemProvider == null ) {
+            p_PhysConnItemProvider = new P_PhysConnItemProvider( this );
         }
 
         return p_PhysConnItemProvider;
@@ -473,8 +474,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createPhysConnAdapter() {
-        if (physConnItemProvider == null) {
-            physConnItemProvider = new PhysConnItemProvider(this);
+        if( physConnItemProvider == null ) {
+            physConnItemProvider = new PhysConnItemProvider( this );
         }
 
         return physConnItemProvider;
@@ -496,8 +497,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSMVAdapter() {
-        if (smvItemProvider == null) {
-            smvItemProvider = new SMVItemProvider(this);
+        if( smvItemProvider == null ) {
+            smvItemProvider = new SMVItemProvider( this );
         }
 
         return smvItemProvider;
@@ -519,8 +520,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSubNetworkAdapter() {
-        if (subNetworkItemProvider == null) {
-            subNetworkItemProvider = new SubNetworkItemProvider(this);
+        if( subNetworkItemProvider == null ) {
+            subNetworkItemProvider = new SubNetworkItemProvider( this );
         }
 
         return subNetworkItemProvider;
@@ -542,8 +543,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createBDAAdapter() {
-        if (bdaItemProvider == null) {
-            bdaItemProvider = new BDAItemProvider(this);
+        if( bdaItemProvider == null ) {
+            bdaItemProvider = new BDAItemProvider( this );
         }
 
         return bdaItemProvider;
@@ -565,8 +566,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createDAAdapter() {
-        if (daItemProvider == null) {
-            daItemProvider = new DAItemProvider(this);
+        if( daItemProvider == null ) {
+            daItemProvider = new DAItemProvider( this );
         }
 
         return daItemProvider;
@@ -588,8 +589,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createDATypeAdapter() {
-        if (daTypeItemProvider == null) {
-            daTypeItemProvider = new DATypeItemProvider(this);
+        if( daTypeItemProvider == null ) {
+            daTypeItemProvider = new DATypeItemProvider( this );
         }
 
         return daTypeItemProvider;
@@ -611,8 +612,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createDOAdapter() {
-        if (doItemProvider == null) {
-            doItemProvider = new DOItemProvider(this);
+        if( doItemProvider == null ) {
+            doItemProvider = new DOItemProvider( this );
         }
 
         return doItemProvider;
@@ -634,8 +635,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createDOTypeAdapter() {
-        if (doTypeItemProvider == null) {
-            doTypeItemProvider = new DOTypeItemProvider(this);
+        if( doTypeItemProvider == null ) {
+            doTypeItemProvider = new DOTypeItemProvider( this );
         }
 
         return doTypeItemProvider;
@@ -657,8 +658,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createDataTypeTemplatesAdapter() {
-        if (dataTypeTemplatesItemProvider == null) {
-            dataTypeTemplatesItemProvider = new DataTypeTemplatesItemProvider(this);
+        if( dataTypeTemplatesItemProvider == null ) {
+            dataTypeTemplatesItemProvider = new DataTypeTemplatesItemProvider( this );
         }
 
         return dataTypeTemplatesItemProvider;
@@ -680,8 +681,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createEnumTypeAdapter() {
-        if (enumTypeItemProvider == null) {
-            enumTypeItemProvider = new EnumTypeItemProvider(this);
+        if( enumTypeItemProvider == null ) {
+            enumTypeItemProvider = new EnumTypeItemProvider( this );
         }
 
         return enumTypeItemProvider;
@@ -703,8 +704,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createEnumValAdapter() {
-        if (enumValItemProvider == null) {
-            enumValItemProvider = new EnumValItemProvider(this);
+        if( enumValItemProvider == null ) {
+            enumValItemProvider = new EnumValItemProvider( this );
         }
 
         return enumValItemProvider;
@@ -726,8 +727,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createLNodeTypeAdapter() {
-        if (lNodeTypeItemProvider == null) {
-            lNodeTypeItemProvider = new LNodeTypeItemProvider(this);
+        if( lNodeTypeItemProvider == null ) {
+            lNodeTypeItemProvider = new LNodeTypeItemProvider( this );
         }
 
         return lNodeTypeItemProvider;
@@ -749,8 +750,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createProtNsAdapter() {
-        if (protNsItemProvider == null) {
-            protNsItemProvider = new ProtNsItemProvider(this);
+        if( protNsItemProvider == null ) {
+            protNsItemProvider = new ProtNsItemProvider( this );
         }
 
         return protNsItemProvider;
@@ -772,8 +773,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSDOAdapter() {
-        if (sdoItemProvider == null) {
-            sdoItemProvider = new SDOItemProvider(this);
+        if( sdoItemProvider == null ) {
+            sdoItemProvider = new SDOItemProvider( this );
         }
 
         return sdoItemProvider;
@@ -795,8 +796,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createValAdapter() {
-        if (valItemProvider == null) {
-            valItemProvider = new ValItemProvider(this);
+        if( valItemProvider == null ) {
+            valItemProvider = new ValItemProvider( this );
         }
 
         return valItemProvider;
@@ -818,8 +819,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createBitRateInMbPerSecAdapter() {
-        if (bitRateInMbPerSecItemProvider == null) {
-            bitRateInMbPerSecItemProvider = new BitRateInMbPerSecItemProvider(this);
+        if( bitRateInMbPerSecItemProvider == null ) {
+            bitRateInMbPerSecItemProvider = new BitRateInMbPerSecItemProvider( this );
         }
 
         return bitRateInMbPerSecItemProvider;
@@ -841,8 +842,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createMinTimeAdapter() {
-        if (minTimeItemProvider == null) {
-            minTimeItemProvider = new MinTimeItemProvider(this);
+        if( minTimeItemProvider == null ) {
+            minTimeItemProvider = new MinTimeItemProvider( this );
         }
 
         return minTimeItemProvider;
@@ -864,8 +865,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createMaxTimeAdapter() {
-        if (maxTimeItemProvider == null) {
-            maxTimeItemProvider = new MaxTimeItemProvider(this);
+        if( maxTimeItemProvider == null ) {
+            maxTimeItemProvider = new MaxTimeItemProvider( this );
         }
 
         return maxTimeItemProvider;
@@ -887,8 +888,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createBitRateAdapter() {
-        if (bitRateItemProvider == null) {
-            bitRateItemProvider = new BitRateItemProvider(this);
+        if( bitRateItemProvider == null ) {
+            bitRateItemProvider = new BitRateItemProvider( this );
         }
 
         return bitRateItemProvider;
@@ -910,8 +911,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSmpRateAdapter() {
-        if (smpRateItemProvider == null) {
-            smpRateItemProvider = new SmpRateItemProvider(this);
+        if( smpRateItemProvider == null ) {
+            smpRateItemProvider = new SmpRateItemProvider( this );
         }
 
         return smpRateItemProvider;
@@ -933,8 +934,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSamplesPerSecAdapter() {
-        if (samplesPerSecItemProvider == null) {
-            samplesPerSecItemProvider = new SamplesPerSecItemProvider(this);
+        if( samplesPerSecItemProvider == null ) {
+            samplesPerSecItemProvider = new SamplesPerSecItemProvider( this );
         }
 
         return samplesPerSecItemProvider;
@@ -956,8 +957,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSecPerSamplesAdapter() {
-        if (secPerSamplesItemProvider == null) {
-            secPerSamplesItemProvider = new SecPerSamplesItemProvider(this);
+        if( secPerSamplesItemProvider == null ) {
+            secPerSamplesItemProvider = new SecPerSamplesItemProvider( this );
         }
 
         return secPerSamplesItemProvider;
@@ -979,8 +980,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createMcSecurityAdapter() {
-        if (mcSecurityItemProvider == null) {
-            mcSecurityItemProvider = new McSecurityItemProvider(this);
+        if( mcSecurityItemProvider == null ) {
+            mcSecurityItemProvider = new McSecurityItemProvider( this );
         }
 
         return mcSecurityItemProvider;
@@ -1002,8 +1003,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createAgAuthenticationAdapter() {
-        if (agAuthenticationItemProvider == null) {
-            agAuthenticationItemProvider = new AgAuthenticationItemProvider(this);
+        if( agAuthenticationItemProvider == null ) {
+            agAuthenticationItemProvider = new AgAuthenticationItemProvider( this );
         }
 
         return agAuthenticationItemProvider;
@@ -1025,8 +1026,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createAgLNRefAdapter() {
-        if (agLNRefItemProvider == null) {
-            agLNRefItemProvider = new AgLNRefItemProvider(this);
+        if( agLNRefItemProvider == null ) {
+            agLNRefItemProvider = new AgLNRefItemProvider( this );
         }
 
         return agLNRefItemProvider;
@@ -1048,8 +1049,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createDurationInMilliSecAdapter() {
-        if (durationInMilliSecItemProvider == null) {
-            durationInMilliSecItemProvider = new DurationInMilliSecItemProvider(this);
+        if( durationInMilliSecItemProvider == null ) {
+            durationInMilliSecItemProvider = new DurationInMilliSecItemProvider( this );
         }
 
         return durationInMilliSecItemProvider;
@@ -1071,8 +1072,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createAccessControlAdapter() {
-        if (accessControlItemProvider == null) {
-            accessControlItemProvider = new AccessControlItemProvider(this);
+        if( accessControlItemProvider == null ) {
+            accessControlItemProvider = new AccessControlItemProvider( this );
         }
 
         return accessControlItemProvider;
@@ -1094,8 +1095,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createAccessPointAdapter() {
-        if (accessPointItemProvider == null) {
-            accessPointItemProvider = new AccessPointItemProvider(this);
+        if( accessPointItemProvider == null ) {
+            accessPointItemProvider = new AccessPointItemProvider( this );
         }
 
         return accessPointItemProvider;
@@ -1117,8 +1118,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createAssociationAdapter() {
-        if (associationItemProvider == null) {
-            associationItemProvider = new AssociationItemProvider(this);
+        if( associationItemProvider == null ) {
+            associationItemProvider = new AssociationItemProvider( this );
         }
 
         return associationItemProvider;
@@ -1140,8 +1141,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createAuthenticationAdapter() {
-        if (authenticationItemProvider == null) {
-            authenticationItemProvider = new AuthenticationItemProvider(this);
+        if( authenticationItemProvider == null ) {
+            authenticationItemProvider = new AuthenticationItemProvider( this );
         }
 
         return authenticationItemProvider;
@@ -1163,8 +1164,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createCertificateAdapter() {
-        if (certificateItemProvider == null) {
-            certificateItemProvider = new CertificateItemProvider(this);
+        if( certificateItemProvider == null ) {
+            certificateItemProvider = new CertificateItemProvider( this );
         }
 
         return certificateItemProvider;
@@ -1186,8 +1187,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createClientLNAdapter() {
-        if (clientLNItemProvider == null) {
-            clientLNItemProvider = new ClientLNItemProvider(this);
+        if( clientLNItemProvider == null ) {
+            clientLNItemProvider = new ClientLNItemProvider( this );
         }
 
         return clientLNItemProvider;
@@ -1209,8 +1210,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createClientServicesAdapter() {
-        if (clientServicesItemProvider == null) {
-            clientServicesItemProvider = new ClientServicesItemProvider(this);
+        if( clientServicesItemProvider == null ) {
+            clientServicesItemProvider = new ClientServicesItemProvider( this );
         }
 
         return clientServicesItemProvider;
@@ -1232,8 +1233,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createCommProtAdapter() {
-        if (commProtItemProvider == null) {
-            commProtItemProvider = new CommProtItemProvider(this);
+        if( commProtItemProvider == null ) {
+            commProtItemProvider = new CommProtItemProvider( this );
         }
 
         return commProtItemProvider;
@@ -1255,8 +1256,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createConfDataSetAdapter() {
-        if (confDataSetItemProvider == null) {
-            confDataSetItemProvider = new ConfDataSetItemProvider(this);
+        if( confDataSetItemProvider == null ) {
+            confDataSetItemProvider = new ConfDataSetItemProvider( this );
         }
 
         return confDataSetItemProvider;
@@ -1278,8 +1279,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createConfLNsAdapter() {
-        if (confLNsItemProvider == null) {
-            confLNsItemProvider = new ConfLNsItemProvider(this);
+        if( confLNsItemProvider == null ) {
+            confLNsItemProvider = new ConfLNsItemProvider( this );
         }
 
         return confLNsItemProvider;
@@ -1301,8 +1302,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createConfLdNameAdapter() {
-        if (confLdNameItemProvider == null) {
-            confLdNameItemProvider = new ConfLdNameItemProvider(this);
+        if( confLdNameItemProvider == null ) {
+            confLdNameItemProvider = new ConfLdNameItemProvider( this );
         }
 
         return confLdNameItemProvider;
@@ -1324,8 +1325,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createConfLogControlAdapter() {
-        if (confLogControlItemProvider == null) {
-            confLogControlItemProvider = new ConfLogControlItemProvider(this);
+        if( confLogControlItemProvider == null ) {
+            confLogControlItemProvider = new ConfLogControlItemProvider( this );
         }
 
         return confLogControlItemProvider;
@@ -1347,8 +1348,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createConfReportControlAdapter() {
-        if (confReportControlItemProvider == null) {
-            confReportControlItemProvider = new ConfReportControlItemProvider(this);
+        if( confReportControlItemProvider == null ) {
+            confReportControlItemProvider = new ConfReportControlItemProvider( this );
         }
 
         return confReportControlItemProvider;
@@ -1370,8 +1371,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createConfSGAdapter() {
-        if (confSGItemProvider == null) {
-            confSGItemProvider = new ConfSGItemProvider(this);
+        if( confSGItemProvider == null ) {
+            confSGItemProvider = new ConfSGItemProvider( this );
         }
 
         return confSGItemProvider;
@@ -1393,8 +1394,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createConfSigRefAdapter() {
-        if (confSigRefItemProvider == null) {
-            confSigRefItemProvider = new ConfSigRefItemProvider(this);
+        if( confSigRefItemProvider == null ) {
+            confSigRefItemProvider = new ConfSigRefItemProvider( this );
         }
 
         return confSigRefItemProvider;
@@ -1416,8 +1417,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createControlWithIEDNameAdapter() {
-        if (controlWithIEDNameItemProvider == null) {
-            controlWithIEDNameItemProvider = new ControlWithIEDNameItemProvider(this);
+        if( controlWithIEDNameItemProvider == null ) {
+            controlWithIEDNameItemProvider = new ControlWithIEDNameItemProvider( this );
         }
 
         return controlWithIEDNameItemProvider;
@@ -1439,8 +1440,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createDAIAdapter() {
-        if (daiItemProvider == null) {
-            daiItemProvider = new DAIItemProvider(this);
+        if( daiItemProvider == null ) {
+            daiItemProvider = new DAIItemProvider( this );
         }
 
         return daiItemProvider;
@@ -1462,8 +1463,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createDOIAdapter() {
-        if (doiItemProvider == null) {
-            doiItemProvider = new DOIItemProvider(this);
+        if( doiItemProvider == null ) {
+            doiItemProvider = new DOIItemProvider( this );
         }
 
         return doiItemProvider;
@@ -1485,8 +1486,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createDataObjectDirectoryAdapter() {
-        if (dataObjectDirectoryItemProvider == null) {
-            dataObjectDirectoryItemProvider = new DataObjectDirectoryItemProvider(this);
+        if( dataObjectDirectoryItemProvider == null ) {
+            dataObjectDirectoryItemProvider = new DataObjectDirectoryItemProvider( this );
         }
 
         return dataObjectDirectoryItemProvider;
@@ -1508,8 +1509,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createDataSetAdapter() {
-        if (dataSetItemProvider == null) {
-            dataSetItemProvider = new DataSetItemProvider(this);
+        if( dataSetItemProvider == null ) {
+            dataSetItemProvider = new DataSetItemProvider( this );
         }
 
         return dataSetItemProvider;
@@ -1531,8 +1532,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createDataSetDirectoryAdapter() {
-        if (dataSetDirectoryItemProvider == null) {
-            dataSetDirectoryItemProvider = new DataSetDirectoryItemProvider(this);
+        if( dataSetDirectoryItemProvider == null ) {
+            dataSetDirectoryItemProvider = new DataSetDirectoryItemProvider( this );
         }
 
         return dataSetDirectoryItemProvider;
@@ -1554,8 +1555,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createDynAssociationAdapter() {
-        if (dynAssociationItemProvider == null) {
-            dynAssociationItemProvider = new DynAssociationItemProvider(this);
+        if( dynAssociationItemProvider == null ) {
+            dynAssociationItemProvider = new DynAssociationItemProvider( this );
         }
 
         return dynAssociationItemProvider;
@@ -1577,8 +1578,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createDynDataSetAdapter() {
-        if (dynDataSetItemProvider == null) {
-            dynDataSetItemProvider = new DynDataSetItemProvider(this);
+        if( dynDataSetItemProvider == null ) {
+            dynDataSetItemProvider = new DynDataSetItemProvider( this );
         }
 
         return dynDataSetItemProvider;
@@ -1600,8 +1601,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createExtRefAdapter() {
-        if (extRefItemProvider == null) {
-            extRefItemProvider = new ExtRefItemProvider(this);
+        if( extRefItemProvider == null ) {
+            extRefItemProvider = new ExtRefItemProvider( this );
         }
 
         return extRefItemProvider;
@@ -1623,8 +1624,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createFCDAAdapter() {
-        if (fcdaItemProvider == null) {
-            fcdaItemProvider = new FCDAItemProvider(this);
+        if( fcdaItemProvider == null ) {
+            fcdaItemProvider = new FCDAItemProvider( this );
         }
 
         return fcdaItemProvider;
@@ -1646,8 +1647,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createFileHandlingAdapter() {
-        if (fileHandlingItemProvider == null) {
-            fileHandlingItemProvider = new FileHandlingItemProvider(this);
+        if( fileHandlingItemProvider == null ) {
+            fileHandlingItemProvider = new FileHandlingItemProvider( this );
         }
 
         return fileHandlingItemProvider;
@@ -1669,8 +1670,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createGOOSEAdapter() {
-        if (gooseItemProvider == null) {
-            gooseItemProvider = new GOOSEItemProvider(this);
+        if( gooseItemProvider == null ) {
+            gooseItemProvider = new GOOSEItemProvider( this );
         }
 
         return gooseItemProvider;
@@ -1692,8 +1693,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createGOOSESecurityAdapter() {
-        if (gooseSecurityItemProvider == null) {
-            gooseSecurityItemProvider = new GOOSESecurityItemProvider(this);
+        if( gooseSecurityItemProvider == null ) {
+            gooseSecurityItemProvider = new GOOSESecurityItemProvider( this );
         }
 
         return gooseSecurityItemProvider;
@@ -1715,8 +1716,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createGSEControlAdapter() {
-        if (gseControlItemProvider == null) {
-            gseControlItemProvider = new GSEControlItemProvider(this);
+        if( gseControlItemProvider == null ) {
+            gseControlItemProvider = new GSEControlItemProvider( this );
         }
 
         return gseControlItemProvider;
@@ -1738,8 +1739,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createGSEDirAdapter() {
-        if (gseDirItemProvider == null) {
-            gseDirItemProvider = new GSEDirItemProvider(this);
+        if( gseDirItemProvider == null ) {
+            gseDirItemProvider = new GSEDirItemProvider( this );
         }
 
         return gseDirItemProvider;
@@ -1761,8 +1762,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createGSESettingsAdapter() {
-        if (gseSettingsItemProvider == null) {
-            gseSettingsItemProvider = new GSESettingsItemProvider(this);
+        if( gseSettingsItemProvider == null ) {
+            gseSettingsItemProvider = new GSESettingsItemProvider( this );
         }
 
         return gseSettingsItemProvider;
@@ -1784,8 +1785,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createGSSEAdapter() {
-        if (gsseItemProvider == null) {
-            gsseItemProvider = new GSSEItemProvider(this);
+        if( gsseItemProvider == null ) {
+            gsseItemProvider = new GSSEItemProvider( this );
         }
 
         return gsseItemProvider;
@@ -1807,8 +1808,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createGetCBValuesAdapter() {
-        if (getCBValuesItemProvider == null) {
-            getCBValuesItemProvider = new GetCBValuesItemProvider(this);
+        if( getCBValuesItemProvider == null ) {
+            getCBValuesItemProvider = new GetCBValuesItemProvider( this );
         }
 
         return getCBValuesItemProvider;
@@ -1830,8 +1831,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createGetDataObjectDefinitionAdapter() {
-        if (getDataObjectDefinitionItemProvider == null) {
-            getDataObjectDefinitionItemProvider = new GetDataObjectDefinitionItemProvider(this);
+        if( getDataObjectDefinitionItemProvider == null ) {
+            getDataObjectDefinitionItemProvider = new GetDataObjectDefinitionItemProvider( this );
         }
 
         return getDataObjectDefinitionItemProvider;
@@ -1853,8 +1854,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createGetDataSetValueAdapter() {
-        if (getDataSetValueItemProvider == null) {
-            getDataSetValueItemProvider = new GetDataSetValueItemProvider(this);
+        if( getDataSetValueItemProvider == null ) {
+            getDataSetValueItemProvider = new GetDataSetValueItemProvider( this );
         }
 
         return getDataSetValueItemProvider;
@@ -1876,8 +1877,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createGetDirectoryAdapter() {
-        if (getDirectoryItemProvider == null) {
-            getDirectoryItemProvider = new GetDirectoryItemProvider(this);
+        if( getDirectoryItemProvider == null ) {
+            getDirectoryItemProvider = new GetDirectoryItemProvider( this );
         }
 
         return getDirectoryItemProvider;
@@ -1899,8 +1900,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createIEDAdapter() {
-        if (iedItemProvider == null) {
-            iedItemProvider = new IEDItemProvider(this);
+        if( iedItemProvider == null ) {
+            iedItemProvider = new IEDItemProvider( this );
         }
 
         return iedItemProvider;
@@ -1922,8 +1923,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createIEDNameAdapter() {
-        if (iedNameItemProvider == null) {
-            iedNameItemProvider = new IEDNameItemProvider(this);
+        if( iedNameItemProvider == null ) {
+            iedNameItemProvider = new IEDNameItemProvider( this );
         }
 
         return iedNameItemProvider;
@@ -1945,8 +1946,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createInputsAdapter() {
-        if (inputsItemProvider == null) {
-            inputsItemProvider = new InputsItemProvider(this);
+        if( inputsItemProvider == null ) {
+            inputsItemProvider = new InputsItemProvider( this );
         }
 
         return inputsItemProvider;
@@ -1968,8 +1969,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createIssuerNameAdapter() {
-        if (issuerNameItemProvider == null) {
-            issuerNameItemProvider = new IssuerNameItemProvider(this);
+        if( issuerNameItemProvider == null ) {
+            issuerNameItemProvider = new IssuerNameItemProvider( this );
         }
 
         return issuerNameItemProvider;
@@ -1991,8 +1992,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createKDCAdapter() {
-        if (kdcItemProvider == null) {
-            kdcItemProvider = new KDCItemProvider(this);
+        if( kdcItemProvider == null ) {
+            kdcItemProvider = new KDCItemProvider( this );
         }
 
         return kdcItemProvider;
@@ -2014,8 +2015,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createLDeviceAdapter() {
-        if (lDeviceItemProvider == null) {
-            lDeviceItemProvider = new LDeviceItemProvider(this);
+        if( lDeviceItemProvider == null ) {
+            lDeviceItemProvider = new LDeviceItemProvider( this );
         }
 
         return lDeviceItemProvider;
@@ -2037,8 +2038,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createLNAdapter() {
-        if (lnItemProvider == null) {
-            lnItemProvider = new LNItemProvider(this);
+        if( lnItemProvider == null ) {
+            lnItemProvider = new LNItemProvider( this );
         }
 
         return lnItemProvider;
@@ -2060,8 +2061,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createLN0Adapter() {
-        if (ln0ItemProvider == null) {
-            ln0ItemProvider = new LN0ItemProvider(this);
+        if( ln0ItemProvider == null ) {
+            ln0ItemProvider = new LN0ItemProvider( this );
         }
 
         return ln0ItemProvider;
@@ -2083,8 +2084,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createLogAdapter() {
-        if (logItemProvider == null) {
-            logItemProvider = new LogItemProvider(this);
+        if( logItemProvider == null ) {
+            logItemProvider = new LogItemProvider( this );
         }
 
         return logItemProvider;
@@ -2106,8 +2107,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createLogControlAdapter() {
-        if (logControlItemProvider == null) {
-            logControlItemProvider = new LogControlItemProvider(this);
+        if( logControlItemProvider == null ) {
+            logControlItemProvider = new LogControlItemProvider( this );
         }
 
         return logControlItemProvider;
@@ -2129,8 +2130,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createLogSettingsAdapter() {
-        if (logSettingsItemProvider == null) {
-            logSettingsItemProvider = new LogSettingsItemProvider(this);
+        if( logSettingsItemProvider == null ) {
+            logSettingsItemProvider = new LogSettingsItemProvider( this );
         }
 
         return logSettingsItemProvider;
@@ -2152,8 +2153,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createOptFieldsAdapter() {
-        if (optFieldsItemProvider == null) {
-            optFieldsItemProvider = new OptFieldsItemProvider(this);
+        if( optFieldsItemProvider == null ) {
+            optFieldsItemProvider = new OptFieldsItemProvider( this );
         }
 
         return optFieldsItemProvider;
@@ -2175,8 +2176,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createProtocolAdapter() {
-        if (protocolItemProvider == null) {
-            protocolItemProvider = new ProtocolItemProvider(this);
+        if( protocolItemProvider == null ) {
+            protocolItemProvider = new ProtocolItemProvider( this );
         }
 
         return protocolItemProvider;
@@ -2198,8 +2199,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createReadWriteAdapter() {
-        if (readWriteItemProvider == null) {
-            readWriteItemProvider = new ReadWriteItemProvider(this);
+        if( readWriteItemProvider == null ) {
+            readWriteItemProvider = new ReadWriteItemProvider( this );
         }
 
         return readWriteItemProvider;
@@ -2221,8 +2222,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createRedProtAdapter() {
-        if (redProtItemProvider == null) {
-            redProtItemProvider = new RedProtItemProvider(this);
+        if( redProtItemProvider == null ) {
+            redProtItemProvider = new RedProtItemProvider( this );
         }
 
         return redProtItemProvider;
@@ -2244,8 +2245,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createReportControlAdapter() {
-        if (reportControlItemProvider == null) {
-            reportControlItemProvider = new ReportControlItemProvider(this);
+        if( reportControlItemProvider == null ) {
+            reportControlItemProvider = new ReportControlItemProvider( this );
         }
 
         return reportControlItemProvider;
@@ -2267,8 +2268,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createReportSettingsAdapter() {
-        if (reportSettingsItemProvider == null) {
-            reportSettingsItemProvider = new ReportSettingsItemProvider(this);
+        if( reportSettingsItemProvider == null ) {
+            reportSettingsItemProvider = new ReportSettingsItemProvider( this );
         }
 
         return reportSettingsItemProvider;
@@ -2290,8 +2291,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createRptEnabledAdapter() {
-        if (rptEnabledItemProvider == null) {
-            rptEnabledItemProvider = new RptEnabledItemProvider(this);
+        if( rptEnabledItemProvider == null ) {
+            rptEnabledItemProvider = new RptEnabledItemProvider( this );
         }
 
         return rptEnabledItemProvider;
@@ -2313,8 +2314,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSDIAdapter() {
-        if (sdiItemProvider == null) {
-            sdiItemProvider = new SDIItemProvider(this);
+        if( sdiItemProvider == null ) {
+            sdiItemProvider = new SDIItemProvider( this );
         }
 
         return sdiItemProvider;
@@ -2336,8 +2337,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSGEditAdapter() {
-        if (sgEditItemProvider == null) {
-            sgEditItemProvider = new SGEditItemProvider(this);
+        if( sgEditItemProvider == null ) {
+            sgEditItemProvider = new SGEditItemProvider( this );
         }
 
         return sgEditItemProvider;
@@ -2359,8 +2360,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSMVSecurityAdapter() {
-        if (smvSecurityItemProvider == null) {
-            smvSecurityItemProvider = new SMVSecurityItemProvider(this);
+        if( smvSecurityItemProvider == null ) {
+            smvSecurityItemProvider = new SMVSecurityItemProvider( this );
         }
 
         return smvSecurityItemProvider;
@@ -2382,8 +2383,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSMVSettingsAdapter() {
-        if (smvSettingsItemProvider == null) {
-            smvSettingsItemProvider = new SMVSettingsItemProvider(this);
+        if( smvSettingsItemProvider == null ) {
+            smvSettingsItemProvider = new SMVSettingsItemProvider( this );
         }
 
         return smvSettingsItemProvider;
@@ -2405,8 +2406,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSMVscAdapter() {
-        if (smVscItemProvider == null) {
-            smVscItemProvider = new SMVscItemProvider(this);
+        if( smVscItemProvider == null ) {
+            smVscItemProvider = new SMVscItemProvider( this );
         }
 
         return smVscItemProvider;
@@ -2428,8 +2429,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSampledValueControlAdapter() {
-        if (sampledValueControlItemProvider == null) {
-            sampledValueControlItemProvider = new SampledValueControlItemProvider(this);
+        if( sampledValueControlItemProvider == null ) {
+            sampledValueControlItemProvider = new SampledValueControlItemProvider( this );
         }
 
         return sampledValueControlItemProvider;
@@ -2451,8 +2452,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createServerAdapter() {
-        if (serverItemProvider == null) {
-            serverItemProvider = new ServerItemProvider(this);
+        if( serverItemProvider == null ) {
+            serverItemProvider = new ServerItemProvider( this );
         }
 
         return serverItemProvider;
@@ -2474,8 +2475,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createServerAtAdapter() {
-        if (serverAtItemProvider == null) {
-            serverAtItemProvider = new ServerAtItemProvider(this);
+        if( serverAtItemProvider == null ) {
+            serverAtItemProvider = new ServerAtItemProvider( this );
         }
 
         return serverAtItemProvider;
@@ -2497,8 +2498,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createServiceSettingsAdapter() {
-        if (serviceSettingsItemProvider == null) {
-            serviceSettingsItemProvider = new ServiceSettingsItemProvider(this);
+        if( serviceSettingsItemProvider == null ) {
+            serviceSettingsItemProvider = new ServiceSettingsItemProvider( this );
         }
 
         return serviceSettingsItemProvider;
@@ -2520,8 +2521,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createServiceWithMaxAdapter() {
-        if (serviceWithMaxItemProvider == null) {
-            serviceWithMaxItemProvider = new ServiceWithMaxItemProvider(this);
+        if( serviceWithMaxItemProvider == null ) {
+            serviceWithMaxItemProvider = new ServiceWithMaxItemProvider( this );
         }
 
         return serviceWithMaxItemProvider;
@@ -2543,8 +2544,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createServicesAdapter() {
-        if (servicesItemProvider == null) {
-            servicesItemProvider = new ServicesItemProvider(this);
+        if( servicesItemProvider == null ) {
+            servicesItemProvider = new ServicesItemProvider( this );
         }
 
         return servicesItemProvider;
@@ -2566,8 +2567,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSetDataSetValueAdapter() {
-        if (setDataSetValueItemProvider == null) {
-            setDataSetValueItemProvider = new SetDataSetValueItemProvider(this);
+        if( setDataSetValueItemProvider == null ) {
+            setDataSetValueItemProvider = new SetDataSetValueItemProvider( this );
         }
 
         return setDataSetValueItemProvider;
@@ -2589,8 +2590,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSettingControlAdapter() {
-        if (settingControlItemProvider == null) {
-            settingControlItemProvider = new SettingControlItemProvider(this);
+        if( settingControlItemProvider == null ) {
+            settingControlItemProvider = new SettingControlItemProvider( this );
         }
 
         return settingControlItemProvider;
@@ -2612,8 +2613,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSettingGroupsAdapter() {
-        if (settingGroupsItemProvider == null) {
-            settingGroupsItemProvider = new SettingGroupsItemProvider(this);
+        if( settingGroupsItemProvider == null ) {
+            settingGroupsItemProvider = new SettingGroupsItemProvider( this );
         }
 
         return settingGroupsItemProvider;
@@ -2635,8 +2636,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSmvOptsAdapter() {
-        if (smvOptsItemProvider == null) {
-            smvOptsItemProvider = new SmvOptsItemProvider(this);
+        if( smvOptsItemProvider == null ) {
+            smvOptsItemProvider = new SmvOptsItemProvider( this );
         }
 
         return smvOptsItemProvider;
@@ -2658,8 +2659,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSubjectAdapter() {
-        if (subjectItemProvider == null) {
-            subjectItemProvider = new SubjectItemProvider(this);
+        if( subjectItemProvider == null ) {
+            subjectItemProvider = new SubjectItemProvider( this );
         }
 
         return subjectItemProvider;
@@ -2681,8 +2682,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSupSubscriptionAdapter() {
-        if (supSubscriptionItemProvider == null) {
-            supSubscriptionItemProvider = new SupSubscriptionItemProvider(this);
+        if( supSubscriptionItemProvider == null ) {
+            supSubscriptionItemProvider = new SupSubscriptionItemProvider( this );
         }
 
         return supSubscriptionItemProvider;
@@ -2704,8 +2705,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createTimeSyncProtAdapter() {
-        if (timeSyncProtItemProvider == null) {
-            timeSyncProtItemProvider = new TimeSyncProtItemProvider(this);
+        if( timeSyncProtItemProvider == null ) {
+            timeSyncProtItemProvider = new TimeSyncProtItemProvider( this );
         }
 
         return timeSyncProtItemProvider;
@@ -2727,8 +2728,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createTimerActivatedControlAdapter() {
-        if (timerActivatedControlItemProvider == null) {
-            timerActivatedControlItemProvider = new TimerActivatedControlItemProvider(this);
+        if( timerActivatedControlItemProvider == null ) {
+            timerActivatedControlItemProvider = new TimerActivatedControlItemProvider( this );
         }
 
         return timerActivatedControlItemProvider;
@@ -2750,8 +2751,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createTrgOpsAdapter() {
-        if (trgOpsItemProvider == null) {
-            trgOpsItemProvider = new TrgOpsItemProvider(this);
+        if( trgOpsItemProvider == null ) {
+            trgOpsItemProvider = new TrgOpsItemProvider( this );
         }
 
         return trgOpsItemProvider;
@@ -2773,8 +2774,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createValueHandlingAdapter() {
-        if (valueHandlingItemProvider == null) {
-            valueHandlingItemProvider = new ValueHandlingItemProvider(this);
+        if( valueHandlingItemProvider == null ) {
+            valueHandlingItemProvider = new ValueHandlingItemProvider( this );
         }
 
         return valueHandlingItemProvider;
@@ -2796,8 +2797,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createAbstractConductingEquipmentAdapter() {
-        if (abstractConductingEquipmentItemProvider == null) {
-            abstractConductingEquipmentItemProvider = new AbstractConductingEquipmentItemProvider(this);
+        if( abstractConductingEquipmentItemProvider == null ) {
+            abstractConductingEquipmentItemProvider = new AbstractConductingEquipmentItemProvider( this );
         }
 
         return abstractConductingEquipmentItemProvider;
@@ -2819,8 +2820,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createAbstractEqFuncSubFuncAdapter() {
-        if (abstractEqFuncSubFuncItemProvider == null) {
-            abstractEqFuncSubFuncItemProvider = new AbstractEqFuncSubFuncItemProvider(this);
+        if( abstractEqFuncSubFuncItemProvider == null ) {
+            abstractEqFuncSubFuncItemProvider = new AbstractEqFuncSubFuncItemProvider( this );
         }
 
         return abstractEqFuncSubFuncItemProvider;
@@ -2842,8 +2843,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createBayAdapter() {
-        if (bayItemProvider == null) {
-            bayItemProvider = new BayItemProvider(this);
+        if( bayItemProvider == null ) {
+            bayItemProvider = new BayItemProvider( this );
         }
 
         return bayItemProvider;
@@ -2865,8 +2866,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createConductingEquipmentAdapter() {
-        if (conductingEquipmentItemProvider == null) {
-            conductingEquipmentItemProvider = new ConductingEquipmentItemProvider(this);
+        if( conductingEquipmentItemProvider == null ) {
+            conductingEquipmentItemProvider = new ConductingEquipmentItemProvider( this );
         }
 
         return conductingEquipmentItemProvider;
@@ -2888,8 +2889,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createConnectivityNodeAdapter() {
-        if (connectivityNodeItemProvider == null) {
-            connectivityNodeItemProvider = new ConnectivityNodeItemProvider(this);
+        if( connectivityNodeItemProvider == null ) {
+            connectivityNodeItemProvider = new ConnectivityNodeItemProvider( this );
         }
 
         return connectivityNodeItemProvider;
@@ -2911,8 +2912,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createEqFunctionAdapter() {
-        if (eqFunctionItemProvider == null) {
-            eqFunctionItemProvider = new EqFunctionItemProvider(this);
+        if( eqFunctionItemProvider == null ) {
+            eqFunctionItemProvider = new EqFunctionItemProvider( this );
         }
 
         return eqFunctionItemProvider;
@@ -2934,8 +2935,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createEqSubFunctionAdapter() {
-        if (eqSubFunctionItemProvider == null) {
-            eqSubFunctionItemProvider = new EqSubFunctionItemProvider(this);
+        if( eqSubFunctionItemProvider == null ) {
+            eqSubFunctionItemProvider = new EqSubFunctionItemProvider( this );
         }
 
         return eqSubFunctionItemProvider;
@@ -2957,8 +2958,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createEquipmentAdapter() {
-        if (equipmentItemProvider == null) {
-            equipmentItemProvider = new EquipmentItemProvider(this);
+        if( equipmentItemProvider == null ) {
+            equipmentItemProvider = new EquipmentItemProvider( this );
         }
 
         return equipmentItemProvider;
@@ -2980,8 +2981,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createEquipmentContainerAdapter() {
-        if (equipmentContainerItemProvider == null) {
-            equipmentContainerItemProvider = new EquipmentContainerItemProvider(this);
+        if( equipmentContainerItemProvider == null ) {
+            equipmentContainerItemProvider = new EquipmentContainerItemProvider( this );
         }
 
         return equipmentContainerItemProvider;
@@ -3003,8 +3004,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createFunctionAdapter() {
-        if (functionItemProvider == null) {
-            functionItemProvider = new FunctionItemProvider(this);
+        if( functionItemProvider == null ) {
+            functionItemProvider = new FunctionItemProvider( this );
         }
 
         return functionItemProvider;
@@ -3026,8 +3027,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createGeneralEquipmentAdapter() {
-        if (generalEquipmentItemProvider == null) {
-            generalEquipmentItemProvider = new GeneralEquipmentItemProvider(this);
+        if( generalEquipmentItemProvider == null ) {
+            generalEquipmentItemProvider = new GeneralEquipmentItemProvider( this );
         }
 
         return generalEquipmentItemProvider;
@@ -3049,8 +3050,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createGeneralEquipmentContainerAdapter() {
-        if (generalEquipmentContainerItemProvider == null) {
-            generalEquipmentContainerItemProvider = new GeneralEquipmentContainerItemProvider(this);
+        if( generalEquipmentContainerItemProvider == null ) {
+            generalEquipmentContainerItemProvider = new GeneralEquipmentContainerItemProvider( this );
         }
 
         return generalEquipmentContainerItemProvider;
@@ -3072,8 +3073,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createLNodeAdapter() {
-        if (lNodeItemProvider == null) {
-            lNodeItemProvider = new LNodeItemProvider(this);
+        if( lNodeItemProvider == null ) {
+            lNodeItemProvider = new LNodeItemProvider( this );
         }
 
         return lNodeItemProvider;
@@ -3095,8 +3096,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createLNodeContainerAdapter() {
-        if (lNodeContainerItemProvider == null) {
-            lNodeContainerItemProvider = new LNodeContainerItemProvider(this);
+        if( lNodeContainerItemProvider == null ) {
+            lNodeContainerItemProvider = new LNodeContainerItemProvider( this );
         }
 
         return lNodeContainerItemProvider;
@@ -3118,8 +3119,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createNeutralPointAdapter() {
-        if (neutralPointItemProvider == null) {
-            neutralPointItemProvider = new NeutralPointItemProvider(this);
+        if( neutralPointItemProvider == null ) {
+            neutralPointItemProvider = new NeutralPointItemProvider( this );
         }
 
         return neutralPointItemProvider;
@@ -3141,8 +3142,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createPowerSystemResourceAdapter() {
-        if (powerSystemResourceItemProvider == null) {
-            powerSystemResourceItemProvider = new PowerSystemResourceItemProvider(this);
+        if( powerSystemResourceItemProvider == null ) {
+            powerSystemResourceItemProvider = new PowerSystemResourceItemProvider( this );
         }
 
         return powerSystemResourceItemProvider;
@@ -3164,8 +3165,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createPowerTransformerAdapter() {
-        if (powerTransformerItemProvider == null) {
-            powerTransformerItemProvider = new PowerTransformerItemProvider(this);
+        if( powerTransformerItemProvider == null ) {
+            powerTransformerItemProvider = new PowerTransformerItemProvider( this );
         }
 
         return powerTransformerItemProvider;
@@ -3187,8 +3188,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSubEquipmentAdapter() {
-        if (subEquipmentItemProvider == null) {
-            subEquipmentItemProvider = new SubEquipmentItemProvider(this);
+        if( subEquipmentItemProvider == null ) {
+            subEquipmentItemProvider = new SubEquipmentItemProvider( this );
         }
 
         return subEquipmentItemProvider;
@@ -3210,8 +3211,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSubFunctionAdapter() {
-        if (subFunctionItemProvider == null) {
-            subFunctionItemProvider = new SubFunctionItemProvider(this);
+        if( subFunctionItemProvider == null ) {
+            subFunctionItemProvider = new SubFunctionItemProvider( this );
         }
 
         return subFunctionItemProvider;
@@ -3233,8 +3234,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createSubstationAdapter() {
-        if (substationItemProvider == null) {
-            substationItemProvider = new SubstationItemProvider(this);
+        if( substationItemProvider == null ) {
+            substationItemProvider = new SubstationItemProvider( this );
         }
 
         return substationItemProvider;
@@ -3256,8 +3257,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createTapChangerAdapter() {
-        if (tapChangerItemProvider == null) {
-            tapChangerItemProvider = new TapChangerItemProvider(this);
+        if( tapChangerItemProvider == null ) {
+            tapChangerItemProvider = new TapChangerItemProvider( this );
         }
 
         return tapChangerItemProvider;
@@ -3279,8 +3280,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createTerminalAdapter() {
-        if (terminalItemProvider == null) {
-            terminalItemProvider = new TerminalItemProvider(this);
+        if( terminalItemProvider == null ) {
+            terminalItemProvider = new TerminalItemProvider( this );
         }
 
         return terminalItemProvider;
@@ -3302,8 +3303,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createTransformerWindingAdapter() {
-        if (transformerWindingItemProvider == null) {
-            transformerWindingItemProvider = new TransformerWindingItemProvider(this);
+        if( transformerWindingItemProvider == null ) {
+            transformerWindingItemProvider = new TransformerWindingItemProvider( this );
         }
 
         return transformerWindingItemProvider;
@@ -3325,8 +3326,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createVoltageAdapter() {
-        if (voltageItemProvider == null) {
-            voltageItemProvider = new VoltageItemProvider(this);
+        if( voltageItemProvider == null ) {
+            voltageItemProvider = new VoltageItemProvider( this );
         }
 
         return voltageItemProvider;
@@ -3348,8 +3349,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createVoltageLevelAdapter() {
-        if (voltageLevelItemProvider == null) {
-            voltageLevelItemProvider = new VoltageLevelItemProvider(this);
+        if( voltageLevelItemProvider == null ) {
+            voltageLevelItemProvider = new VoltageLevelItemProvider( this );
         }
 
         return voltageLevelItemProvider;
@@ -3371,8 +3372,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createServiceYesNoAdapter() {
-        if (serviceYesNoItemProvider == null) {
-            serviceYesNoItemProvider = new ServiceYesNoItemProvider(this);
+        if( serviceYesNoItemProvider == null ) {
+            serviceYesNoItemProvider = new ServiceYesNoItemProvider( this );
         }
 
         return serviceYesNoItemProvider;
@@ -3394,8 +3395,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createServiceWithOptionalMaxAdapter() {
-        if (serviceWithOptionalMaxItemProvider == null) {
-            serviceWithOptionalMaxItemProvider = new ServiceWithOptionalMaxItemProvider(this);
+        if( serviceWithOptionalMaxItemProvider == null ) {
+            serviceWithOptionalMaxItemProvider = new ServiceWithOptionalMaxItemProvider( this );
         }
 
         return serviceWithOptionalMaxItemProvider;
@@ -3417,8 +3418,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createServiceWithMaxNonZeroAdapter() {
-        if (serviceWithMaxNonZeroItemProvider == null) {
-            serviceWithMaxNonZeroItemProvider = new ServiceWithMaxNonZeroItemProvider(this);
+        if( serviceWithMaxNonZeroItemProvider == null ) {
+            serviceWithMaxNonZeroItemProvider = new ServiceWithMaxNonZeroItemProvider( this );
         }
 
         return serviceWithMaxNonZeroItemProvider;
@@ -3440,8 +3441,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createServiceConfReportControlAdapter() {
-        if (serviceConfReportControlItemProvider == null) {
-            serviceConfReportControlItemProvider = new ServiceConfReportControlItemProvider(this);
+        if( serviceConfReportControlItemProvider == null ) {
+            serviceConfReportControlItemProvider = new ServiceConfReportControlItemProvider( this );
         }
 
         return serviceConfReportControlItemProvider;
@@ -3463,8 +3464,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createServiceWithMaxAndMaxAttributesAdapter() {
-        if (serviceWithMaxAndMaxAttributesItemProvider == null) {
-            serviceWithMaxAndMaxAttributesItemProvider = new ServiceWithMaxAndMaxAttributesItemProvider(this);
+        if( serviceWithMaxAndMaxAttributesItemProvider == null ) {
+            serviceWithMaxAndMaxAttributesItemProvider = new ServiceWithMaxAndMaxAttributesItemProvider( this );
         }
 
         return serviceWithMaxAndMaxAttributesItemProvider;
@@ -3486,8 +3487,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createServiceWithMaxAndModifyAdapter() {
-        if (serviceWithMaxAndModifyItemProvider == null) {
-            serviceWithMaxAndModifyItemProvider = new ServiceWithMaxAndModifyItemProvider(this);
+        if( serviceWithMaxAndModifyItemProvider == null ) {
+            serviceWithMaxAndModifyItemProvider = new ServiceWithMaxAndModifyItemProvider( this );
         }
 
         return serviceWithMaxAndModifyItemProvider;
@@ -3509,8 +3510,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createServiceForConfDataSetAdapter() {
-        if (serviceForConfDataSetItemProvider == null) {
-            serviceForConfDataSetItemProvider = new ServiceForConfDataSetItemProvider(this);
+        if( serviceForConfDataSetItemProvider == null ) {
+            serviceForConfDataSetItemProvider = new ServiceForConfDataSetItemProvider( this );
         }
 
         return serviceForConfDataSetItemProvider;
@@ -3532,8 +3533,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createCertAdapter() {
-        if (certItemProvider == null) {
-            certItemProvider = new CertItemProvider(this);
+        if( certItemProvider == null ) {
+            certItemProvider = new CertItemProvider( this );
         }
 
         return certItemProvider;
@@ -3555,8 +3556,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createValueWithUnitAdapter() {
-        if (valueWithUnitItemProvider == null) {
-            valueWithUnitItemProvider = new ValueWithUnitItemProvider(this);
+        if( valueWithUnitItemProvider == null ) {
+            valueWithUnitItemProvider = new ValueWithUnitItemProvider( this );
         }
 
         return valueWithUnitItemProvider;
@@ -3578,8 +3579,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public Adapter createDurationInSecAdapter() {
-        if (durationInSecItemProvider == null) {
-            durationInSecItemProvider = new DurationInSecItemProvider(this);
+        if( durationInSecItemProvider == null ) {
+            durationInSecItemProvider = new DurationInSecItemProvider( this );
         }
 
         return durationInSecItemProvider;
@@ -3603,7 +3604,7 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      * @generated
      */
     @Override
-    public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+    public void setParentAdapterFactory( ComposedAdapterFactory parentAdapterFactory ) {
         this.parentAdapterFactory = parentAdapterFactory;
     }
 
@@ -3613,8 +3614,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      * @generated
      */
     @Override
-    public boolean isFactoryForType(Object type) {
-        return supportedTypes.contains(type) || super.isFactoryForType(type);
+    public boolean isFactoryForType( Object type ) {
+        return supportedTypes.contains( type ) || super.isFactoryForType( type );
     }
 
     /**
@@ -3624,8 +3625,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      * @generated
      */
     @Override
-    public Adapter adapt(Notifier notifier, Object type) {
-        return super.adapt(notifier, this);
+    public Adapter adapt( Notifier notifier, Object type ) {
+        return super.adapt( notifier, this );
     }
 
     /**
@@ -3634,10 +3635,10 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      * @generated
      */
     @Override
-    public Object adapt(Object object, Object type) {
-        if (isFactoryForType(type)) {
-            Object adapter = super.adapt(object, type);
-            if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+    public Object adapt( Object object, Object type ) {
+        if( isFactoryForType( type ) ) {
+            Object adapter = super.adapt( object, type );
+            if( !( type instanceof Class< ? > ) || ( ( ( Class< ? > ) type ).isInstance( adapter ) ) ) {
                 return adapter;
             }
         }
@@ -3652,8 +3653,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      * @generated
      */
     @Override
-    public void addListener(INotifyChangedListener notifyChangedListener) {
-        changeNotifier.addListener(notifyChangedListener);
+    public void addListener( INotifyChangedListener notifyChangedListener ) {
+        changeNotifier.addListener( notifyChangedListener );
     }
 
     /**
@@ -3663,8 +3664,8 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      * @generated
      */
     @Override
-    public void removeListener(INotifyChangedListener notifyChangedListener) {
-        changeNotifier.removeListener(notifyChangedListener);
+    public void removeListener( INotifyChangedListener notifyChangedListener ) {
+        changeNotifier.removeListener( notifyChangedListener );
     }
 
     /**
@@ -3674,11 +3675,11 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      * @generated
      */
     @Override
-    public void fireNotifyChanged(Notification notification) {
-        changeNotifier.fireNotifyChanged(notification);
+    public void fireNotifyChanged( Notification notification ) {
+        changeNotifier.fireNotifyChanged( notification );
 
-        if (parentAdapterFactory != null) {
-            parentAdapterFactory.fireNotifyChanged(notification);
+        if( parentAdapterFactory != null ) {
+            parentAdapterFactory.fireNotifyChanged( notification );
         }
     }
 
@@ -3690,158 +3691,158 @@ public class SclItemProviderAdapterFactory extends SclAdapterFactory implements
      */
     @Override
     public void dispose() {
-        if (headerItemProvider != null) headerItemProvider.dispose();
-        if (historyItemProvider != null) historyItemProvider.dispose();
-        if (hitemItemProvider != null) hitemItemProvider.dispose();
-        if (idNamingItemProvider != null) idNamingItemProvider.dispose();
-        if (lineItemProvider != null) lineItemProvider.dispose();
-        if (privateItemProvider != null) privateItemProvider.dispose();
-        if (processItemProvider != null) processItemProvider.dispose();
-        if (sclItemProvider != null) sclItemProvider.dispose();
-        if (textItemProvider != null) textItemProvider.dispose();
-        if (addressItemProvider != null) addressItemProvider.dispose();
-        if (communicationItemProvider != null) communicationItemProvider.dispose();
-        if (connectedAPItemProvider != null) connectedAPItemProvider.dispose();
-        if (gseItemProvider != null) gseItemProvider.dispose();
-        if (pItemProvider != null) pItemProvider.dispose();
-        if (pAddrItemProvider != null) pAddrItemProvider.dispose();
-        if (p_PhysConnItemProvider != null) p_PhysConnItemProvider.dispose();
-        if (physConnItemProvider != null) physConnItemProvider.dispose();
-        if (smvItemProvider != null) smvItemProvider.dispose();
-        if (subNetworkItemProvider != null) subNetworkItemProvider.dispose();
-        if (bdaItemProvider != null) bdaItemProvider.dispose();
-        if (daItemProvider != null) daItemProvider.dispose();
-        if (daTypeItemProvider != null) daTypeItemProvider.dispose();
-        if (doItemProvider != null) doItemProvider.dispose();
-        if (doTypeItemProvider != null) doTypeItemProvider.dispose();
-        if (dataTypeTemplatesItemProvider != null) dataTypeTemplatesItemProvider.dispose();
-        if (enumTypeItemProvider != null) enumTypeItemProvider.dispose();
-        if (enumValItemProvider != null) enumValItemProvider.dispose();
-        if (lNodeTypeItemProvider != null) lNodeTypeItemProvider.dispose();
-        if (protNsItemProvider != null) protNsItemProvider.dispose();
-        if (sdoItemProvider != null) sdoItemProvider.dispose();
-        if (valItemProvider != null) valItemProvider.dispose();
-        if (accessControlItemProvider != null) accessControlItemProvider.dispose();
-        if (accessPointItemProvider != null) accessPointItemProvider.dispose();
-        if (associationItemProvider != null) associationItemProvider.dispose();
-        if (authenticationItemProvider != null) authenticationItemProvider.dispose();
-        if (certificateItemProvider != null) certificateItemProvider.dispose();
-        if (clientLNItemProvider != null) clientLNItemProvider.dispose();
-        if (clientServicesItemProvider != null) clientServicesItemProvider.dispose();
-        if (commProtItemProvider != null) commProtItemProvider.dispose();
-        if (confDataSetItemProvider != null) confDataSetItemProvider.dispose();
-        if (confLNsItemProvider != null) confLNsItemProvider.dispose();
-        if (confLdNameItemProvider != null) confLdNameItemProvider.dispose();
-        if (confLogControlItemProvider != null) confLogControlItemProvider.dispose();
-        if (confReportControlItemProvider != null) confReportControlItemProvider.dispose();
-        if (confSGItemProvider != null) confSGItemProvider.dispose();
-        if (confSigRefItemProvider != null) confSigRefItemProvider.dispose();
-        if (controlWithIEDNameItemProvider != null) controlWithIEDNameItemProvider.dispose();
-        if (daiItemProvider != null) daiItemProvider.dispose();
-        if (doiItemProvider != null) doiItemProvider.dispose();
-        if (dataObjectDirectoryItemProvider != null) dataObjectDirectoryItemProvider.dispose();
-        if (dataSetItemProvider != null) dataSetItemProvider.dispose();
-        if (dataSetDirectoryItemProvider != null) dataSetDirectoryItemProvider.dispose();
-        if (dynAssociationItemProvider != null) dynAssociationItemProvider.dispose();
-        if (dynDataSetItemProvider != null) dynDataSetItemProvider.dispose();
-        if (extRefItemProvider != null) extRefItemProvider.dispose();
-        if (fcdaItemProvider != null) fcdaItemProvider.dispose();
-        if (fileHandlingItemProvider != null) fileHandlingItemProvider.dispose();
-        if (gooseItemProvider != null) gooseItemProvider.dispose();
-        if (gooseSecurityItemProvider != null) gooseSecurityItemProvider.dispose();
-        if (gseControlItemProvider != null) gseControlItemProvider.dispose();
-        if (gseDirItemProvider != null) gseDirItemProvider.dispose();
-        if (gseSettingsItemProvider != null) gseSettingsItemProvider.dispose();
-        if (gsseItemProvider != null) gsseItemProvider.dispose();
-        if (getCBValuesItemProvider != null) getCBValuesItemProvider.dispose();
-        if (getDataObjectDefinitionItemProvider != null) getDataObjectDefinitionItemProvider.dispose();
-        if (getDataSetValueItemProvider != null) getDataSetValueItemProvider.dispose();
-        if (getDirectoryItemProvider != null) getDirectoryItemProvider.dispose();
-        if (iedItemProvider != null) iedItemProvider.dispose();
-        if (iedNameItemProvider != null) iedNameItemProvider.dispose();
-        if (inputsItemProvider != null) inputsItemProvider.dispose();
-        if (issuerNameItemProvider != null) issuerNameItemProvider.dispose();
-        if (kdcItemProvider != null) kdcItemProvider.dispose();
-        if (lDeviceItemProvider != null) lDeviceItemProvider.dispose();
-        if (lnItemProvider != null) lnItemProvider.dispose();
-        if (ln0ItemProvider != null) ln0ItemProvider.dispose();
-        if (logItemProvider != null) logItemProvider.dispose();
-        if (logControlItemProvider != null) logControlItemProvider.dispose();
-        if (logSettingsItemProvider != null) logSettingsItemProvider.dispose();
-        if (optFieldsItemProvider != null) optFieldsItemProvider.dispose();
-        if (protocolItemProvider != null) protocolItemProvider.dispose();
-        if (readWriteItemProvider != null) readWriteItemProvider.dispose();
-        if (redProtItemProvider != null) redProtItemProvider.dispose();
-        if (reportControlItemProvider != null) reportControlItemProvider.dispose();
-        if (reportSettingsItemProvider != null) reportSettingsItemProvider.dispose();
-        if (rptEnabledItemProvider != null) rptEnabledItemProvider.dispose();
-        if (sdiItemProvider != null) sdiItemProvider.dispose();
-        if (sgEditItemProvider != null) sgEditItemProvider.dispose();
-        if (smvSecurityItemProvider != null) smvSecurityItemProvider.dispose();
-        if (smvSettingsItemProvider != null) smvSettingsItemProvider.dispose();
-        if (smVscItemProvider != null) smVscItemProvider.dispose();
-        if (sampledValueControlItemProvider != null) sampledValueControlItemProvider.dispose();
-        if (serverItemProvider != null) serverItemProvider.dispose();
-        if (serverAtItemProvider != null) serverAtItemProvider.dispose();
-        if (serviceSettingsItemProvider != null) serviceSettingsItemProvider.dispose();
-        if (serviceWithMaxItemProvider != null) serviceWithMaxItemProvider.dispose();
-        if (servicesItemProvider != null) servicesItemProvider.dispose();
-        if (setDataSetValueItemProvider != null) setDataSetValueItemProvider.dispose();
-        if (settingControlItemProvider != null) settingControlItemProvider.dispose();
-        if (settingGroupsItemProvider != null) settingGroupsItemProvider.dispose();
-        if (smvOptsItemProvider != null) smvOptsItemProvider.dispose();
-        if (subjectItemProvider != null) subjectItemProvider.dispose();
-        if (supSubscriptionItemProvider != null) supSubscriptionItemProvider.dispose();
-        if (timeSyncProtItemProvider != null) timeSyncProtItemProvider.dispose();
-        if (timerActivatedControlItemProvider != null) timerActivatedControlItemProvider.dispose();
-        if (trgOpsItemProvider != null) trgOpsItemProvider.dispose();
-        if (valueHandlingItemProvider != null) valueHandlingItemProvider.dispose();
-        if (abstractConductingEquipmentItemProvider != null) abstractConductingEquipmentItemProvider.dispose();
-        if (abstractEqFuncSubFuncItemProvider != null) abstractEqFuncSubFuncItemProvider.dispose();
-        if (bayItemProvider != null) bayItemProvider.dispose();
-        if (conductingEquipmentItemProvider != null) conductingEquipmentItemProvider.dispose();
-        if (connectivityNodeItemProvider != null) connectivityNodeItemProvider.dispose();
-        if (eqFunctionItemProvider != null) eqFunctionItemProvider.dispose();
-        if (eqSubFunctionItemProvider != null) eqSubFunctionItemProvider.dispose();
-        if (equipmentItemProvider != null) equipmentItemProvider.dispose();
-        if (equipmentContainerItemProvider != null) equipmentContainerItemProvider.dispose();
-        if (functionItemProvider != null) functionItemProvider.dispose();
-        if (generalEquipmentItemProvider != null) generalEquipmentItemProvider.dispose();
-        if (generalEquipmentContainerItemProvider != null) generalEquipmentContainerItemProvider.dispose();
-        if (lNodeItemProvider != null) lNodeItemProvider.dispose();
-        if (lNodeContainerItemProvider != null) lNodeContainerItemProvider.dispose();
-        if (neutralPointItemProvider != null) neutralPointItemProvider.dispose();
-        if (powerSystemResourceItemProvider != null) powerSystemResourceItemProvider.dispose();
-        if (powerTransformerItemProvider != null) powerTransformerItemProvider.dispose();
-        if (subEquipmentItemProvider != null) subEquipmentItemProvider.dispose();
-        if (subFunctionItemProvider != null) subFunctionItemProvider.dispose();
-        if (substationItemProvider != null) substationItemProvider.dispose();
-        if (tapChangerItemProvider != null) tapChangerItemProvider.dispose();
-        if (terminalItemProvider != null) terminalItemProvider.dispose();
-        if (transformerWindingItemProvider != null) transformerWindingItemProvider.dispose();
-        if (voltageItemProvider != null) voltageItemProvider.dispose();
-        if (voltageLevelItemProvider != null) voltageLevelItemProvider.dispose();
-        if (serviceYesNoItemProvider != null) serviceYesNoItemProvider.dispose();
-        if (serviceWithOptionalMaxItemProvider != null) serviceWithOptionalMaxItemProvider.dispose();
-        if (serviceWithMaxNonZeroItemProvider != null) serviceWithMaxNonZeroItemProvider.dispose();
-        if (serviceConfReportControlItemProvider != null) serviceConfReportControlItemProvider.dispose();
-        if (serviceWithMaxAndMaxAttributesItemProvider != null) serviceWithMaxAndMaxAttributesItemProvider.dispose();
-        if (serviceWithMaxAndModifyItemProvider != null) serviceWithMaxAndModifyItemProvider.dispose();
-        if (serviceForConfDataSetItemProvider != null) serviceForConfDataSetItemProvider.dispose();
-        if (certItemProvider != null) certItemProvider.dispose();
-        if (valueWithUnitItemProvider != null) valueWithUnitItemProvider.dispose();
-        if (durationInSecItemProvider != null) durationInSecItemProvider.dispose();
-        if (durationInMilliSecItemProvider != null) durationInMilliSecItemProvider.dispose();
-        if (bitRateInMbPerSecItemProvider != null) bitRateInMbPerSecItemProvider.dispose();
-        if (minTimeItemProvider != null) minTimeItemProvider.dispose();
-        if (maxTimeItemProvider != null) maxTimeItemProvider.dispose();
-        if (bitRateItemProvider != null) bitRateItemProvider.dispose();
-        if (smpRateItemProvider != null) smpRateItemProvider.dispose();
-        if (samplesPerSecItemProvider != null) samplesPerSecItemProvider.dispose();
-        if (secPerSamplesItemProvider != null) secPerSamplesItemProvider.dispose();
-        if (mcSecurityItemProvider != null) mcSecurityItemProvider.dispose();
-        if (agAuthenticationItemProvider != null) agAuthenticationItemProvider.dispose();
-        if (agLNRefItemProvider != null) agLNRefItemProvider.dispose();
+        if( headerItemProvider != null ) headerItemProvider.dispose();
+        if( historyItemProvider != null ) historyItemProvider.dispose();
+        if( hitemItemProvider != null ) hitemItemProvider.dispose();
+        if( idNamingItemProvider != null ) idNamingItemProvider.dispose();
+        if( lineItemProvider != null ) lineItemProvider.dispose();
+        if( privateItemProvider != null ) privateItemProvider.dispose();
+        if( processItemProvider != null ) processItemProvider.dispose();
+        if( sclItemProvider != null ) sclItemProvider.dispose();
+        if( textItemProvider != null ) textItemProvider.dispose();
+        if( addressItemProvider != null ) addressItemProvider.dispose();
+        if( communicationItemProvider != null ) communicationItemProvider.dispose();
+        if( connectedAPItemProvider != null ) connectedAPItemProvider.dispose();
+        if( gseItemProvider != null ) gseItemProvider.dispose();
+        if( pItemProvider != null ) pItemProvider.dispose();
+        if( pAddrItemProvider != null ) pAddrItemProvider.dispose();
+        if( p_PhysConnItemProvider != null ) p_PhysConnItemProvider.dispose();
+        if( physConnItemProvider != null ) physConnItemProvider.dispose();
+        if( smvItemProvider != null ) smvItemProvider.dispose();
+        if( subNetworkItemProvider != null ) subNetworkItemProvider.dispose();
+        if( bdaItemProvider != null ) bdaItemProvider.dispose();
+        if( daItemProvider != null ) daItemProvider.dispose();
+        if( daTypeItemProvider != null ) daTypeItemProvider.dispose();
+        if( doItemProvider != null ) doItemProvider.dispose();
+        if( doTypeItemProvider != null ) doTypeItemProvider.dispose();
+        if( dataTypeTemplatesItemProvider != null ) dataTypeTemplatesItemProvider.dispose();
+        if( enumTypeItemProvider != null ) enumTypeItemProvider.dispose();
+        if( enumValItemProvider != null ) enumValItemProvider.dispose();
+        if( lNodeTypeItemProvider != null ) lNodeTypeItemProvider.dispose();
+        if( protNsItemProvider != null ) protNsItemProvider.dispose();
+        if( sdoItemProvider != null ) sdoItemProvider.dispose();
+        if( valItemProvider != null ) valItemProvider.dispose();
+        if( accessControlItemProvider != null ) accessControlItemProvider.dispose();
+        if( accessPointItemProvider != null ) accessPointItemProvider.dispose();
+        if( associationItemProvider != null ) associationItemProvider.dispose();
+        if( authenticationItemProvider != null ) authenticationItemProvider.dispose();
+        if( certificateItemProvider != null ) certificateItemProvider.dispose();
+        if( clientLNItemProvider != null ) clientLNItemProvider.dispose();
+        if( clientServicesItemProvider != null ) clientServicesItemProvider.dispose();
+        if( commProtItemProvider != null ) commProtItemProvider.dispose();
+        if( confDataSetItemProvider != null ) confDataSetItemProvider.dispose();
+        if( confLNsItemProvider != null ) confLNsItemProvider.dispose();
+        if( confLdNameItemProvider != null ) confLdNameItemProvider.dispose();
+        if( confLogControlItemProvider != null ) confLogControlItemProvider.dispose();
+        if( confReportControlItemProvider != null ) confReportControlItemProvider.dispose();
+        if( confSGItemProvider != null ) confSGItemProvider.dispose();
+        if( confSigRefItemProvider != null ) confSigRefItemProvider.dispose();
+        if( controlWithIEDNameItemProvider != null ) controlWithIEDNameItemProvider.dispose();
+        if( daiItemProvider != null ) daiItemProvider.dispose();
+        if( doiItemProvider != null ) doiItemProvider.dispose();
+        if( dataObjectDirectoryItemProvider != null ) dataObjectDirectoryItemProvider.dispose();
+        if( dataSetItemProvider != null ) dataSetItemProvider.dispose();
+        if( dataSetDirectoryItemProvider != null ) dataSetDirectoryItemProvider.dispose();
+        if( dynAssociationItemProvider != null ) dynAssociationItemProvider.dispose();
+        if( dynDataSetItemProvider != null ) dynDataSetItemProvider.dispose();
+        if( extRefItemProvider != null ) extRefItemProvider.dispose();
+        if( fcdaItemProvider != null ) fcdaItemProvider.dispose();
+        if( fileHandlingItemProvider != null ) fileHandlingItemProvider.dispose();
+        if( gooseItemProvider != null ) gooseItemProvider.dispose();
+        if( gooseSecurityItemProvider != null ) gooseSecurityItemProvider.dispose();
+        if( gseControlItemProvider != null ) gseControlItemProvider.dispose();
+        if( gseDirItemProvider != null ) gseDirItemProvider.dispose();
+        if( gseSettingsItemProvider != null ) gseSettingsItemProvider.dispose();
+        if( gsseItemProvider != null ) gsseItemProvider.dispose();
+        if( getCBValuesItemProvider != null ) getCBValuesItemProvider.dispose();
+        if( getDataObjectDefinitionItemProvider != null ) getDataObjectDefinitionItemProvider.dispose();
+        if( getDataSetValueItemProvider != null ) getDataSetValueItemProvider.dispose();
+        if( getDirectoryItemProvider != null ) getDirectoryItemProvider.dispose();
+        if( iedItemProvider != null ) iedItemProvider.dispose();
+        if( iedNameItemProvider != null ) iedNameItemProvider.dispose();
+        if( inputsItemProvider != null ) inputsItemProvider.dispose();
+        if( issuerNameItemProvider != null ) issuerNameItemProvider.dispose();
+        if( kdcItemProvider != null ) kdcItemProvider.dispose();
+        if( lDeviceItemProvider != null ) lDeviceItemProvider.dispose();
+        if( lnItemProvider != null ) lnItemProvider.dispose();
+        if( ln0ItemProvider != null ) ln0ItemProvider.dispose();
+        if( logItemProvider != null ) logItemProvider.dispose();
+        if( logControlItemProvider != null ) logControlItemProvider.dispose();
+        if( logSettingsItemProvider != null ) logSettingsItemProvider.dispose();
+        if( optFieldsItemProvider != null ) optFieldsItemProvider.dispose();
+        if( protocolItemProvider != null ) protocolItemProvider.dispose();
+        if( readWriteItemProvider != null ) readWriteItemProvider.dispose();
+        if( redProtItemProvider != null ) redProtItemProvider.dispose();
+        if( reportControlItemProvider != null ) reportControlItemProvider.dispose();
+        if( reportSettingsItemProvider != null ) reportSettingsItemProvider.dispose();
+        if( rptEnabledItemProvider != null ) rptEnabledItemProvider.dispose();
+        if( sdiItemProvider != null ) sdiItemProvider.dispose();
+        if( sgEditItemProvider != null ) sgEditItemProvider.dispose();
+        if( smvSecurityItemProvider != null ) smvSecurityItemProvider.dispose();
+        if( smvSettingsItemProvider != null ) smvSettingsItemProvider.dispose();
+        if( smVscItemProvider != null ) smVscItemProvider.dispose();
+        if( sampledValueControlItemProvider != null ) sampledValueControlItemProvider.dispose();
+        if( serverItemProvider != null ) serverItemProvider.dispose();
+        if( serverAtItemProvider != null ) serverAtItemProvider.dispose();
+        if( serviceSettingsItemProvider != null ) serviceSettingsItemProvider.dispose();
+        if( serviceWithMaxItemProvider != null ) serviceWithMaxItemProvider.dispose();
+        if( servicesItemProvider != null ) servicesItemProvider.dispose();
+        if( setDataSetValueItemProvider != null ) setDataSetValueItemProvider.dispose();
+        if( settingControlItemProvider != null ) settingControlItemProvider.dispose();
+        if( settingGroupsItemProvider != null ) settingGroupsItemProvider.dispose();
+        if( smvOptsItemProvider != null ) smvOptsItemProvider.dispose();
+        if( subjectItemProvider != null ) subjectItemProvider.dispose();
+        if( supSubscriptionItemProvider != null ) supSubscriptionItemProvider.dispose();
+        if( timeSyncProtItemProvider != null ) timeSyncProtItemProvider.dispose();
+        if( timerActivatedControlItemProvider != null ) timerActivatedControlItemProvider.dispose();
+        if( trgOpsItemProvider != null ) trgOpsItemProvider.dispose();
+        if( valueHandlingItemProvider != null ) valueHandlingItemProvider.dispose();
+        if( abstractConductingEquipmentItemProvider != null ) abstractConductingEquipmentItemProvider.dispose();
+        if( abstractEqFuncSubFuncItemProvider != null ) abstractEqFuncSubFuncItemProvider.dispose();
+        if( bayItemProvider != null ) bayItemProvider.dispose();
+        if( conductingEquipmentItemProvider != null ) conductingEquipmentItemProvider.dispose();
+        if( connectivityNodeItemProvider != null ) connectivityNodeItemProvider.dispose();
+        if( eqFunctionItemProvider != null ) eqFunctionItemProvider.dispose();
+        if( eqSubFunctionItemProvider != null ) eqSubFunctionItemProvider.dispose();
+        if( equipmentItemProvider != null ) equipmentItemProvider.dispose();
+        if( equipmentContainerItemProvider != null ) equipmentContainerItemProvider.dispose();
+        if( functionItemProvider != null ) functionItemProvider.dispose();
+        if( generalEquipmentItemProvider != null ) generalEquipmentItemProvider.dispose();
+        if( generalEquipmentContainerItemProvider != null ) generalEquipmentContainerItemProvider.dispose();
+        if( lNodeItemProvider != null ) lNodeItemProvider.dispose();
+        if( lNodeContainerItemProvider != null ) lNodeContainerItemProvider.dispose();
+        if( neutralPointItemProvider != null ) neutralPointItemProvider.dispose();
+        if( powerSystemResourceItemProvider != null ) powerSystemResourceItemProvider.dispose();
+        if( powerTransformerItemProvider != null ) powerTransformerItemProvider.dispose();
+        if( subEquipmentItemProvider != null ) subEquipmentItemProvider.dispose();
+        if( subFunctionItemProvider != null ) subFunctionItemProvider.dispose();
+        if( substationItemProvider != null ) substationItemProvider.dispose();
+        if( tapChangerItemProvider != null ) tapChangerItemProvider.dispose();
+        if( terminalItemProvider != null ) terminalItemProvider.dispose();
+        if( transformerWindingItemProvider != null ) transformerWindingItemProvider.dispose();
+        if( voltageItemProvider != null ) voltageItemProvider.dispose();
+        if( voltageLevelItemProvider != null ) voltageLevelItemProvider.dispose();
+        if( serviceYesNoItemProvider != null ) serviceYesNoItemProvider.dispose();
+        if( serviceWithOptionalMaxItemProvider != null ) serviceWithOptionalMaxItemProvider.dispose();
+        if( serviceWithMaxNonZeroItemProvider != null ) serviceWithMaxNonZeroItemProvider.dispose();
+        if( serviceConfReportControlItemProvider != null ) serviceConfReportControlItemProvider.dispose();
+        if( serviceWithMaxAndMaxAttributesItemProvider != null ) serviceWithMaxAndMaxAttributesItemProvider.dispose();
+        if( serviceWithMaxAndModifyItemProvider != null ) serviceWithMaxAndModifyItemProvider.dispose();
+        if( serviceForConfDataSetItemProvider != null ) serviceForConfDataSetItemProvider.dispose();
+        if( certItemProvider != null ) certItemProvider.dispose();
+        if( valueWithUnitItemProvider != null ) valueWithUnitItemProvider.dispose();
+        if( durationInSecItemProvider != null ) durationInSecItemProvider.dispose();
+        if( durationInMilliSecItemProvider != null ) durationInMilliSecItemProvider.dispose();
+        if( bitRateInMbPerSecItemProvider != null ) bitRateInMbPerSecItemProvider.dispose();
+        if( minTimeItemProvider != null ) minTimeItemProvider.dispose();
+        if( maxTimeItemProvider != null ) maxTimeItemProvider.dispose();
+        if( bitRateItemProvider != null ) bitRateItemProvider.dispose();
+        if( smpRateItemProvider != null ) smpRateItemProvider.dispose();
+        if( samplesPerSecItemProvider != null ) samplesPerSecItemProvider.dispose();
+        if( secPerSamplesItemProvider != null ) secPerSamplesItemProvider.dispose();
+        if( mcSecurityItemProvider != null ) mcSecurityItemProvider.dispose();
+        if( agAuthenticationItemProvider != null ) agAuthenticationItemProvider.dispose();
+        if( agLNRefItemProvider != null ) agLNRefItemProvider.dispose();
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SclObjectItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SclObjectItemProvider.java
index b4567e2..535bdd7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SclObjectItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SclObjectItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -49,138 +48,137 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class SclObjectItemProvider 
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
+public class SclObjectItemProvider
+        extends ItemProviderAdapter
+        implements
+        IEditingDomainItemProvider,
+        IStructuredItemContentProvider,
+        ITreeItemContentProvider,
+        IItemLabelProvider,
+        IItemPropertySource {
+    /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	public SclObjectItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SclObjectItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
-	/**
+    /**
      * This returns the property descriptors for the adapted class.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    @Override
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addLineNumberPropertyDescriptor(object);
-            addExplicitLinksBuiltPropertyDescriptor(object);
+            addLineNumberPropertyDescriptor( object );
+            addExplicitLinksBuiltPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
 
-	/**
+    /**
      * This adds a property descriptor for the Line Number feature.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	protected void addLineNumberPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SclObject_lineNumber_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SclObject_lineNumber_feature", "_UI_SclObject_type"),
-                 SclPackage.eINSTANCE.getSclObject_LineNumber(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addLineNumberPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SclObject_lineNumber_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SclObject_lineNumber_feature",
+                                "_UI_SclObject_type" ),
+                        SclPackage.eINSTANCE.getSclObject_LineNumber(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
-	/**
+    /**
      * This adds a property descriptor for the Explicit Links Built feature.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addExplicitLinksBuiltPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SclObject_explicitLinksBuilt_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SclObject_explicitLinksBuilt_feature", "_UI_SclObject_type"),
-                 SclPackage.eINSTANCE.getSclObject_ExplicitLinksBuilt(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addExplicitLinksBuiltPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SclObject_explicitLinksBuilt_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SclObject_explicitLinksBuilt_feature",
+                                "_UI_SclObject_type" ),
+                        SclPackage.eINSTANCE.getSclObject_ExplicitLinksBuilt(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
      * This returns the label text for the adapted class.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	@Override
-	public String getText(Object object) {
-        SclObject sclObject = (SclObject)object;
-        return getString("_UI_SclObject_type") + " " + sclObject.getLineNumber();
+    @Override
+    public String getText( Object object ) {
+        SclObject sclObject = ( SclObject ) object;
+        return getString( "_UI_SclObject_type" ) + " " + sclObject.getLineNumber();
     }
-	
 
-	/**
+    /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
      * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	@Override
-	public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(SclObject.class)) {
-            case SclPackage.SCL_OBJECT__LINE_NUMBER:
-            case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    @Override
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( SclObject.class ) ) {
+        case SclPackage.SCL_OBJECT__LINE_NUMBER:
+        case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
-	/**
+    /**
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
      * that can be created under this object.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    @Override
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
-	/**
+    /**
      * Return the resource locator for this item provider's resources.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	@Override
-	public ResourceLocator getResourceLocator() {
+    @Override
+    public ResourceLocator getResourceLocator() {
         return SCLEditPlugin.INSTANCE;
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SecPerSamplesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SecPerSamplesItemProvider.java
index c37339a..34cbb1c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SecPerSamplesItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SecPerSamplesItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -48,8 +47,8 @@ public class SecPerSamplesItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SecPerSamplesItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SecPerSamplesItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class SecPerSamplesItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addValuePropertyDescriptor(object);
+            addValuePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class SecPerSamplesItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addValuePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SecPerSamples_value_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SecPerSamples_value_feature", "_UI_SecPerSamples_type"),
-                 SclPackage.eINSTANCE.getSecPerSamples_Value(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValuePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SecPerSamples_value_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SecPerSamples_value_feature",
+                                "_UI_SecPerSamples_type" ),
+                        SclPackage.eINSTANCE.getSecPerSamples_Value(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,8 +96,8 @@ public class SecPerSamplesItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SecPerSamples"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SecPerSamples" ) );
     }
 
     /**
@@ -108,11 +107,10 @@ public class SecPerSamplesItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        SecPerSamples secPerSamples = (SecPerSamples)object;
-        return getString("_UI_SecPerSamples_type") + " " + secPerSamples.getLineNumber();
+    public String getText( Object object ) {
+        SecPerSamples secPerSamples = ( SecPerSamples ) object;
+        return getString( "_UI_SecPerSamples_type" ) + " " + secPerSamples.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -122,15 +120,15 @@ public class SecPerSamplesItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(SecPerSamples.class)) {
-            case SclPackage.SEC_PER_SAMPLES__VALUE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( SecPerSamples.class ) ) {
+        case SclPackage.SEC_PER_SAMPLES__VALUE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -141,8 +139,8 @@ public class SecPerSamplesItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServerAtItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServerAtItemProvider.java
index 0ec8f3c..abdf582 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServerAtItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServerAtItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class ServerAtItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ServerAtItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ServerAtItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,12 +56,12 @@ public class ServerAtItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addApNamePropertyDescriptor(object);
-            addRefersToAccessPointPropertyDescriptor(object);
+            addApNamePropertyDescriptor( object );
+            addRefersToAccessPointPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -73,20 +72,20 @@ public class ServerAtItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addApNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ServerAt_apName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ServerAt_apName_feature", "_UI_ServerAt_type"),
-                 SclPackage.eINSTANCE.getServerAt_ApName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addApNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ServerAt_apName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServerAt_apName_feature",
+                                "_UI_ServerAt_type" ),
+                        SclPackage.eINSTANCE.getServerAt_ApName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -95,20 +94,20 @@ public class ServerAtItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToAccessPointPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ServerAt_RefersToAccessPoint_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ServerAt_RefersToAccessPoint_feature", "_UI_ServerAt_type"),
-                 SclPackage.eINSTANCE.getServerAt_RefersToAccessPoint(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToAccessPointPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ServerAt_RefersToAccessPoint_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServerAt_RefersToAccessPoint_feature",
+                                "_UI_ServerAt_type" ),
+                        SclPackage.eINSTANCE.getServerAt_RefersToAccessPoint(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -118,8 +117,8 @@ public class ServerAtItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ServerAt"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServerAt" ) );
     }
 
     /**
@@ -129,13 +128,11 @@ public class ServerAtItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((ServerAt)object).getApName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_ServerAt_type") :
-            getString("_UI_ServerAt_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( ServerAt ) object ).getApName();
+        return label == null || label.length() == 0 ? getString( "_UI_ServerAt_type" )
+                : getString( "_UI_ServerAt_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -145,15 +142,15 @@ public class ServerAtItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ServerAt.class)) {
-            case SclPackage.SERVER_AT__AP_NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ServerAt.class ) ) {
+        case SclPackage.SERVER_AT__AP_NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -164,8 +161,8 @@ public class ServerAtItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServerItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServerItemProvider.java
index aaecd17..eda95e7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServerItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServerItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class ServerItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ServerItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ServerItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class ServerItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTimeoutPropertyDescriptor(object);
+            addTimeoutPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class ServerItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTimeoutPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Server_timeout_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Server_timeout_feature", "_UI_Server_type"),
-                 SclPackage.eINSTANCE.getServer_Timeout(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTimeoutPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Server_timeout_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Server_timeout_feature",
+                                "_UI_Server_type" ),
+                        SclPackage.eINSTANCE.getServer_Timeout(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,12 +98,12 @@ public class ServerItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getServer_Association());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServer_Authentication());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServer_LDevice());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServer_Association() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServer_Authentication() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServer_LDevice() );
         }
         return childrenFeatures;
     }
@@ -115,11 +114,11 @@ public class ServerItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -129,8 +128,8 @@ public class ServerItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Server"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Server" ) );
     }
 
     /**
@@ -140,11 +139,10 @@ public class ServerItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Server server = (Server)object;
-        return getString("_UI_Server_type") + " " + server.getLineNumber();
+    public String getText( Object object ) {
+        Server server = ( Server ) object;
+        return getString( "_UI_Server_type" ) + " " + server.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -154,20 +152,20 @@ public class ServerItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(Server.class)) {
-            case SclPackage.SERVER__TIMEOUT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.SERVER__ASSOCIATION:
-            case SclPackage.SERVER__AUTHENTICATION:
-            case SclPackage.SERVER__LDEVICE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( Server.class ) ) {
+        case SclPackage.SERVER__TIMEOUT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.SERVER__ASSOCIATION:
+        case SclPackage.SERVER__AUTHENTICATION:
+        case SclPackage.SERVER__LDEVICE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -178,23 +176,17 @@ public class ServerItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServer_Association(),
-                 SclFactory.eINSTANCE.createAssociation()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServer_Authentication(),
-                 SclFactory.eINSTANCE.createAuthentication()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServer_LDevice(),
-                 SclFactory.eINSTANCE.createLDevice()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServer_Association(),
+                SclFactory.eINSTANCE.createAssociation() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServer_Authentication(),
+                SclFactory.eINSTANCE.createAuthentication() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServer_LDevice(),
+                SclFactory.eINSTANCE.createLDevice() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceConfReportControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceConfReportControlItemProvider.java
index 99b5f18..e3f7d22 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceConfReportControlItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceConfReportControlItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -48,8 +47,8 @@ public class ServiceConfReportControlItemProvider extends ServiceWithMaxItemProv
      * <!-- end-user-doc -->
      * @generated
      */
-    public ServiceConfReportControlItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ServiceConfReportControlItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,13 +58,13 @@ public class ServiceConfReportControlItemProvider extends ServiceWithMaxItemProv
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addBufModePropertyDescriptor(object);
-            addBufConfPropertyDescriptor(object);
-            addMaxBufPropertyDescriptor(object);
+            addBufModePropertyDescriptor( object );
+            addBufConfPropertyDescriptor( object );
+            addMaxBufPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -76,20 +75,20 @@ public class ServiceConfReportControlItemProvider extends ServiceWithMaxItemProv
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addBufModePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ServiceConfReportControl_bufMode_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ServiceConfReportControl_bufMode_feature", "_UI_ServiceConfReportControl_type"),
-                 SclPackage.eINSTANCE.getServiceConfReportControl_BufMode(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addBufModePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ServiceConfReportControl_bufMode_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceConfReportControl_bufMode_feature",
+                                "_UI_ServiceConfReportControl_type" ),
+                        SclPackage.eINSTANCE.getServiceConfReportControl_BufMode(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -98,20 +97,20 @@ public class ServiceConfReportControlItemProvider extends ServiceWithMaxItemProv
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addBufConfPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ServiceConfReportControl_bufConf_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ServiceConfReportControl_bufConf_feature", "_UI_ServiceConfReportControl_type"),
-                 SclPackage.eINSTANCE.getServiceConfReportControl_BufConf(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addBufConfPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ServiceConfReportControl_bufConf_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceConfReportControl_bufConf_feature",
+                                "_UI_ServiceConfReportControl_type" ),
+                        SclPackage.eINSTANCE.getServiceConfReportControl_BufConf(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -120,20 +119,20 @@ public class ServiceConfReportControlItemProvider extends ServiceWithMaxItemProv
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMaxBufPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ServiceConfReportControl_maxBuf_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ServiceConfReportControl_maxBuf_feature", "_UI_ServiceConfReportControl_type"),
-                 SclPackage.eINSTANCE.getServiceConfReportControl_MaxBuf(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMaxBufPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ServiceConfReportControl_maxBuf_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceConfReportControl_maxBuf_feature",
+                                "_UI_ServiceConfReportControl_type" ),
+                        SclPackage.eINSTANCE.getServiceConfReportControl_MaxBuf(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -143,8 +142,8 @@ public class ServiceConfReportControlItemProvider extends ServiceWithMaxItemProv
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ServiceConfReportControl"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceConfReportControl" ) );
     }
 
     /**
@@ -154,11 +153,10 @@ public class ServiceConfReportControlItemProvider extends ServiceWithMaxItemProv
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ServiceConfReportControl serviceConfReportControl = (ServiceConfReportControl)object;
-        return getString("_UI_ServiceConfReportControl_type") + " " + serviceConfReportControl.getLineNumber();
+    public String getText( Object object ) {
+        ServiceConfReportControl serviceConfReportControl = ( ServiceConfReportControl ) object;
+        return getString( "_UI_ServiceConfReportControl_type" ) + " " + serviceConfReportControl.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -168,17 +166,17 @@ public class ServiceConfReportControlItemProvider extends ServiceWithMaxItemProv
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(ServiceConfReportControl.class)) {
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_MODE:
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_CONF:
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__MAX_BUF:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( ServiceConfReportControl.class ) ) {
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_MODE:
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_CONF:
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__MAX_BUF:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -189,8 +187,8 @@ public class ServiceConfReportControlItemProvider extends ServiceWithMaxItemProv
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceForConfDataSetItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceForConfDataSetItemProvider.java
index 2de2138..ba660cd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceForConfDataSetItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceForConfDataSetItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -48,8 +47,8 @@ public class ServiceForConfDataSetItemProvider extends ServiceWithMaxAndMaxAttri
      * <!-- end-user-doc -->
      * @generated
      */
-    public ServiceForConfDataSetItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ServiceForConfDataSetItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class ServiceForConfDataSetItemProvider extends ServiceWithMaxAndMaxAttri
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addModifyPropertyDescriptor(object);
+            addModifyPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class ServiceForConfDataSetItemProvider extends ServiceWithMaxAndMaxAttri
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addModifyPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ServiceForConfDataSet_modify_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ServiceForConfDataSet_modify_feature", "_UI_ServiceForConfDataSet_type"),
-                 SclPackage.eINSTANCE.getServiceForConfDataSet_Modify(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addModifyPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ServiceForConfDataSet_modify_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceForConfDataSet_modify_feature",
+                                "_UI_ServiceForConfDataSet_type" ),
+                        SclPackage.eINSTANCE.getServiceForConfDataSet_Modify(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,8 +96,8 @@ public class ServiceForConfDataSetItemProvider extends ServiceWithMaxAndMaxAttri
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ServiceForConfDataSet"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceForConfDataSet" ) );
     }
 
     /**
@@ -108,11 +107,10 @@ public class ServiceForConfDataSetItemProvider extends ServiceWithMaxAndMaxAttri
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ServiceForConfDataSet serviceForConfDataSet = (ServiceForConfDataSet)object;
-        return getString("_UI_ServiceForConfDataSet_type") + " " + serviceForConfDataSet.getLineNumber();
+    public String getText( Object object ) {
+        ServiceForConfDataSet serviceForConfDataSet = ( ServiceForConfDataSet ) object;
+        return getString( "_UI_ServiceForConfDataSet_type" ) + " " + serviceForConfDataSet.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -122,15 +120,15 @@ public class ServiceForConfDataSetItemProvider extends ServiceWithMaxAndMaxAttri
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ServiceForConfDataSet.class)) {
-            case SclPackage.SERVICE_FOR_CONF_DATA_SET__MODIFY:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ServiceForConfDataSet.class ) ) {
+        case SclPackage.SERVICE_FOR_CONF_DATA_SET__MODIFY:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -141,8 +139,8 @@ public class ServiceForConfDataSetItemProvider extends ServiceWithMaxAndMaxAttri
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceSettingsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceSettingsItemProvider.java
index 26c7ba2..a816f31 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceSettingsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceSettingsItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -40,16 +39,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceSettingsNoDynEnum;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ServiceSettingsItemProvider 
-    extends SclObjectItemProvider {
+public class ServiceSettingsItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public ServiceSettingsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ServiceSettingsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,12 +58,12 @@ public class ServiceSettingsItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addCbNamePropertyDescriptor(object);
-            addDatSetPropertyDescriptor(object);
+            addCbNamePropertyDescriptor( object );
+            addDatSetPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class ServiceSettingsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addCbNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ServiceSettings_cbName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ServiceSettings_cbName_feature", "_UI_ServiceSettings_type"),
-                 SclPackage.eINSTANCE.getServiceSettings_CbName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addCbNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ServiceSettings_cbName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceSettings_cbName_feature",
+                                "_UI_ServiceSettings_type" ),
+                        SclPackage.eINSTANCE.getServiceSettings_CbName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class ServiceSettingsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDatSetPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ServiceSettings_datSet_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ServiceSettings_datSet_feature", "_UI_ServiceSettings_type"),
-                 SclPackage.eINSTANCE.getServiceSettings_DatSet(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDatSetPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ServiceSettings_datSet_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceSettings_datSet_feature",
+                                "_UI_ServiceSettings_type" ),
+                        SclPackage.eINSTANCE.getServiceSettings_DatSet(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -120,8 +119,8 @@ public class ServiceSettingsItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ServiceSettings"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceSettings" ) );
     }
 
     /**
@@ -131,14 +130,12 @@ public class ServiceSettingsItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ServiceSettingsNoDynEnum labelValue = ((ServiceSettings)object).getCbName();
+    public String getText( Object object ) {
+        ServiceSettingsNoDynEnum labelValue = ( ( ServiceSettings ) object ).getCbName();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ?
-            getString("_UI_ServiceSettings_type") :
-            getString("_UI_ServiceSettings_type") + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_ServiceSettings_type" )
+                : getString( "_UI_ServiceSettings_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -148,16 +145,16 @@ public class ServiceSettingsItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ServiceSettings.class)) {
-            case SclPackage.SERVICE_SETTINGS__CB_NAME:
-            case SclPackage.SERVICE_SETTINGS__DAT_SET:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ServiceSettings.class ) ) {
+        case SclPackage.SERVICE_SETTINGS__CB_NAME:
+        case SclPackage.SERVICE_SETTINGS__DAT_SET:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -168,8 +165,8 @@ public class ServiceSettingsItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndMaxAttributesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndMaxAttributesItemProvider.java
index a6e92d5..436e1c4 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndMaxAttributesItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndMaxAttributesItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -48,8 +47,8 @@ public class ServiceWithMaxAndMaxAttributesItemProvider extends ServiceWithMaxIt
      * <!-- end-user-doc -->
      * @generated
      */
-    public ServiceWithMaxAndMaxAttributesItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ServiceWithMaxAndMaxAttributesItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class ServiceWithMaxAndMaxAttributesItemProvider extends ServiceWithMaxIt
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addMaxAttributesPropertyDescriptor(object);
+            addMaxAttributesPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,21 @@ public class ServiceWithMaxAndMaxAttributesItemProvider extends ServiceWithMaxIt
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMaxAttributesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ServiceWithMaxAndMaxAttributes_maxAttributes_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ServiceWithMaxAndMaxAttributes_maxAttributes_feature", "_UI_ServiceWithMaxAndMaxAttributes_type"),
-                 SclPackage.eINSTANCE.getServiceWithMaxAndMaxAttributes_MaxAttributes(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMaxAttributesPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ServiceWithMaxAndMaxAttributes_maxAttributes_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_ServiceWithMaxAndMaxAttributes_maxAttributes_feature",
+                                "_UI_ServiceWithMaxAndMaxAttributes_type" ),
+                        SclPackage.eINSTANCE.getServiceWithMaxAndMaxAttributes_MaxAttributes(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,8 +97,8 @@ public class ServiceWithMaxAndMaxAttributesItemProvider extends ServiceWithMaxIt
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ServiceWithMaxAndMaxAttributes"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceWithMaxAndMaxAttributes" ) );
     }
 
     /**
@@ -108,11 +108,11 @@ public class ServiceWithMaxAndMaxAttributesItemProvider extends ServiceWithMaxIt
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ServiceWithMaxAndMaxAttributes serviceWithMaxAndMaxAttributes = (ServiceWithMaxAndMaxAttributes)object;
-        return getString("_UI_ServiceWithMaxAndMaxAttributes_type") + " " + serviceWithMaxAndMaxAttributes.getLineNumber();
+    public String getText( Object object ) {
+        ServiceWithMaxAndMaxAttributes serviceWithMaxAndMaxAttributes = ( ServiceWithMaxAndMaxAttributes ) object;
+        return getString( "_UI_ServiceWithMaxAndMaxAttributes_type" ) + " "
+                + serviceWithMaxAndMaxAttributes.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -122,15 +122,15 @@ public class ServiceWithMaxAndMaxAttributesItemProvider extends ServiceWithMaxIt
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ServiceWithMaxAndMaxAttributes.class)) {
-            case SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__MAX_ATTRIBUTES:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ServiceWithMaxAndMaxAttributes.class ) ) {
+        case SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__MAX_ATTRIBUTES:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -141,8 +141,8 @@ public class ServiceWithMaxAndMaxAttributesItemProvider extends ServiceWithMaxIt
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndModifyItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndModifyItemProvider.java
index 6b044fc..e0a3a30 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndModifyItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndModifyItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -48,8 +47,8 @@ public class ServiceWithMaxAndModifyItemProvider extends ServiceWithMaxItemProvi
      * <!-- end-user-doc -->
      * @generated
      */
-    public ServiceWithMaxAndModifyItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ServiceWithMaxAndModifyItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class ServiceWithMaxAndModifyItemProvider extends ServiceWithMaxItemProvi
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addModifyPropertyDescriptor(object);
+            addModifyPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class ServiceWithMaxAndModifyItemProvider extends ServiceWithMaxItemProvi
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addModifyPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ServiceWithMaxAndModify_modify_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ServiceWithMaxAndModify_modify_feature", "_UI_ServiceWithMaxAndModify_type"),
-                 SclPackage.eINSTANCE.getServiceWithMaxAndModify_Modify(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addModifyPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ServiceWithMaxAndModify_modify_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceWithMaxAndModify_modify_feature",
+                                "_UI_ServiceWithMaxAndModify_type" ),
+                        SclPackage.eINSTANCE.getServiceWithMaxAndModify_Modify(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,8 +96,8 @@ public class ServiceWithMaxAndModifyItemProvider extends ServiceWithMaxItemProvi
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ServiceWithMaxAndModify"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceWithMaxAndModify" ) );
     }
 
     /**
@@ -108,11 +107,10 @@ public class ServiceWithMaxAndModifyItemProvider extends ServiceWithMaxItemProvi
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ServiceWithMaxAndModify serviceWithMaxAndModify = (ServiceWithMaxAndModify)object;
-        return getString("_UI_ServiceWithMaxAndModify_type") + " " + serviceWithMaxAndModify.getLineNumber();
+    public String getText( Object object ) {
+        ServiceWithMaxAndModify serviceWithMaxAndModify = ( ServiceWithMaxAndModify ) object;
+        return getString( "_UI_ServiceWithMaxAndModify_type" ) + " " + serviceWithMaxAndModify.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -122,15 +120,15 @@ public class ServiceWithMaxAndModifyItemProvider extends ServiceWithMaxItemProvi
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ServiceWithMaxAndModify.class)) {
-            case SclPackage.SERVICE_WITH_MAX_AND_MODIFY__MODIFY:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ServiceWithMaxAndModify.class ) ) {
+        case SclPackage.SERVICE_WITH_MAX_AND_MODIFY__MODIFY:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -141,8 +139,8 @@ public class ServiceWithMaxAndModifyItemProvider extends ServiceWithMaxItemProvi
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxItemProvider.java
index 099d8c7..c8fe7b8 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceWithMax;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ServiceWithMaxItemProvider 
-    extends SclObjectItemProvider {
+public class ServiceWithMaxItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public ServiceWithMaxItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ServiceWithMaxItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,11 +57,11 @@ public class ServiceWithMaxItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addMaxPropertyDescriptor(object);
+            addMaxPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -73,20 +72,20 @@ public class ServiceWithMaxItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMaxPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ServiceWithMax_max_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ServiceWithMax_max_feature", "_UI_ServiceWithMax_type"),
-                 SclPackage.eINSTANCE.getServiceWithMax_Max(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMaxPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ServiceWithMax_max_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceWithMax_max_feature",
+                                "_UI_ServiceWithMax_type" ),
+                        SclPackage.eINSTANCE.getServiceWithMax_Max(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,8 +95,8 @@ public class ServiceWithMaxItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ServiceWithMax"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceWithMax" ) );
     }
 
     /**
@@ -107,11 +106,10 @@ public class ServiceWithMaxItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ServiceWithMax serviceWithMax = (ServiceWithMax)object;
-        return getString("_UI_ServiceWithMax_type") + " " + serviceWithMax.getLineNumber();
+    public String getText( Object object ) {
+        ServiceWithMax serviceWithMax = ( ServiceWithMax ) object;
+        return getString( "_UI_ServiceWithMax_type" ) + " " + serviceWithMax.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -121,15 +119,15 @@ public class ServiceWithMaxItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ServiceWithMax.class)) {
-            case SclPackage.SERVICE_WITH_MAX__MAX:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ServiceWithMax.class ) ) {
+        case SclPackage.SERVICE_WITH_MAX__MAX:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -140,8 +138,8 @@ public class ServiceWithMaxItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxNonZeroItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxNonZeroItemProvider.java
index 779e999..583d40e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxNonZeroItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxNonZeroItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -48,8 +47,8 @@ public class ServiceWithMaxNonZeroItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ServiceWithMaxNonZeroItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ServiceWithMaxNonZeroItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class ServiceWithMaxNonZeroItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addMaxPropertyDescriptor(object);
+            addMaxPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class ServiceWithMaxNonZeroItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMaxPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ServiceWithMaxNonZero_max_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ServiceWithMaxNonZero_max_feature", "_UI_ServiceWithMaxNonZero_type"),
-                 SclPackage.eINSTANCE.getServiceWithMaxNonZero_Max(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMaxPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ServiceWithMaxNonZero_max_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceWithMaxNonZero_max_feature",
+                                "_UI_ServiceWithMaxNonZero_type" ),
+                        SclPackage.eINSTANCE.getServiceWithMaxNonZero_Max(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,8 +96,8 @@ public class ServiceWithMaxNonZeroItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ServiceWithMaxNonZero"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceWithMaxNonZero" ) );
     }
 
     /**
@@ -108,11 +107,10 @@ public class ServiceWithMaxNonZeroItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ServiceWithMaxNonZero serviceWithMaxNonZero = (ServiceWithMaxNonZero)object;
-        return getString("_UI_ServiceWithMaxNonZero_type") + " " + serviceWithMaxNonZero.getLineNumber();
+    public String getText( Object object ) {
+        ServiceWithMaxNonZero serviceWithMaxNonZero = ( ServiceWithMaxNonZero ) object;
+        return getString( "_UI_ServiceWithMaxNonZero_type" ) + " " + serviceWithMaxNonZero.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -122,15 +120,15 @@ public class ServiceWithMaxNonZeroItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ServiceWithMaxNonZero.class)) {
-            case SclPackage.SERVICE_WITH_MAX_NON_ZERO__MAX:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ServiceWithMaxNonZero.class ) ) {
+        case SclPackage.SERVICE_WITH_MAX_NON_ZERO__MAX:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -141,8 +139,8 @@ public class ServiceWithMaxNonZeroItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithOptionalMaxItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithOptionalMaxItemProvider.java
index bfb4e22..fa49109 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithOptionalMaxItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithOptionalMaxItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -48,8 +47,8 @@ public class ServiceWithOptionalMaxItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ServiceWithOptionalMaxItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ServiceWithOptionalMaxItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class ServiceWithOptionalMaxItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addMaxPropertyDescriptor(object);
+            addMaxPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class ServiceWithOptionalMaxItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMaxPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ServiceWithOptionalMax_max_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ServiceWithOptionalMax_max_feature", "_UI_ServiceWithOptionalMax_type"),
-                 SclPackage.eINSTANCE.getServiceWithOptionalMax_Max(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMaxPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ServiceWithOptionalMax_max_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ServiceWithOptionalMax_max_feature",
+                                "_UI_ServiceWithOptionalMax_type" ),
+                        SclPackage.eINSTANCE.getServiceWithOptionalMax_Max(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,8 +96,8 @@ public class ServiceWithOptionalMaxItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ServiceWithOptionalMax"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceWithOptionalMax" ) );
     }
 
     /**
@@ -108,11 +107,10 @@ public class ServiceWithOptionalMaxItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ServiceWithOptionalMax serviceWithOptionalMax = (ServiceWithOptionalMax)object;
-        return getString("_UI_ServiceWithOptionalMax_type") + " " + serviceWithOptionalMax.getLineNumber();
+    public String getText( Object object ) {
+        ServiceWithOptionalMax serviceWithOptionalMax = ( ServiceWithOptionalMax ) object;
+        return getString( "_UI_ServiceWithOptionalMax_type" ) + " " + serviceWithOptionalMax.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -122,15 +120,15 @@ public class ServiceWithOptionalMaxItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ServiceWithOptionalMax.class)) {
-            case SclPackage.SERVICE_WITH_OPTIONAL_MAX__MAX:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ServiceWithOptionalMax.class ) ) {
+        case SclPackage.SERVICE_WITH_OPTIONAL_MAX__MAX:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -141,8 +139,8 @@ public class ServiceWithOptionalMaxItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceYesNoItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceYesNoItemProvider.java
index dda4a99..4e0150e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceYesNoItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceYesNoItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -44,8 +43,8 @@ public class ServiceYesNoItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ServiceYesNoItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ServiceYesNoItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -55,9 +54,9 @@ public class ServiceYesNoItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -70,8 +69,8 @@ public class ServiceYesNoItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ServiceYesNo"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ServiceYesNo" ) );
     }
 
     /**
@@ -81,11 +80,10 @@ public class ServiceYesNoItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ServiceYesNo serviceYesNo = (ServiceYesNo)object;
-        return getString("_UI_ServiceYesNo_type") + " " + serviceYesNo.getLineNumber();
+    public String getText( Object object ) {
+        ServiceYesNo serviceYesNo = ( ServiceYesNo ) object;
+        return getString( "_UI_ServiceYesNo_type" ) + " " + serviceYesNo.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -95,9 +93,8 @@ public class ServiceYesNoItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -108,8 +105,8 @@ public class ServiceYesNoItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServicesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServicesItemProvider.java
index 4f7b866..cf115f0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServicesItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServicesItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -41,16 +40,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.Services;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ServicesItemProvider 
-    extends SclObjectItemProvider {
+public class ServicesItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public ServicesItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ServicesItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -60,11 +59,11 @@ public class ServicesItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addNameLengthPropertyDescriptor(object);
+            addNameLengthPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class ServicesItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNameLengthPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Services_nameLength_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Services_nameLength_feature", "_UI_Services_type"),
-                 SclPackage.eINSTANCE.getServices_NameLength(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNameLengthPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Services_nameLength_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Services_nameLength_feature",
+                                "_UI_Services_type" ),
+                        SclPackage.eINSTANCE.getServices_NameLength(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -100,42 +99,42 @@ public class ServicesItemProvider
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_ClientServices());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_CommProt());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_ConfDataSet());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_ConfLNs());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_ConfLdName());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_ConfLogControl());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_ConfReportControl());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_ConfSigRef());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_DataObjectDirectory());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_DataSetDirectory());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_DynAssociation());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_DynDataSet());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_FileHandling());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_GOOSE());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_GSEDir());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_GSESettings());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_GSSE());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_GetCBValues());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_GetDataObjectDefinition());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_GetDataSetValue());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_GetDirectory());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_LogSettings());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_ReadWrite());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_RedProt());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_ReportSettings());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_SMVsc());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_SupSubscription());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_ValueHandling());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_SetDataSetValue());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_SettingGroups());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_TimeSyncProt());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_TimerActivatedControl());
-            childrenFeatures.add(SclPackage.eINSTANCE.getServices_SMVSettings());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_ClientServices() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_CommProt() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_ConfDataSet() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_ConfLNs() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_ConfLdName() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_ConfLogControl() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_ConfReportControl() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_ConfSigRef() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_DataObjectDirectory() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_DataSetDirectory() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_DynAssociation() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_DynDataSet() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_FileHandling() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_GOOSE() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_GSEDir() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_GSESettings() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_GSSE() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_GetCBValues() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_GetDataObjectDefinition() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_GetDataSetValue() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_GetDirectory() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_LogSettings() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_ReadWrite() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_RedProt() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_ReportSettings() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_SMVsc() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_SupSubscription() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_ValueHandling() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_SetDataSetValue() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_SettingGroups() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_TimeSyncProt() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_TimerActivatedControl() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getServices_SMVSettings() );
         }
         return childrenFeatures;
     }
@@ -146,11 +145,11 @@ public class ServicesItemProvider
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -160,8 +159,8 @@ public class ServicesItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Services"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Services" ) );
     }
 
     /**
@@ -171,14 +170,12 @@ public class ServicesItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Integer labelValue = ((Services)object).getNameLength();
+    public String getText( Object object ) {
+        Integer labelValue = ( ( Services ) object ).getNameLength();
         String label = labelValue == null ? null : labelValue.toString();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Services_type") :
-            getString("_UI_Services_type") + " " + label;
+        return label == null || label.length() == 0 ? getString( "_UI_Services_type" )
+                : getString( "_UI_Services_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -188,50 +185,50 @@ public class ServicesItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(Services.class)) {
-            case SclPackage.SERVICES__NAME_LENGTH:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.SERVICES__CLIENT_SERVICES:
-            case SclPackage.SERVICES__COMM_PROT:
-            case SclPackage.SERVICES__CONF_DATA_SET:
-            case SclPackage.SERVICES__CONF_LNS:
-            case SclPackage.SERVICES__CONF_LD_NAME:
-            case SclPackage.SERVICES__CONF_LOG_CONTROL:
-            case SclPackage.SERVICES__CONF_REPORT_CONTROL:
-            case SclPackage.SERVICES__CONF_SIG_REF:
-            case SclPackage.SERVICES__DATA_OBJECT_DIRECTORY:
-            case SclPackage.SERVICES__DATA_SET_DIRECTORY:
-            case SclPackage.SERVICES__DYN_ASSOCIATION:
-            case SclPackage.SERVICES__DYN_DATA_SET:
-            case SclPackage.SERVICES__FILE_HANDLING:
-            case SclPackage.SERVICES__GOOSE:
-            case SclPackage.SERVICES__GSE_DIR:
-            case SclPackage.SERVICES__GSE_SETTINGS:
-            case SclPackage.SERVICES__GSSE:
-            case SclPackage.SERVICES__GET_CB_VALUES:
-            case SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION:
-            case SclPackage.SERVICES__GET_DATA_SET_VALUE:
-            case SclPackage.SERVICES__GET_DIRECTORY:
-            case SclPackage.SERVICES__LOG_SETTINGS:
-            case SclPackage.SERVICES__READ_WRITE:
-            case SclPackage.SERVICES__RED_PROT:
-            case SclPackage.SERVICES__REPORT_SETTINGS:
-            case SclPackage.SERVICES__SM_VSC:
-            case SclPackage.SERVICES__SUP_SUBSCRIPTION:
-            case SclPackage.SERVICES__VALUE_HANDLING:
-            case SclPackage.SERVICES__SET_DATA_SET_VALUE:
-            case SclPackage.SERVICES__SETTING_GROUPS:
-            case SclPackage.SERVICES__TIME_SYNC_PROT:
-            case SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL:
-            case SclPackage.SERVICES__SMV_SETTINGS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( Services.class ) ) {
+        case SclPackage.SERVICES__NAME_LENGTH:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.SERVICES__CLIENT_SERVICES:
+        case SclPackage.SERVICES__COMM_PROT:
+        case SclPackage.SERVICES__CONF_DATA_SET:
+        case SclPackage.SERVICES__CONF_LNS:
+        case SclPackage.SERVICES__CONF_LD_NAME:
+        case SclPackage.SERVICES__CONF_LOG_CONTROL:
+        case SclPackage.SERVICES__CONF_REPORT_CONTROL:
+        case SclPackage.SERVICES__CONF_SIG_REF:
+        case SclPackage.SERVICES__DATA_OBJECT_DIRECTORY:
+        case SclPackage.SERVICES__DATA_SET_DIRECTORY:
+        case SclPackage.SERVICES__DYN_ASSOCIATION:
+        case SclPackage.SERVICES__DYN_DATA_SET:
+        case SclPackage.SERVICES__FILE_HANDLING:
+        case SclPackage.SERVICES__GOOSE:
+        case SclPackage.SERVICES__GSE_DIR:
+        case SclPackage.SERVICES__GSE_SETTINGS:
+        case SclPackage.SERVICES__GSSE:
+        case SclPackage.SERVICES__GET_CB_VALUES:
+        case SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION:
+        case SclPackage.SERVICES__GET_DATA_SET_VALUE:
+        case SclPackage.SERVICES__GET_DIRECTORY:
+        case SclPackage.SERVICES__LOG_SETTINGS:
+        case SclPackage.SERVICES__READ_WRITE:
+        case SclPackage.SERVICES__RED_PROT:
+        case SclPackage.SERVICES__REPORT_SETTINGS:
+        case SclPackage.SERVICES__SM_VSC:
+        case SclPackage.SERVICES__SUP_SUBSCRIPTION:
+        case SclPackage.SERVICES__VALUE_HANDLING:
+        case SclPackage.SERVICES__SET_DATA_SET_VALUE:
+        case SclPackage.SERVICES__SETTING_GROUPS:
+        case SclPackage.SERVICES__TIME_SYNC_PROT:
+        case SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL:
+        case SclPackage.SERVICES__SMV_SETTINGS:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -242,173 +239,107 @@ public class ServicesItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_ClientServices(),
-                 SclFactory.eINSTANCE.createClientServices()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_CommProt(),
-                 SclFactory.eINSTANCE.createCommProt()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_ConfDataSet(),
-                 SclFactory.eINSTANCE.createConfDataSet()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_ConfLNs(),
-                 SclFactory.eINSTANCE.createConfLNs()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_ConfLdName(),
-                 SclFactory.eINSTANCE.createConfLdName()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_ConfLogControl(),
-                 SclFactory.eINSTANCE.createConfLogControl()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_ConfReportControl(),
-                 SclFactory.eINSTANCE.createConfReportControl()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_ConfSigRef(),
-                 SclFactory.eINSTANCE.createConfSigRef()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_DataObjectDirectory(),
-                 SclFactory.eINSTANCE.createDataObjectDirectory()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_DataSetDirectory(),
-                 SclFactory.eINSTANCE.createDataSetDirectory()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_DynAssociation(),
-                 SclFactory.eINSTANCE.createDynAssociation()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_DynDataSet(),
-                 SclFactory.eINSTANCE.createDynDataSet()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_FileHandling(),
-                 SclFactory.eINSTANCE.createFileHandling()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_GOOSE(),
-                 SclFactory.eINSTANCE.createGOOSE()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_GSEDir(),
-                 SclFactory.eINSTANCE.createGSEDir()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_GSESettings(),
-                 SclFactory.eINSTANCE.createGSESettings()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_GSSE(),
-                 SclFactory.eINSTANCE.createGSSE()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_GetCBValues(),
-                 SclFactory.eINSTANCE.createGetCBValues()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_GetDataObjectDefinition(),
-                 SclFactory.eINSTANCE.createGetDataObjectDefinition()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_GetDataSetValue(),
-                 SclFactory.eINSTANCE.createGetDataSetValue()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_GetDirectory(),
-                 SclFactory.eINSTANCE.createGetDirectory()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_LogSettings(),
-                 SclFactory.eINSTANCE.createLogSettings()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_ReadWrite(),
-                 SclFactory.eINSTANCE.createReadWrite()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_RedProt(),
-                 SclFactory.eINSTANCE.createRedProt()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_ReportSettings(),
-                 SclFactory.eINSTANCE.createReportSettings()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_SMVsc(),
-                 SclFactory.eINSTANCE.createSMVsc()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_SupSubscription(),
-                 SclFactory.eINSTANCE.createSupSubscription()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_ValueHandling(),
-                 SclFactory.eINSTANCE.createValueHandling()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_SetDataSetValue(),
-                 SclFactory.eINSTANCE.createSetDataSetValue()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_SettingGroups(),
-                 SclFactory.eINSTANCE.createSettingGroups()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_TimeSyncProt(),
-                 SclFactory.eINSTANCE.createTimeSyncProt()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_TimerActivatedControl(),
-                 SclFactory.eINSTANCE.createTimerActivatedControl()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getServices_SMVSettings(),
-                 SclFactory.eINSTANCE.createSMVSettings()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_ClientServices(),
+                SclFactory.eINSTANCE.createClientServices() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_CommProt(),
+                SclFactory.eINSTANCE.createCommProt() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_ConfDataSet(),
+                SclFactory.eINSTANCE.createConfDataSet() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_ConfLNs(),
+                SclFactory.eINSTANCE.createConfLNs() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_ConfLdName(),
+                SclFactory.eINSTANCE.createConfLdName() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_ConfLogControl(),
+                SclFactory.eINSTANCE.createConfLogControl() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_ConfReportControl(),
+                SclFactory.eINSTANCE.createConfReportControl() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_ConfSigRef(),
+                SclFactory.eINSTANCE.createConfSigRef() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_DataObjectDirectory(),
+                SclFactory.eINSTANCE.createDataObjectDirectory() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_DataSetDirectory(),
+                SclFactory.eINSTANCE.createDataSetDirectory() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_DynAssociation(),
+                SclFactory.eINSTANCE.createDynAssociation() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_DynDataSet(),
+                SclFactory.eINSTANCE.createDynDataSet() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_FileHandling(),
+                SclFactory.eINSTANCE.createFileHandling() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_GOOSE(),
+                SclFactory.eINSTANCE.createGOOSE() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_GSEDir(),
+                SclFactory.eINSTANCE.createGSEDir() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_GSESettings(),
+                SclFactory.eINSTANCE.createGSESettings() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_GSSE(),
+                SclFactory.eINSTANCE.createGSSE() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_GetCBValues(),
+                SclFactory.eINSTANCE.createGetCBValues() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_GetDataObjectDefinition(),
+                SclFactory.eINSTANCE.createGetDataObjectDefinition() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_GetDataSetValue(),
+                SclFactory.eINSTANCE.createGetDataSetValue() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_GetDirectory(),
+                SclFactory.eINSTANCE.createGetDirectory() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_LogSettings(),
+                SclFactory.eINSTANCE.createLogSettings() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_ReadWrite(),
+                SclFactory.eINSTANCE.createReadWrite() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_RedProt(),
+                SclFactory.eINSTANCE.createRedProt() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_ReportSettings(),
+                SclFactory.eINSTANCE.createReportSettings() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_SMVsc(),
+                SclFactory.eINSTANCE.createSMVsc() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_SupSubscription(),
+                SclFactory.eINSTANCE.createSupSubscription() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_ValueHandling(),
+                SclFactory.eINSTANCE.createValueHandling() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_SetDataSetValue(),
+                SclFactory.eINSTANCE.createSetDataSetValue() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_SettingGroups(),
+                SclFactory.eINSTANCE.createSettingGroups() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_TimeSyncProt(),
+                SclFactory.eINSTANCE.createTimeSyncProt() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_TimerActivatedControl(),
+                SclFactory.eINSTANCE.createTimerActivatedControl() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getServices_SMVSettings(),
+                SclFactory.eINSTANCE.createSMVSettings() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SetDataSetValueItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SetDataSetValueItemProvider.java
index 2463964..b661b77 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SetDataSetValueItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SetDataSetValueItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SetDataSetValue;
  * <!-- end-user-doc -->
  * @generated
  */
-public class SetDataSetValueItemProvider 
-    extends ServiceYesNoItemProvider {
+public class SetDataSetValueItemProvider
+        extends ServiceYesNoItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public SetDataSetValueItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SetDataSetValueItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class SetDataSetValueItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class SetDataSetValueItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SetDataSetValue"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SetDataSetValue" ) );
     }
 
     /**
@@ -80,11 +79,10 @@ public class SetDataSetValueItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        SetDataSetValue setDataSetValue = (SetDataSetValue)object;
-        return getString("_UI_SetDataSetValue_type") + " " + setDataSetValue.getLineNumber();
+    public String getText( Object object ) {
+        SetDataSetValue setDataSetValue = ( SetDataSetValue ) object;
+        return getString( "_UI_SetDataSetValue_type" ) + " " + setDataSetValue.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -94,9 +92,8 @@ public class SetDataSetValueItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -107,8 +104,8 @@ public class SetDataSetValueItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SettingControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SettingControlItemProvider.java
index b701764..7c78e18 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SettingControlItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SettingControlItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class SettingControlItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SettingControlItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SettingControlItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,13 +56,13 @@ public class SettingControlItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addActSGPropertyDescriptor(object);
-            addNumOfSGsPropertyDescriptor(object);
-            addResvTmsPropertyDescriptor(object);
+            addActSGPropertyDescriptor( object );
+            addNumOfSGsPropertyDescriptor( object );
+            addResvTmsPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class SettingControlItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addActSGPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SettingControl_actSG_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SettingControl_actSG_feature", "_UI_SettingControl_type"),
-                 SclPackage.eINSTANCE.getSettingControl_ActSG(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addActSGPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SettingControl_actSG_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SettingControl_actSG_feature",
+                                "_UI_SettingControl_type" ),
+                        SclPackage.eINSTANCE.getSettingControl_ActSG(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,20 +95,20 @@ public class SettingControlItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNumOfSGsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SettingControl_numOfSGs_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SettingControl_numOfSGs_feature", "_UI_SettingControl_type"),
-                 SclPackage.eINSTANCE.getSettingControl_NumOfSGs(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNumOfSGsPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SettingControl_numOfSGs_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SettingControl_numOfSGs_feature",
+                                "_UI_SettingControl_type" ),
+                        SclPackage.eINSTANCE.getSettingControl_NumOfSGs(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -118,20 +117,20 @@ public class SettingControlItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addResvTmsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SettingControl_resvTms_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SettingControl_resvTms_feature", "_UI_SettingControl_type"),
-                 SclPackage.eINSTANCE.getSettingControl_ResvTms(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addResvTmsPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SettingControl_resvTms_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SettingControl_resvTms_feature",
+                                "_UI_SettingControl_type" ),
+                        SclPackage.eINSTANCE.getSettingControl_ResvTms(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -141,8 +140,8 @@ public class SettingControlItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SettingControl"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SettingControl" ) );
     }
 
     /**
@@ -152,11 +151,10 @@ public class SettingControlItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        SettingControl settingControl = (SettingControl)object;
-        return getString("_UI_SettingControl_type") + " " + settingControl.getLineNumber();
+    public String getText( Object object ) {
+        SettingControl settingControl = ( SettingControl ) object;
+        return getString( "_UI_SettingControl_type" ) + " " + settingControl.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -166,17 +164,17 @@ public class SettingControlItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(SettingControl.class)) {
-            case SclPackage.SETTING_CONTROL__ACT_SG:
-            case SclPackage.SETTING_CONTROL__NUM_OF_SGS:
-            case SclPackage.SETTING_CONTROL__RESV_TMS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( SettingControl.class ) ) {
+        case SclPackage.SETTING_CONTROL__ACT_SG:
+        case SclPackage.SETTING_CONTROL__NUM_OF_SGS:
+        case SclPackage.SETTING_CONTROL__RESV_TMS:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -187,8 +185,8 @@ public class SettingControlItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SettingGroupsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SettingGroupsItemProvider.java
index 48666fd..f9b5984 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SettingGroupsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SettingGroupsItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SettingGroups;
  * <!-- end-user-doc -->
  * @generated
  */
-public class SettingGroupsItemProvider 
-    extends SclObjectItemProvider {
+public class SettingGroupsItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public SettingGroupsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SettingGroupsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,9 +57,9 @@ public class SettingGroupsItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -75,11 +74,11 @@ public class SettingGroupsItemProvider
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getSettingGroups_ConfSG());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSettingGroups_SGEdit());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSettingGroups_ConfSG() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSettingGroups_SGEdit() );
         }
         return childrenFeatures;
     }
@@ -90,11 +89,11 @@ public class SettingGroupsItemProvider
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -104,8 +103,8 @@ public class SettingGroupsItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SettingGroups"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SettingGroups" ) );
     }
 
     /**
@@ -115,11 +114,10 @@ public class SettingGroupsItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        SettingGroups settingGroups = (SettingGroups)object;
-        return getString("_UI_SettingGroups_type") + " " + settingGroups.getLineNumber();
+    public String getText( Object object ) {
+        SettingGroups settingGroups = ( SettingGroups ) object;
+        return getString( "_UI_SettingGroups_type" ) + " " + settingGroups.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -129,16 +127,16 @@ public class SettingGroupsItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(SettingGroups.class)) {
-            case SclPackage.SETTING_GROUPS__CONF_SG:
-            case SclPackage.SETTING_GROUPS__SG_EDIT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( SettingGroups.class ) ) {
+        case SclPackage.SETTING_GROUPS__CONF_SG:
+        case SclPackage.SETTING_GROUPS__SG_EDIT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -149,18 +147,14 @@ public class SettingGroupsItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSettingGroups_ConfSG(),
-                 SclFactory.eINSTANCE.createConfSG()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSettingGroups_SGEdit(),
-                 SclFactory.eINSTANCE.createSGEdit()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSettingGroups_ConfSG(),
+                SclFactory.eINSTANCE.createConfSG() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSettingGroups_SGEdit(),
+                SclFactory.eINSTANCE.createSGEdit() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmpRateItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmpRateItemProvider.java
index 4406380..4308a37 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmpRateItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmpRateItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -48,8 +47,8 @@ public class SmpRateItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SmpRateItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SmpRateItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class SmpRateItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addValuePropertyDescriptor(object);
+            addValuePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class SmpRateItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addValuePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SmpRate_value_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SmpRate_value_feature", "_UI_SmpRate_type"),
-                 SclPackage.eINSTANCE.getSmpRate_Value(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValuePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SmpRate_value_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SmpRate_value_feature",
+                                "_UI_SmpRate_type" ),
+                        SclPackage.eINSTANCE.getSmpRate_Value(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,8 +96,8 @@ public class SmpRateItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SmpRate"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SmpRate" ) );
     }
 
     /**
@@ -108,11 +107,10 @@ public class SmpRateItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        SmpRate smpRate = (SmpRate)object;
-        return getString("_UI_SmpRate_type") + " " + smpRate.getLineNumber();
+    public String getText( Object object ) {
+        SmpRate smpRate = ( SmpRate ) object;
+        return getString( "_UI_SmpRate_type" ) + " " + smpRate.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -122,15 +120,15 @@ public class SmpRateItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(SmpRate.class)) {
-            case SclPackage.SMP_RATE__VALUE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( SmpRate.class ) ) {
+        case SclPackage.SMP_RATE__VALUE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -141,8 +139,8 @@ public class SmpRateItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmvOptsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmvOptsItemProvider.java
index e867566..62350fe 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmvOptsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmvOptsItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SmvOpts;
  * <!-- end-user-doc -->
  * @generated
  */
-public class SmvOptsItemProvider 
-    extends SclObjectItemProvider {
+public class SmvOptsItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public SmvOptsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SmvOptsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,18 +57,18 @@ public class SmvOptsItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addDataSetPropertyDescriptor(object);
-            addRefreshTimePropertyDescriptor(object);
-            addSampleRatePropertyDescriptor(object);
-            addSampleSynchronizedPropertyDescriptor(object);
-            addSecurityPropertyDescriptor(object);
-            addTimestampPropertyDescriptor(object);
-            addSynchSourceIdPropertyDescriptor(object);
-            addDataRefPropertyDescriptor(object);
+            addDataSetPropertyDescriptor( object );
+            addRefreshTimePropertyDescriptor( object );
+            addSampleRatePropertyDescriptor( object );
+            addSampleSynchronizedPropertyDescriptor( object );
+            addSecurityPropertyDescriptor( object );
+            addTimestampPropertyDescriptor( object );
+            addSynchSourceIdPropertyDescriptor( object );
+            addDataRefPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -80,20 +79,20 @@ public class SmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDataSetPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_dataSet_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_dataSet_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_DataSet(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDataSetPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_dataSet_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_dataSet_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_DataSet(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -102,20 +101,20 @@ public class SmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefreshTimePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_refreshTime_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_refreshTime_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_RefreshTime(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addRefreshTimePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_refreshTime_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_refreshTime_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_RefreshTime(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -124,20 +123,20 @@ public class SmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSampleRatePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_sampleRate_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_sampleRate_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_SampleRate(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSampleRatePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_sampleRate_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_sampleRate_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_SampleRate(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -146,20 +145,20 @@ public class SmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSampleSynchronizedPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_sampleSynchronized_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_sampleSynchronized_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_SampleSynchronized(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSampleSynchronizedPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_sampleSynchronized_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_sampleSynchronized_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_SampleSynchronized(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -168,20 +167,20 @@ public class SmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSecurityPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_security_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_security_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_Security(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSecurityPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_security_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_security_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_Security(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -190,20 +189,20 @@ public class SmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTimestampPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_timestamp_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_timestamp_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_Timestamp(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTimestampPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_timestamp_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_timestamp_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_Timestamp(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -212,20 +211,20 @@ public class SmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSynchSourceIdPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_synchSourceId_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_synchSourceId_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_SynchSourceId(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSynchSourceIdPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_synchSourceId_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_synchSourceId_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_SynchSourceId(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -234,20 +233,20 @@ public class SmvOptsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDataRefPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgSmvOpts_dataRef_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_dataRef_feature", "_UI_AgSmvOpts_type"),
-                 SclPackage.eINSTANCE.getAgSmvOpts_DataRef(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDataRefPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgSmvOpts_dataRef_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgSmvOpts_dataRef_feature",
+                                "_UI_AgSmvOpts_type" ),
+                        SclPackage.eINSTANCE.getAgSmvOpts_DataRef(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -257,8 +256,8 @@ public class SmvOptsItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SmvOpts"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SmvOpts" ) );
     }
 
     /**
@@ -268,11 +267,10 @@ public class SmvOptsItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        SmvOpts smvOpts = (SmvOpts)object;
-        return getString("_UI_SmvOpts_type") + " " + smvOpts.getLineNumber();
+    public String getText( Object object ) {
+        SmvOpts smvOpts = ( SmvOpts ) object;
+        return getString( "_UI_SmvOpts_type" ) + " " + smvOpts.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -282,22 +280,22 @@ public class SmvOptsItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(SmvOpts.class)) {
-            case SclPackage.SMV_OPTS__DATA_SET:
-            case SclPackage.SMV_OPTS__REFRESH_TIME:
-            case SclPackage.SMV_OPTS__SAMPLE_RATE:
-            case SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED:
-            case SclPackage.SMV_OPTS__SECURITY:
-            case SclPackage.SMV_OPTS__TIMESTAMP:
-            case SclPackage.SMV_OPTS__SYNCH_SOURCE_ID:
-            case SclPackage.SMV_OPTS__DATA_REF:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( SmvOpts.class ) ) {
+        case SclPackage.SMV_OPTS__DATA_SET:
+        case SclPackage.SMV_OPTS__REFRESH_TIME:
+        case SclPackage.SMV_OPTS__SAMPLE_RATE:
+        case SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED:
+        case SclPackage.SMV_OPTS__SECURITY:
+        case SclPackage.SMV_OPTS__TIMESTAMP:
+        case SclPackage.SMV_OPTS__SYNCH_SOURCE_ID:
+        case SclPackage.SMV_OPTS__DATA_REF:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -308,8 +306,8 @@ public class SmvOptsItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubEquipmentItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubEquipmentItemProvider.java
index 6f6770c..d01a6b2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubEquipmentItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubEquipmentItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class SubEquipmentItemProvider extends PowerSystemResourceItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SubEquipmentItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SubEquipmentItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,12 +58,12 @@ public class SubEquipmentItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addVirtualPropertyDescriptor(object);
-            addPhasePropertyDescriptor(object);
+            addVirtualPropertyDescriptor( object );
+            addPhasePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class SubEquipmentItemProvider extends PowerSystemResourceItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPhasePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SubEquipment_phase_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SubEquipment_phase_feature", "_UI_SubEquipment_type"),
-                 SclPackage.eINSTANCE.getSubEquipment_Phase(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPhasePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SubEquipment_phase_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubEquipment_phase_feature",
+                                "_UI_SubEquipment_type" ),
+                        SclPackage.eINSTANCE.getSubEquipment_Phase(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class SubEquipmentItemProvider extends PowerSystemResourceItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addVirtualPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgVirtual_virtual_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgVirtual_virtual_feature", "_UI_AgVirtual_type"),
-                 SclPackage.eINSTANCE.getAgVirtual_Virtual(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addVirtualPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgVirtual_virtual_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgVirtual_virtual_feature",
+                                "_UI_AgVirtual_type" ),
+                        SclPackage.eINSTANCE.getAgVirtual_Virtual(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -122,10 +121,10 @@ public class SubEquipmentItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getSubEquipment_EqFunction());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSubEquipment_EqFunction() );
         }
         return childrenFeatures;
     }
@@ -136,11 +135,11 @@ public class SubEquipmentItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -150,8 +149,8 @@ public class SubEquipmentItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SubEquipment"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SubEquipment" ) );
     }
 
     /**
@@ -161,13 +160,11 @@ public class SubEquipmentItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((SubEquipment)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_SubEquipment_type") :
-            getString("_UI_SubEquipment_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( SubEquipment ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_SubEquipment_type" )
+                : getString( "_UI_SubEquipment_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -177,19 +174,19 @@ public class SubEquipmentItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(SubEquipment.class)) {
-            case SclPackage.SUB_EQUIPMENT__VIRTUAL:
-            case SclPackage.SUB_EQUIPMENT__PHASE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.SUB_EQUIPMENT__EQ_FUNCTION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( SubEquipment.class ) ) {
+        case SclPackage.SUB_EQUIPMENT__VIRTUAL:
+        case SclPackage.SUB_EQUIPMENT__PHASE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.SUB_EQUIPMENT__EQ_FUNCTION:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -200,13 +197,11 @@ public class SubEquipmentItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
 
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSubEquipment_EqFunction(),
-                 SclFactory.eINSTANCE.createEqFunction()));
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSubEquipment_EqFunction(),
+                SclFactory.eINSTANCE.createEqFunction() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubFunctionItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubFunctionItemProvider.java
index c94b38f..8ed0afa 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubFunctionItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubFunctionItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class SubFunctionItemProvider extends PowerSystemResourceItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SubFunctionItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SubFunctionItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class SubFunctionItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTypePropertyDescriptor(object);
+            addTypePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class SubFunctionItemProvider extends PowerSystemResourceItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SubFunction_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SubFunction_type_feature", "_UI_SubFunction_type"),
-                 SclPackage.eINSTANCE.getSubFunction_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SubFunction_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubFunction_type_feature",
+                                "_UI_SubFunction_type" ),
+                        SclPackage.eINSTANCE.getSubFunction_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,12 +98,12 @@ public class SubFunctionItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getSubFunction_ConductingEquipment());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSubFunction_GeneralEquipment());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSubFunction_SubSubFunctions());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSubFunction_ConductingEquipment() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSubFunction_GeneralEquipment() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSubFunction_SubSubFunctions() );
         }
         return childrenFeatures;
     }
@@ -115,11 +114,11 @@ public class SubFunctionItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -129,8 +128,8 @@ public class SubFunctionItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SubFunction"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SubFunction" ) );
     }
 
     /**
@@ -140,13 +139,11 @@ public class SubFunctionItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((SubFunction)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_SubFunction_type") :
-            getString("_UI_SubFunction_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( SubFunction ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_SubFunction_type" )
+                : getString( "_UI_SubFunction_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -156,20 +153,20 @@ public class SubFunctionItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(SubFunction.class)) {
-            case SclPackage.SUB_FUNCTION__TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT:
-            case SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT:
-            case SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( SubFunction.class ) ) {
+        case SclPackage.SUB_FUNCTION__TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT:
+        case SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT:
+        case SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -180,23 +177,17 @@ public class SubFunctionItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSubFunction_ConductingEquipment(),
-                 SclFactory.eINSTANCE.createConductingEquipment()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSubFunction_GeneralEquipment(),
-                 SclFactory.eINSTANCE.createGeneralEquipment()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSubFunction_SubSubFunctions(),
-                 SclFactory.eINSTANCE.createSubFunction()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSubFunction_ConductingEquipment(),
+                SclFactory.eINSTANCE.createConductingEquipment() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSubFunction_GeneralEquipment(),
+                SclFactory.eINSTANCE.createGeneralEquipment() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSubFunction_SubSubFunctions(),
+                SclFactory.eINSTANCE.createSubFunction() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubNetworkItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubNetworkItemProvider.java
index 0dd3357..e4c6c74 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubNetworkItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubNetworkItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class SubNetworkItemProvider extends NamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SubNetworkItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SubNetworkItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class SubNetworkItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTypePropertyDescriptor(object);
+            addTypePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class SubNetworkItemProvider extends NamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SubNetwork_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SubNetwork_type_feature", "_UI_SubNetwork_type"),
-                 SclPackage.eINSTANCE.getSubNetwork_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SubNetwork_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SubNetwork_type_feature",
+                                "_UI_SubNetwork_type" ),
+                        SclPackage.eINSTANCE.getSubNetwork_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,11 +98,11 @@ public class SubNetworkItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getSubNetwork_BitRate());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSubNetwork_ConnectedAP());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSubNetwork_BitRate() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSubNetwork_ConnectedAP() );
         }
         return childrenFeatures;
     }
@@ -114,11 +113,11 @@ public class SubNetworkItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -128,8 +127,8 @@ public class SubNetworkItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SubNetwork"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SubNetwork" ) );
     }
 
     /**
@@ -139,13 +138,11 @@ public class SubNetworkItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((SubNetwork)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_SubNetwork_type") :
-            getString("_UI_SubNetwork_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( SubNetwork ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_SubNetwork_type" )
+                : getString( "_UI_SubNetwork_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -155,19 +152,19 @@ public class SubNetworkItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(SubNetwork.class)) {
-            case SclPackage.SUB_NETWORK__TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.SUB_NETWORK__BIT_RATE:
-            case SclPackage.SUB_NETWORK__CONNECTED_AP:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( SubNetwork.class ) ) {
+        case SclPackage.SUB_NETWORK__TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.SUB_NETWORK__BIT_RATE:
+        case SclPackage.SUB_NETWORK__CONNECTED_AP:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -178,18 +175,14 @@ public class SubNetworkItemProvider extends NamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSubNetwork_BitRate(),
-                 SclFactory.eINSTANCE.createBitRate()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSubNetwork_ConnectedAP(),
-                 SclFactory.eINSTANCE.createConnectedAP()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSubNetwork_BitRate(),
+                SclFactory.eINSTANCE.createBitRate() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSubNetwork_ConnectedAP(),
+                SclFactory.eINSTANCE.createConnectedAP() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubjectItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubjectItemProvider.java
index d5f5251..a5c82b4 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubjectItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubjectItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.Subject;
  * <!-- end-user-doc -->
  * @generated
  */
-public class SubjectItemProvider 
-    extends CertItemProvider {
+public class SubjectItemProvider
+        extends CertItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public SubjectItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SubjectItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class SubjectItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class SubjectItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Subject"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Subject" ) );
     }
 
     /**
@@ -80,13 +79,11 @@ public class SubjectItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((Subject)object).getCommonName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Subject_type") :
-            getString("_UI_Subject_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( Subject ) object ).getCommonName();
+        return label == null || label.length() == 0 ? getString( "_UI_Subject_type" )
+                : getString( "_UI_Subject_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -96,9 +93,8 @@ public class SubjectItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -109,8 +105,8 @@ public class SubjectItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubstationItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubstationItemProvider.java
index 3885582..acd1ed1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubstationItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubstationItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class SubstationItemProvider extends EquipmentContainerItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public SubstationItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SubstationItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,9 +56,9 @@ public class SubstationItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -74,11 +73,11 @@ public class SubstationItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getSubstation_Function());
-            childrenFeatures.add(SclPackage.eINSTANCE.getSubstation_VoltageLevel());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSubstation_Function() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getSubstation_VoltageLevel() );
         }
         return childrenFeatures;
     }
@@ -89,11 +88,11 @@ public class SubstationItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -103,8 +102,8 @@ public class SubstationItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Substation"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Substation" ) );
     }
 
     /**
@@ -114,13 +113,11 @@ public class SubstationItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((Substation)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Substation_type") :
-            getString("_UI_Substation_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( Substation ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_Substation_type" )
+                : getString( "_UI_Substation_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -130,16 +127,16 @@ public class SubstationItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(Substation.class)) {
-            case SclPackage.SUBSTATION__FUNCTION:
-            case SclPackage.SUBSTATION__VOLTAGE_LEVEL:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( Substation.class ) ) {
+        case SclPackage.SUBSTATION__FUNCTION:
+        case SclPackage.SUBSTATION__VOLTAGE_LEVEL:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -150,18 +147,14 @@ public class SubstationItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSubstation_Function(),
-                 SclFactory.eINSTANCE.createFunction()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getSubstation_VoltageLevel(),
-                 SclFactory.eINSTANCE.createVoltageLevel()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSubstation_Function(),
+                SclFactory.eINSTANCE.createFunction() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getSubstation_VoltageLevel(),
+                SclFactory.eINSTANCE.createVoltageLevel() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SupSubscriptionItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SupSubscriptionItemProvider.java
index c9587f3..0ab94d5 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SupSubscriptionItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SupSubscriptionItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SupSubscription;
  * <!-- end-user-doc -->
  * @generated
  */
-public class SupSubscriptionItemProvider 
-    extends SclObjectItemProvider {
+public class SupSubscriptionItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public SupSubscriptionItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public SupSubscriptionItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,12 +57,12 @@ public class SupSubscriptionItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addMaxGoPropertyDescriptor(object);
-            addMaxSvPropertyDescriptor(object);
+            addMaxGoPropertyDescriptor( object );
+            addMaxSvPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,20 @@ public class SupSubscriptionItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMaxGoPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SupSubscription_maxGo_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SupSubscription_maxGo_feature", "_UI_SupSubscription_type"),
-                 SclPackage.eINSTANCE.getSupSubscription_MaxGo(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMaxGoPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SupSubscription_maxGo_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SupSubscription_maxGo_feature",
+                                "_UI_SupSubscription_type" ),
+                        SclPackage.eINSTANCE.getSupSubscription_MaxGo(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,20 +95,20 @@ public class SupSubscriptionItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMaxSvPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SupSubscription_maxSv_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SupSubscription_maxSv_feature", "_UI_SupSubscription_type"),
-                 SclPackage.eINSTANCE.getSupSubscription_MaxSv(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMaxSvPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_SupSubscription_maxSv_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_SupSubscription_maxSv_feature",
+                                "_UI_SupSubscription_type" ),
+                        SclPackage.eINSTANCE.getSupSubscription_MaxSv(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,8 +118,8 @@ public class SupSubscriptionItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SupSubscription"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/SupSubscription" ) );
     }
 
     /**
@@ -130,11 +129,10 @@ public class SupSubscriptionItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        SupSubscription supSubscription = (SupSubscription)object;
-        return getString("_UI_SupSubscription_type") + " " + supSubscription.getLineNumber();
+    public String getText( Object object ) {
+        SupSubscription supSubscription = ( SupSubscription ) object;
+        return getString( "_UI_SupSubscription_type" ) + " " + supSubscription.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -144,16 +142,16 @@ public class SupSubscriptionItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(SupSubscription.class)) {
-            case SclPackage.SUP_SUBSCRIPTION__MAX_GO:
-            case SclPackage.SUP_SUBSCRIPTION__MAX_SV:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( SupSubscription.class ) ) {
+        case SclPackage.SUP_SUBSCRIPTION__MAX_GO:
+        case SclPackage.SUP_SUBSCRIPTION__MAX_SV:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -164,8 +162,8 @@ public class SupSubscriptionItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TapChangerItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TapChangerItemProvider.java
index 2088caf..477e8b9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TapChangerItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TapChangerItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class TapChangerItemProvider extends PowerSystemResourceItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public TapChangerItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public TapChangerItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,12 +58,12 @@ public class TapChangerItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addVirtualPropertyDescriptor(object);
-            addTypePropertyDescriptor(object);
+            addVirtualPropertyDescriptor( object );
+            addTypePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class TapChangerItemProvider extends PowerSystemResourceItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_TapChanger_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_TapChanger_type_feature", "_UI_TapChanger_type"),
-                 SclPackage.eINSTANCE.getTapChanger_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_TapChanger_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_TapChanger_type_feature",
+                                "_UI_TapChanger_type" ),
+                        SclPackage.eINSTANCE.getTapChanger_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class TapChangerItemProvider extends PowerSystemResourceItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addVirtualPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgVirtual_virtual_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgVirtual_virtual_feature", "_UI_AgVirtual_type"),
-                 SclPackage.eINSTANCE.getAgVirtual_Virtual(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addVirtualPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgVirtual_virtual_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgVirtual_virtual_feature",
+                                "_UI_AgVirtual_type" ),
+                        SclPackage.eINSTANCE.getAgVirtual_Virtual(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -122,11 +121,11 @@ public class TapChangerItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getTapChanger_EqFunction());
-            childrenFeatures.add(SclPackage.eINSTANCE.getTapChanger_SubEquipment());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getTapChanger_EqFunction() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getTapChanger_SubEquipment() );
         }
         return childrenFeatures;
     }
@@ -137,11 +136,11 @@ public class TapChangerItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -151,8 +150,8 @@ public class TapChangerItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TapChanger"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TapChanger" ) );
     }
 
     /**
@@ -162,13 +161,11 @@ public class TapChangerItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((TapChanger)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_TapChanger_type") :
-            getString("_UI_TapChanger_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( TapChanger ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_TapChanger_type" )
+                : getString( "_UI_TapChanger_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -178,20 +175,20 @@ public class TapChangerItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(TapChanger.class)) {
-            case SclPackage.TAP_CHANGER__VIRTUAL:
-            case SclPackage.TAP_CHANGER__TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.TAP_CHANGER__EQ_FUNCTION:
-            case SclPackage.TAP_CHANGER__SUB_EQUIPMENT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( TapChanger.class ) ) {
+        case SclPackage.TAP_CHANGER__VIRTUAL:
+        case SclPackage.TAP_CHANGER__TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.TAP_CHANGER__EQ_FUNCTION:
+        case SclPackage.TAP_CHANGER__SUB_EQUIPMENT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -202,18 +199,14 @@ public class TapChangerItemProvider extends PowerSystemResourceItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getTapChanger_EqFunction(),
-                 SclFactory.eINSTANCE.createEqFunction()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getTapChanger_SubEquipment(),
-                 SclFactory.eINSTANCE.createSubEquipment()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getTapChanger_EqFunction(),
+                SclFactory.eINSTANCE.createEqFunction() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getTapChanger_SubEquipment(),
+                SclFactory.eINSTANCE.createSubEquipment() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TerminalItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TerminalItemProvider.java
index 6c9bb86..a419a92 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TerminalItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TerminalItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -46,8 +45,8 @@ public class TerminalItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public TerminalItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public TerminalItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -57,19 +56,19 @@ public class TerminalItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addBayNamePropertyDescriptor(object);
-            addCNodeNamePropertyDescriptor(object);
-            addConnectivityNodePropertyDescriptor(object);
-            addProcessNamePropertyDescriptor(object);
-            addSubstationNamePropertyDescriptor(object);
-            addVoltageLevelNamePropertyDescriptor(object);
-            addRefersToConnectivityNodePropertyDescriptor(object);
-            addNamePropertyDescriptor(object);
-            addLineNamePropertyDescriptor(object);
+            addBayNamePropertyDescriptor( object );
+            addCNodeNamePropertyDescriptor( object );
+            addConnectivityNodePropertyDescriptor( object );
+            addProcessNamePropertyDescriptor( object );
+            addSubstationNamePropertyDescriptor( object );
+            addVoltageLevelNamePropertyDescriptor( object );
+            addRefersToConnectivityNodePropertyDescriptor( object );
+            addNamePropertyDescriptor( object );
+            addLineNamePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -80,20 +79,20 @@ public class TerminalItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addBayNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Terminal_bayName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Terminal_bayName_feature", "_UI_Terminal_type"),
-                 SclPackage.eINSTANCE.getTerminal_BayName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addBayNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Terminal_bayName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Terminal_bayName_feature",
+                                "_UI_Terminal_type" ),
+                        SclPackage.eINSTANCE.getTerminal_BayName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -102,20 +101,20 @@ public class TerminalItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addCNodeNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Terminal_cNodeName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Terminal_cNodeName_feature", "_UI_Terminal_type"),
-                 SclPackage.eINSTANCE.getTerminal_CNodeName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addCNodeNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Terminal_cNodeName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Terminal_cNodeName_feature",
+                                "_UI_Terminal_type" ),
+                        SclPackage.eINSTANCE.getTerminal_CNodeName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -124,20 +123,20 @@ public class TerminalItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addConnectivityNodePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Terminal_connectivityNode_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Terminal_connectivityNode_feature", "_UI_Terminal_type"),
-                 SclPackage.eINSTANCE.getTerminal_ConnectivityNode(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addConnectivityNodePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Terminal_connectivityNode_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Terminal_connectivityNode_feature",
+                                "_UI_Terminal_type" ),
+                        SclPackage.eINSTANCE.getTerminal_ConnectivityNode(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -146,20 +145,20 @@ public class TerminalItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addProcessNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Terminal_processName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Terminal_processName_feature", "_UI_Terminal_type"),
-                 SclPackage.eINSTANCE.getTerminal_ProcessName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addProcessNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Terminal_processName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Terminal_processName_feature",
+                                "_UI_Terminal_type" ),
+                        SclPackage.eINSTANCE.getTerminal_ProcessName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -168,20 +167,20 @@ public class TerminalItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSubstationNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Terminal_substationName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Terminal_substationName_feature", "_UI_Terminal_type"),
-                 SclPackage.eINSTANCE.getTerminal_SubstationName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSubstationNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Terminal_substationName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Terminal_substationName_feature",
+                                "_UI_Terminal_type" ),
+                        SclPackage.eINSTANCE.getTerminal_SubstationName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -190,20 +189,20 @@ public class TerminalItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addVoltageLevelNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Terminal_voltageLevelName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Terminal_voltageLevelName_feature", "_UI_Terminal_type"),
-                 SclPackage.eINSTANCE.getTerminal_VoltageLevelName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addVoltageLevelNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Terminal_voltageLevelName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Terminal_voltageLevelName_feature",
+                                "_UI_Terminal_type" ),
+                        SclPackage.eINSTANCE.getTerminal_VoltageLevelName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -212,20 +211,20 @@ public class TerminalItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addRefersToConnectivityNodePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Terminal_RefersToConnectivityNode_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Terminal_RefersToConnectivityNode_feature", "_UI_Terminal_type"),
-                 SclPackage.eINSTANCE.getTerminal_RefersToConnectivityNode(),
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+    protected void addRefersToConnectivityNodePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Terminal_RefersToConnectivityNode_feature" ),
+                        getString( "_UI_PropertyDescriptor_description",
+                                "_UI_Terminal_RefersToConnectivityNode_feature", "_UI_Terminal_type" ),
+                        SclPackage.eINSTANCE.getTerminal_RefersToConnectivityNode(),
+                        true,
+                        false,
+                        true,
+                        null,
+                        null,
+                        null ) );
     }
 
     /**
@@ -234,53 +233,53 @@ public class TerminalItemProvider extends UnNamingItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Terminal_name_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Terminal_name_feature", "_UI_Terminal_type"),
-                 SclPackage.eINSTANCE.getTerminal_Name(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Terminal_name_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Terminal_name_feature",
+                                "_UI_Terminal_type" ),
+                        SclPackage.eINSTANCE.getTerminal_Name(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
-                /**
-     * This adds a property descriptor for the Line Name feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addLineNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Terminal_lineName_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Terminal_lineName_feature", "_UI_Terminal_type"),
-                 SclPackage.eINSTANCE.getTerminal_LineName(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    /**
+    * This adds a property descriptor for the Line Name feature.
+    * <!-- begin-user-doc -->
+    * <!-- end-user-doc -->
+    * @generated
+    */
+    protected void addLineNamePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Terminal_lineName_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Terminal_lineName_feature",
+                                "_UI_Terminal_type" ),
+                        SclPackage.eINSTANCE.getTerminal_LineName(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
-                /**
-     * This returns Terminal.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
+    /**
+    * This returns Terminal.gif.
+    * <!-- begin-user-doc -->
+    * <!-- end-user-doc -->
+    * @generated
+    */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Terminal"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Terminal" ) );
     }
 
     /**
@@ -290,13 +289,11 @@ public class TerminalItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((Terminal)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_Terminal_type") :
-            getString("_UI_Terminal_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( Terminal ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_Terminal_type" )
+                : getString( "_UI_Terminal_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -306,22 +303,22 @@ public class TerminalItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(Terminal.class)) {
-            case SclPackage.TERMINAL__BAY_NAME:
-            case SclPackage.TERMINAL__CNODE_NAME:
-            case SclPackage.TERMINAL__CONNECTIVITY_NODE:
-            case SclPackage.TERMINAL__PROCESS_NAME:
-            case SclPackage.TERMINAL__SUBSTATION_NAME:
-            case SclPackage.TERMINAL__VOLTAGE_LEVEL_NAME:
-            case SclPackage.TERMINAL__NAME:
-            case SclPackage.TERMINAL__LINE_NAME:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( Terminal.class ) ) {
+        case SclPackage.TERMINAL__BAY_NAME:
+        case SclPackage.TERMINAL__CNODE_NAME:
+        case SclPackage.TERMINAL__CONNECTIVITY_NODE:
+        case SclPackage.TERMINAL__PROCESS_NAME:
+        case SclPackage.TERMINAL__SUBSTATION_NAME:
+        case SclPackage.TERMINAL__VOLTAGE_LEVEL_NAME:
+        case SclPackage.TERMINAL__NAME:
+        case SclPackage.TERMINAL__LINE_NAME:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -332,8 +329,8 @@ public class TerminalItemProvider extends UnNamingItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TextItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TextItemProvider.java
index 2c9d7ab..0fef7f9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TextItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TextItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.Text;
  * <!-- end-user-doc -->
  * @generated
  */
-public class TextItemProvider 
-    extends SclObjectItemProvider {
+public class TextItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TextItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public TextItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,12 +57,12 @@ public class TextItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addSourcePropertyDescriptor(object);
-            addValuePropertyDescriptor(object);
+            addSourcePropertyDescriptor( object );
+            addValuePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,19 @@ public class TextItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSourcePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Text_source_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Text_source_feature", "_UI_Text_type"),
-                 SclPackage.eINSTANCE.getText_Source(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSourcePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Text_source_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Text_source_feature", "_UI_Text_type" ),
+                        SclPackage.eINSTANCE.getText_Source(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,20 +94,19 @@ public class TextItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addValuePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Text_value_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Text_value_feature", "_UI_Text_type"),
-                 SclPackage.eINSTANCE.getText_Value(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValuePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Text_value_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Text_value_feature", "_UI_Text_type" ),
+                        SclPackage.eINSTANCE.getText_Value(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -119,8 +116,8 @@ public class TextItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Text"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Text" ) );
     }
 
     /**
@@ -130,11 +127,10 @@ public class TextItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Text text = (Text)object;
-        return getString("_UI_Text_type") + " " + text.getLineNumber();
+    public String getText( Object object ) {
+        Text text = ( Text ) object;
+        return getString( "_UI_Text_type" ) + " " + text.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -144,16 +140,16 @@ public class TextItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(Text.class)) {
-            case SclPackage.TEXT__SOURCE:
-            case SclPackage.TEXT__VALUE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( Text.class ) ) {
+        case SclPackage.TEXT__SOURCE:
+        case SclPackage.TEXT__VALUE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -164,8 +160,8 @@ public class TextItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TimeSyncProtItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TimeSyncProtItemProvider.java
index 6ed7600..4cda123 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TimeSyncProtItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TimeSyncProtItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.TimeSyncProt;
  * <!-- end-user-doc -->
  * @generated
  */
-public class TimeSyncProtItemProvider 
-    extends SclObjectItemProvider {
+public class TimeSyncProtItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TimeSyncProtItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public TimeSyncProtItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,14 +57,14 @@ public class TimeSyncProtItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
-
-            addC37_238PropertyDescriptor(object);
-            addOtherPropertyDescriptor(object);
-            addSntpPropertyDescriptor(object);
-            addIec61850_9_3PropertyDescriptor(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
+
+            addC37_238PropertyDescriptor( object );
+            addOtherPropertyDescriptor( object );
+            addSntpPropertyDescriptor( object );
+            addIec61850_9_3PropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -76,20 +75,20 @@ public class TimeSyncProtItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addC37_238PropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_TimeSyncProt_c37_238_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_TimeSyncProt_c37_238_feature", "_UI_TimeSyncProt_type"),
-                 SclPackage.eINSTANCE.getTimeSyncProt_C37_238(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addC37_238PropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_TimeSyncProt_c37_238_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_TimeSyncProt_c37_238_feature",
+                                "_UI_TimeSyncProt_type" ),
+                        SclPackage.eINSTANCE.getTimeSyncProt_C37_238(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -98,20 +97,20 @@ public class TimeSyncProtItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addOtherPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_TimeSyncProt_other_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_TimeSyncProt_other_feature", "_UI_TimeSyncProt_type"),
-                 SclPackage.eINSTANCE.getTimeSyncProt_Other(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addOtherPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_TimeSyncProt_other_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_TimeSyncProt_other_feature",
+                                "_UI_TimeSyncProt_type" ),
+                        SclPackage.eINSTANCE.getTimeSyncProt_Other(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -120,20 +119,20 @@ public class TimeSyncProtItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSntpPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_TimeSyncProt_sntp_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_TimeSyncProt_sntp_feature", "_UI_TimeSyncProt_type"),
-                 SclPackage.eINSTANCE.getTimeSyncProt_Sntp(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSntpPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_TimeSyncProt_sntp_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_TimeSyncProt_sntp_feature",
+                                "_UI_TimeSyncProt_type" ),
+                        SclPackage.eINSTANCE.getTimeSyncProt_Sntp(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -142,20 +141,20 @@ public class TimeSyncProtItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addIec61850_9_3PropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_TimeSyncProt_iec61850_9_3_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_TimeSyncProt_iec61850_9_3_feature", "_UI_TimeSyncProt_type"),
-                 SclPackage.eINSTANCE.getTimeSyncProt_Iec61850_9_3(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addIec61850_9_3PropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_TimeSyncProt_iec61850_9_3_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_TimeSyncProt_iec61850_9_3_feature",
+                                "_UI_TimeSyncProt_type" ),
+                        SclPackage.eINSTANCE.getTimeSyncProt_Iec61850_9_3(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -165,8 +164,8 @@ public class TimeSyncProtItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TimeSyncProt"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TimeSyncProt" ) );
     }
 
     /**
@@ -176,11 +175,10 @@ public class TimeSyncProtItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        TimeSyncProt timeSyncProt = (TimeSyncProt)object;
-        return getString("_UI_TimeSyncProt_type") + " " + timeSyncProt.getLineNumber();
+    public String getText( Object object ) {
+        TimeSyncProt timeSyncProt = ( TimeSyncProt ) object;
+        return getString( "_UI_TimeSyncProt_type" ) + " " + timeSyncProt.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -190,18 +188,18 @@ public class TimeSyncProtItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(TimeSyncProt.class)) {
-            case SclPackage.TIME_SYNC_PROT__C37_238:
-            case SclPackage.TIME_SYNC_PROT__OTHER:
-            case SclPackage.TIME_SYNC_PROT__SNTP:
-            case SclPackage.TIME_SYNC_PROT__IEC61850_93:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( TimeSyncProt.class ) ) {
+        case SclPackage.TIME_SYNC_PROT__C37_238:
+        case SclPackage.TIME_SYNC_PROT__OTHER:
+        case SclPackage.TIME_SYNC_PROT__SNTP:
+        case SclPackage.TIME_SYNC_PROT__IEC61850_93:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -212,8 +210,8 @@ public class TimeSyncProtItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TimerActivatedControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TimerActivatedControlItemProvider.java
index 9c2218f..2d28289 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TimerActivatedControlItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TimerActivatedControlItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.TimerActivatedControl;
  * <!-- end-user-doc -->
  * @generated
  */
-public class TimerActivatedControlItemProvider 
-    extends ServiceYesNoItemProvider {
+public class TimerActivatedControlItemProvider
+        extends ServiceYesNoItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TimerActivatedControlItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public TimerActivatedControlItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class TimerActivatedControlItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class TimerActivatedControlItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TimerActivatedControl"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TimerActivatedControl" ) );
     }
 
     /**
@@ -80,11 +79,10 @@ public class TimerActivatedControlItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        TimerActivatedControl timerActivatedControl = (TimerActivatedControl)object;
-        return getString("_UI_TimerActivatedControl_type") + " " + timerActivatedControl.getLineNumber();
+    public String getText( Object object ) {
+        TimerActivatedControl timerActivatedControl = ( TimerActivatedControl ) object;
+        return getString( "_UI_TimerActivatedControl_type" ) + " " + timerActivatedControl.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -94,9 +92,8 @@ public class TimerActivatedControlItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -107,8 +104,8 @@ public class TimerActivatedControlItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TransformerWindingItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TransformerWindingItemProvider.java
index afeebad..2e6f771 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TransformerWindingItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TransformerWindingItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -50,8 +49,8 @@ public class TransformerWindingItemProvider extends AbstractConductingEquipmentI
      * <!-- end-user-doc -->
      * @generated
      */
-    public TransformerWindingItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public TransformerWindingItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -61,11 +60,11 @@ public class TransformerWindingItemProvider extends AbstractConductingEquipmentI
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addTypePropertyDescriptor(object);
+            addTypePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -76,20 +75,20 @@ public class TransformerWindingItemProvider extends AbstractConductingEquipmentI
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_TransformerWinding_type_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_TransformerWinding_type_feature", "_UI_TransformerWinding_type"),
-                 SclPackage.eINSTANCE.getTransformerWinding_Type(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addTypePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_TransformerWinding_type_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_TransformerWinding_type_feature",
+                                "_UI_TransformerWinding_type" ),
+                        SclPackage.eINSTANCE.getTransformerWinding_Type(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -101,12 +100,12 @@ public class TransformerWindingItemProvider extends AbstractConductingEquipmentI
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getTransformerWinding_EqFunction());
-            childrenFeatures.add(SclPackage.eINSTANCE.getTransformerWinding_NeutralPoint());
-            childrenFeatures.add(SclPackage.eINSTANCE.getTransformerWinding_TapChanger());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getTransformerWinding_EqFunction() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getTransformerWinding_NeutralPoint() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getTransformerWinding_TapChanger() );
         }
         return childrenFeatures;
     }
@@ -117,11 +116,11 @@ public class TransformerWindingItemProvider extends AbstractConductingEquipmentI
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -131,8 +130,8 @@ public class TransformerWindingItemProvider extends AbstractConductingEquipmentI
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TransformerWinding"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TransformerWinding" ) );
     }
 
     /**
@@ -142,13 +141,11 @@ public class TransformerWindingItemProvider extends AbstractConductingEquipmentI
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((TransformerWinding)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_TransformerWinding_type") :
-            getString("_UI_TransformerWinding_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( TransformerWinding ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_TransformerWinding_type" )
+                : getString( "_UI_TransformerWinding_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -158,20 +155,20 @@ public class TransformerWindingItemProvider extends AbstractConductingEquipmentI
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(TransformerWinding.class)) {
-            case SclPackage.TRANSFORMER_WINDING__TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION:
-            case SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT:
-            case SclPackage.TRANSFORMER_WINDING__TAP_CHANGER:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( TransformerWinding.class ) ) {
+        case SclPackage.TRANSFORMER_WINDING__TYPE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION:
+        case SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT:
+        case SclPackage.TRANSFORMER_WINDING__TAP_CHANGER:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -182,23 +179,17 @@ public class TransformerWindingItemProvider extends AbstractConductingEquipmentI
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getTransformerWinding_EqFunction(),
-                 SclFactory.eINSTANCE.createEqFunction()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getTransformerWinding_NeutralPoint(),
-                 SclFactory.eINSTANCE.createNeutralPoint()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getTransformerWinding_TapChanger(),
-                 SclFactory.eINSTANCE.createTapChanger()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getTransformerWinding_EqFunction(),
+                SclFactory.eINSTANCE.createEqFunction() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getTransformerWinding_NeutralPoint(),
+                SclFactory.eINSTANCE.createNeutralPoint() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getTransformerWinding_TapChanger(),
+                SclFactory.eINSTANCE.createTapChanger() ) );
     }
 
     /**
@@ -208,26 +199,25 @@ public class TransformerWindingItemProvider extends AbstractConductingEquipmentI
      * @generated
      */
     @Override
-    public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
+    public String getCreateChildText( Object owner, Object feature, Object child, Collection< ? > selection ) {
         Object childFeature = feature;
         Object childObject = child;
 
-        if (childFeature instanceof EStructuralFeature && FeatureMapUtil.isFeatureMap((EStructuralFeature)childFeature)) {
-            FeatureMap.Entry entry = (FeatureMap.Entry)childObject;
+        if( childFeature instanceof EStructuralFeature
+                && FeatureMapUtil.isFeatureMap( ( EStructuralFeature ) childFeature ) ) {
+            FeatureMap.Entry entry = ( FeatureMap.Entry ) childObject;
             childFeature = entry.getEStructuralFeature();
             childObject = entry.getValue();
         }
 
-        boolean qualify =
-            childFeature == SclPackage.eINSTANCE.getAbstractConductingEquipment_Terminal() ||
-            childFeature == SclPackage.eINSTANCE.getTransformerWinding_NeutralPoint();
+        boolean qualify = childFeature == SclPackage.eINSTANCE.getAbstractConductingEquipment_Terminal() ||
+                childFeature == SclPackage.eINSTANCE.getTransformerWinding_NeutralPoint();
 
-        if (qualify) {
-            return getString
-                ("_UI_CreateChild_text2",
-                 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+        if( qualify ) {
+            return getString( "_UI_CreateChild_text2",
+                    new Object[] { getTypeText( childObject ), getFeatureText( childFeature ), getTypeText( owner ) } );
         }
-        return super.getCreateChildText(owner, feature, child, selection);
+        return super.getCreateChildText( owner, feature, child, selection );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TrgOpsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TrgOpsItemProvider.java
index 7e7a532..7681219 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TrgOpsItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TrgOpsItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.TrgOps;
  * <!-- end-user-doc -->
  * @generated
  */
-public class TrgOpsItemProvider 
-    extends SclObjectItemProvider {
+public class TrgOpsItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public TrgOpsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public TrgOpsItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,15 +57,15 @@ public class TrgOpsItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
-
-            addDchgPropertyDescriptor(object);
-            addDupdPropertyDescriptor(object);
-            addGiPropertyDescriptor(object);
-            addPeriodPropertyDescriptor(object);
-            addQchgPropertyDescriptor(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
+
+            addDchgPropertyDescriptor( object );
+            addDupdPropertyDescriptor( object );
+            addGiPropertyDescriptor( object );
+            addPeriodPropertyDescriptor( object );
+            addQchgPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -77,20 +76,19 @@ public class TrgOpsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDchgPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_TrgOps_dchg_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_TrgOps_dchg_feature", "_UI_TrgOps_type"),
-                 SclPackage.eINSTANCE.getTrgOps_Dchg(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDchgPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_TrgOps_dchg_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_TrgOps_dchg_feature", "_UI_TrgOps_type" ),
+                        SclPackage.eINSTANCE.getTrgOps_Dchg(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -99,20 +97,19 @@ public class TrgOpsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDupdPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_TrgOps_dupd_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_TrgOps_dupd_feature", "_UI_TrgOps_type"),
-                 SclPackage.eINSTANCE.getTrgOps_Dupd(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDupdPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_TrgOps_dupd_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_TrgOps_dupd_feature", "_UI_TrgOps_type" ),
+                        SclPackage.eINSTANCE.getTrgOps_Dupd(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -121,20 +118,19 @@ public class TrgOpsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addGiPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_TrgOps_gi_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_TrgOps_gi_feature", "_UI_TrgOps_type"),
-                 SclPackage.eINSTANCE.getTrgOps_Gi(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addGiPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_TrgOps_gi_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_TrgOps_gi_feature", "_UI_TrgOps_type" ),
+                        SclPackage.eINSTANCE.getTrgOps_Gi(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -143,20 +139,20 @@ public class TrgOpsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addPeriodPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_TrgOps_period_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_TrgOps_period_feature", "_UI_TrgOps_type"),
-                 SclPackage.eINSTANCE.getTrgOps_Period(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addPeriodPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_TrgOps_period_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_TrgOps_period_feature",
+                                "_UI_TrgOps_type" ),
+                        SclPackage.eINSTANCE.getTrgOps_Period(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -165,20 +161,19 @@ public class TrgOpsItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addQchgPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_TrgOps_qchg_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_TrgOps_qchg_feature", "_UI_TrgOps_type"),
-                 SclPackage.eINSTANCE.getTrgOps_Qchg(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addQchgPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_TrgOps_qchg_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_TrgOps_qchg_feature", "_UI_TrgOps_type" ),
+                        SclPackage.eINSTANCE.getTrgOps_Qchg(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -188,8 +183,8 @@ public class TrgOpsItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TrgOps"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/TrgOps" ) );
     }
 
     /**
@@ -199,11 +194,10 @@ public class TrgOpsItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        TrgOps trgOps = (TrgOps)object;
-        return getString("_UI_TrgOps_type") + " " + trgOps.getLineNumber();
+    public String getText( Object object ) {
+        TrgOps trgOps = ( TrgOps ) object;
+        return getString( "_UI_TrgOps_type" ) + " " + trgOps.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -213,19 +207,19 @@ public class TrgOpsItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(TrgOps.class)) {
-            case SclPackage.TRG_OPS__DCHG:
-            case SclPackage.TRG_OPS__DUPD:
-            case SclPackage.TRG_OPS__GI:
-            case SclPackage.TRG_OPS__PERIOD:
-            case SclPackage.TRG_OPS__QCHG:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( TrgOps.class ) ) {
+        case SclPackage.TRG_OPS__DCHG:
+        case SclPackage.TRG_OPS__DUPD:
+        case SclPackage.TRG_OPS__GI:
+        case SclPackage.TRG_OPS__PERIOD:
+        case SclPackage.TRG_OPS__QCHG:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -236,8 +230,8 @@ public class TrgOpsItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/UnNamingItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/UnNamingItemProvider.java
index bcdc2d0..03935e5 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/UnNamingItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/UnNamingItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -48,8 +47,8 @@ public class UnNamingItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public UnNamingItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public UnNamingItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,11 +58,11 @@ public class UnNamingItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addDescPropertyDescriptor(object);
+            addDescPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,20 +73,19 @@ public class UnNamingItemProvider extends BaseElementItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addDescPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_AgDesc_desc_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type"),
-                 SclPackage.eINSTANCE.getAgDesc_Desc(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addDescPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_AgDesc_desc_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_AgDesc_desc_feature", "_UI_AgDesc_type" ),
+                        SclPackage.eINSTANCE.getAgDesc_Desc(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,11 +95,10 @@ public class UnNamingItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        UnNaming unNaming = (UnNaming)object;
-        return getString("_UI_UnNaming_type") + " " + unNaming.getLineNumber();
+    public String getText( Object object ) {
+        UnNaming unNaming = ( UnNaming ) object;
+        return getString( "_UI_UnNaming_type" ) + " " + unNaming.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -111,15 +108,15 @@ public class UnNamingItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(UnNaming.class)) {
-            case SclPackage.UN_NAMING__DESC:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( UnNaming.class ) ) {
+        case SclPackage.UN_NAMING__DESC:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -130,8 +127,8 @@ public class UnNamingItemProvider extends BaseElementItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValItemProvider.java
index 56f587e..08f10c0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.Val;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ValItemProvider 
-    extends SclObjectItemProvider {
+public class ValItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public ValItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ValItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,12 +57,12 @@ public class ValItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addSGroupPropertyDescriptor(object);
-            addValuePropertyDescriptor(object);
+            addSGroupPropertyDescriptor( object );
+            addValuePropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -74,53 +73,51 @@ public class ValItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSGroupPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Val_sGroup_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Val_sGroup_feature", "_UI_Val_type"),
-                 SclPackage.eINSTANCE.getVal_SGroup(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSGroupPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Val_sGroup_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Val_sGroup_feature", "_UI_Val_type" ),
+                        SclPackage.eINSTANCE.getVal_SGroup(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
      * This adds a property descriptor for the Value feature.
      * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-	protected void addValuePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_Val_value_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_Val_value_feature", "_UI_Val_type"),
-                 SclPackage.eINSTANCE.getVal_Value(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValuePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_Val_value_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_Val_value_feature", "_UI_Val_type" ),
+                        SclPackage.eINSTANCE.getVal_Value(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
-				/**
-     * This returns Val.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
+    /**
+    * This returns Val.gif.
+    * <!-- begin-user-doc -->
+    * <!-- end-user-doc -->
+    * @generated
+    */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Val"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Val" ) );
     }
 
     /**
@@ -130,11 +127,10 @@ public class ValItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Val val = (Val)object;
-        return getString("_UI_Val_type") + " " + val.getLineNumber();
+    public String getText( Object object ) {
+        Val val = ( Val ) object;
+        return getString( "_UI_Val_type" ) + " " + val.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -144,16 +140,16 @@ public class ValItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(Val.class)) {
-            case SclPackage.VAL__SGROUP:
-            case SclPackage.VAL__VALUE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( Val.class ) ) {
+        case SclPackage.VAL__SGROUP:
+        case SclPackage.VAL__VALUE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -164,8 +160,8 @@ public class ValItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueHandlingItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueHandlingItemProvider.java
index df4c552..cc25a2f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueHandlingItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueHandlingItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -39,16 +38,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.ValueHandling;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ValueHandlingItemProvider 
-    extends SclObjectItemProvider {
+public class ValueHandlingItemProvider
+        extends SclObjectItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public ValueHandlingItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ValueHandlingItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -58,11 +57,11 @@ public class ValueHandlingItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addSetToROPropertyDescriptor(object);
+            addSetToROPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -73,20 +72,20 @@ public class ValueHandlingItemProvider
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addSetToROPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ValueHandling_setToRO_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ValueHandling_setToRO_feature", "_UI_ValueHandling_type"),
-                 SclPackage.eINSTANCE.getValueHandling_SetToRO(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addSetToROPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ValueHandling_setToRO_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ValueHandling_setToRO_feature",
+                                "_UI_ValueHandling_type" ),
+                        SclPackage.eINSTANCE.getValueHandling_SetToRO(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -96,8 +95,8 @@ public class ValueHandlingItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ValueHandling"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ValueHandling" ) );
     }
 
     /**
@@ -107,11 +106,10 @@ public class ValueHandlingItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ValueHandling valueHandling = (ValueHandling)object;
-        return getString("_UI_ValueHandling_type") + " " + valueHandling.getLineNumber();
+    public String getText( Object object ) {
+        ValueHandling valueHandling = ( ValueHandling ) object;
+        return getString( "_UI_ValueHandling_type" ) + " " + valueHandling.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -121,15 +119,15 @@ public class ValueHandlingItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
 
-        switch (notification.getFeatureID(ValueHandling.class)) {
-            case SclPackage.VALUE_HANDLING__SET_TO_RO:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        switch( notification.getFeatureID( ValueHandling.class ) ) {
+        case SclPackage.VALUE_HANDLING__SET_TO_RO:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -140,8 +138,8 @@ public class ValueHandlingItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueWithUnitItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueWithUnitItemProvider.java
index 0da121a..d56d6b9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueWithUnitItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueWithUnitItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -48,8 +47,8 @@ public class ValueWithUnitItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ValueWithUnitItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public ValueWithUnitItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,13 +58,13 @@ public class ValueWithUnitItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addValuePropertyDescriptor(object);
-            addMultiplierPropertyDescriptor(object);
-            addUnitPropertyDescriptor(object);
+            addValuePropertyDescriptor( object );
+            addMultiplierPropertyDescriptor( object );
+            addUnitPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -76,20 +75,20 @@ public class ValueWithUnitItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addValuePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ValueWithUnit_value_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ValueWithUnit_value_feature", "_UI_ValueWithUnit_type"),
-                 SclPackage.eINSTANCE.getValueWithUnit_Value(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addValuePropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ValueWithUnit_value_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ValueWithUnit_value_feature",
+                                "_UI_ValueWithUnit_type" ),
+                        SclPackage.eINSTANCE.getValueWithUnit_Value(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -98,20 +97,20 @@ public class ValueWithUnitItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addMultiplierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ValueWithUnit_multiplier_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ValueWithUnit_multiplier_feature", "_UI_ValueWithUnit_type"),
-                 SclPackage.eINSTANCE.getValueWithUnit_Multiplier(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addMultiplierPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ValueWithUnit_multiplier_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ValueWithUnit_multiplier_feature",
+                                "_UI_ValueWithUnit_type" ),
+                        SclPackage.eINSTANCE.getValueWithUnit_Multiplier(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -120,20 +119,20 @@ public class ValueWithUnitItemProvider extends SclObjectItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addUnitPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ValueWithUnit_unit_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ValueWithUnit_unit_feature", "_UI_ValueWithUnit_type"),
-                 SclPackage.eINSTANCE.getValueWithUnit_Unit(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addUnitPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_ValueWithUnit_unit_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_ValueWithUnit_unit_feature",
+                                "_UI_ValueWithUnit_type" ),
+                        SclPackage.eINSTANCE.getValueWithUnit_Unit(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -143,8 +142,8 @@ public class ValueWithUnitItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ValueWithUnit"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/ValueWithUnit" ) );
     }
 
     /**
@@ -154,11 +153,10 @@ public class ValueWithUnitItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        ValueWithUnit valueWithUnit = (ValueWithUnit)object;
-        return getString("_UI_ValueWithUnit_type") + " " + valueWithUnit.getLineNumber();
+    public String getText( Object object ) {
+        ValueWithUnit valueWithUnit = ( ValueWithUnit ) object;
+        return getString( "_UI_ValueWithUnit_type" ) + " " + valueWithUnit.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -168,17 +166,17 @@ public class ValueWithUnitItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(ValueWithUnit.class)) {
-            case SclPackage.VALUE_WITH_UNIT__VALUE:
-            case SclPackage.VALUE_WITH_UNIT__MULTIPLIER:
-            case SclPackage.VALUE_WITH_UNIT__UNIT:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( ValueWithUnit.class ) ) {
+        case SclPackage.VALUE_WITH_UNIT__VALUE:
+        case SclPackage.VALUE_WITH_UNIT__MULTIPLIER:
+        case SclPackage.VALUE_WITH_UNIT__UNIT:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -189,8 +187,8 @@ public class ValueWithUnitItemProvider extends SclObjectItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/VoltageItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/VoltageItemProvider.java
index b4625a0..578fcdf 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/VoltageItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/VoltageItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,16 +34,16 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.Voltage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class VoltageItemProvider 
-    extends ValueWithUnitItemProvider {
+public class VoltageItemProvider
+        extends ValueWithUnitItemProvider {
     /**
      * This constructs an instance from a factory and a notifier.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    public VoltageItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public VoltageItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -54,9 +53,9 @@ public class VoltageItemProvider
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
         }
         return itemPropertyDescriptors;
@@ -69,8 +68,8 @@ public class VoltageItemProvider
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/Voltage"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/Voltage" ) );
     }
 
     /**
@@ -80,11 +79,10 @@ public class VoltageItemProvider
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        Voltage voltage = (Voltage)object;
-        return getString("_UI_Voltage_type") + " " + voltage.getLineNumber();
+    public String getText( Object object ) {
+        Voltage voltage = ( Voltage ) object;
+        return getString( "_UI_Voltage_type" ) + " " + voltage.getLineNumber();
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -94,9 +92,8 @@ public class VoltageItemProvider
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
     }
 
     /**
@@ -107,8 +104,8 @@ public class VoltageItemProvider
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/VoltageLevelItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/VoltageLevelItemProvider.java
index db07f27..df804ff 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/VoltageLevelItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/VoltageLevelItemProvider.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -48,8 +47,8 @@ public class VoltageLevelItemProvider extends EquipmentContainerItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    public VoltageLevelItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
+    public VoltageLevelItemProvider( AdapterFactory adapterFactory ) {
+        super( adapterFactory );
     }
 
     /**
@@ -59,12 +58,12 @@ public class VoltageLevelItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+    public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
+        if( itemPropertyDescriptors == null ) {
+            super.getPropertyDescriptors( object );
 
-            addNomFreqPropertyDescriptor(object);
-            addNumPhasesPropertyDescriptor(object);
+            addNomFreqPropertyDescriptor( object );
+            addNumPhasesPropertyDescriptor( object );
         }
         return itemPropertyDescriptors;
     }
@@ -75,20 +74,20 @@ public class VoltageLevelItemProvider extends EquipmentContainerItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNomFreqPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_VoltageLevel_nomFreq_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_VoltageLevel_nomFreq_feature", "_UI_VoltageLevel_type"),
-                 SclPackage.eINSTANCE.getVoltageLevel_NomFreq(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNomFreqPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_VoltageLevel_nomFreq_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_VoltageLevel_nomFreq_feature",
+                                "_UI_VoltageLevel_type" ),
+                        SclPackage.eINSTANCE.getVoltageLevel_NomFreq(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -97,20 +96,20 @@ public class VoltageLevelItemProvider extends EquipmentContainerItemProvider {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected void addNumPhasesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_VoltageLevel_numPhases_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_VoltageLevel_numPhases_feature", "_UI_VoltageLevel_type"),
-                 SclPackage.eINSTANCE.getVoltageLevel_NumPhases(),
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+    protected void addNumPhasesPropertyDescriptor( Object object ) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
+                        getResourceLocator(),
+                        getString( "_UI_VoltageLevel_numPhases_feature" ),
+                        getString( "_UI_PropertyDescriptor_description", "_UI_VoltageLevel_numPhases_feature",
+                                "_UI_VoltageLevel_type" ),
+                        SclPackage.eINSTANCE.getVoltageLevel_NumPhases(),
+                        true,
+                        false,
+                        false,
+                        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                        null,
+                        null ) );
     }
 
     /**
@@ -122,12 +121,12 @@ public class VoltageLevelItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(SclPackage.eINSTANCE.getVoltageLevel_Bay());
-            childrenFeatures.add(SclPackage.eINSTANCE.getVoltageLevel_Function());
-            childrenFeatures.add(SclPackage.eINSTANCE.getVoltageLevel_Voltage());
+    public Collection< ? extends EStructuralFeature > getChildrenFeatures( Object object ) {
+        if( childrenFeatures == null ) {
+            super.getChildrenFeatures( object );
+            childrenFeatures.add( SclPackage.eINSTANCE.getVoltageLevel_Bay() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getVoltageLevel_Function() );
+            childrenFeatures.add( SclPackage.eINSTANCE.getVoltageLevel_Voltage() );
         }
         return childrenFeatures;
     }
@@ -138,11 +137,11 @@ public class VoltageLevelItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
+    protected EStructuralFeature getChildFeature( Object object, Object child ) {
         // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
+        return super.getChildFeature( object, child );
     }
 
     /**
@@ -152,8 +151,8 @@ public class VoltageLevelItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/VoltageLevel"));
+    public Object getImage( Object object ) {
+        return overlayImage( object, getResourceLocator().getImage( "full/obj16/VoltageLevel" ) );
     }
 
     /**
@@ -163,13 +162,11 @@ public class VoltageLevelItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public String getText(Object object) {
-        String label = ((VoltageLevel)object).getName();
-        return label == null || label.length() == 0 ?
-            getString("_UI_VoltageLevel_type") :
-            getString("_UI_VoltageLevel_type") + " " + label;
+    public String getText( Object object ) {
+        String label = ( ( VoltageLevel ) object ).getName();
+        return label == null || label.length() == 0 ? getString( "_UI_VoltageLevel_type" )
+                : getString( "_UI_VoltageLevel_type" ) + " " + label;
     }
-    
 
     /**
      * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -179,21 +176,21 @@ public class VoltageLevelItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(VoltageLevel.class)) {
-            case SclPackage.VOLTAGE_LEVEL__NOM_FREQ:
-            case SclPackage.VOLTAGE_LEVEL__NUM_PHASES:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case SclPackage.VOLTAGE_LEVEL__BAY:
-            case SclPackage.VOLTAGE_LEVEL__FUNCTION:
-            case SclPackage.VOLTAGE_LEVEL__VOLTAGE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+    public void notifyChanged( Notification notification ) {
+        updateChildren( notification );
+
+        switch( notification.getFeatureID( VoltageLevel.class ) ) {
+        case SclPackage.VOLTAGE_LEVEL__NOM_FREQ:
+        case SclPackage.VOLTAGE_LEVEL__NUM_PHASES:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
+            return;
+        case SclPackage.VOLTAGE_LEVEL__BAY:
+        case SclPackage.VOLTAGE_LEVEL__FUNCTION:
+        case SclPackage.VOLTAGE_LEVEL__VOLTAGE:
+            fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), true, false ) );
+            return;
         }
-        super.notifyChanged(notification);
+        super.notifyChanged( notification );
     }
 
     /**
@@ -204,23 +201,17 @@ public class VoltageLevelItemProvider extends EquipmentContainerItemProvider {
      * @generated
      */
     @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getVoltageLevel_Bay(),
-                 SclFactory.eINSTANCE.createBay()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getVoltageLevel_Function(),
-                 SclFactory.eINSTANCE.createFunction()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (SclPackage.eINSTANCE.getVoltageLevel_Voltage(),
-                 SclFactory.eINSTANCE.createVoltage()));
+    protected void collectNewChildDescriptors( Collection< Object > newChildDescriptors, Object object ) {
+        super.collectNewChildDescriptors( newChildDescriptors, object );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getVoltageLevel_Bay(),
+                SclFactory.eINSTANCE.createBay() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getVoltageLevel_Function(),
+                SclFactory.eINSTANCE.createFunction() ) );
+
+        newChildDescriptors.add( createChildParameter( SclPackage.eINSTANCE.getVoltageLevel_Voltage(),
+                SclFactory.eINSTANCE.createVoltage() ) );
     }
 
 }
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.genmodel b/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.genmodel
index bf201a0..9a36ea5 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.genmodel
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.genmodel
@@ -5,10 +5,11 @@
     editorDirectory="/fr.centralesupelec.edf.riseclipse.iec61850.scl.editor/src" modelPluginID="fr.centralesupelec.edf.riseclipse.iec61850.scl"
     modelName="SCL" editPluginClass="fr.centralesupelec.edf.riseclipse.iec61850.scl.provider.SCLEditPlugin"
     editorPluginClass="fr.centralesupelec.edf.riseclipse.iec61850.scl.presentation.SCLEditorPlugin"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testSuiteClass="fr.centralesupelec.edf.riseclipse.iec61850.scl.tests.SCLAllTests"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
+    testSuiteClass="fr.centralesupelec.edf.riseclipse.iec61850.scl.tests.SCLAllTests"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
     editPluginID="fr.centralesupelec.edf.riseclipse.iec61850.scl.edit" editorPluginID="fr.centralesupelec.edf.riseclipse.iec61850.scl.editor"
-    operationReflection="true" importOrganizing="true">
+    operationReflection="true" importOrganizing="true" cleanup="true">
   <foreignModel>file:/Z:/CEI/Model4SCL/SCL.ecore</foreignModel>
   <genPackages prefix="Scl" basePackage="fr.centralesupelec.edf.riseclipse.iec61850"
       resource="XML" disposableProviderFactory="true" loadInitialization="true" literalsInterface="false"
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractConductingEquipment.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractConductingEquipment.java
index 8d57a44..7a5c072 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractConductingEquipment.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractConductingEquipment.java
@@ -58,7 +58,7 @@ public interface AbstractConductingEquipment extends Equipment {
      * @model opposite="ParentAbstractConductingEquipment" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<SubEquipment> getSubEquipment();
+    EList< SubEquipment > getSubEquipment();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractConductingEquipment#getSubEquipment <em>Sub Equipment</em>}' containment reference list.
@@ -99,7 +99,7 @@ public interface AbstractConductingEquipment extends Equipment {
      * @model opposite="ParentAbstractConductingEquipment" containment="true" unsettable="true" upper="2" ordered="false"
      * @generated
      */
-    EList<Terminal> getTerminal();
+    EList< Terminal > getTerminal();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractConductingEquipment#getTerminal <em>Terminal</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractDataAttribute.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractDataAttribute.java
index 3d6ae66..a03d20e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractDataAttribute.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractDataAttribute.java
@@ -134,7 +134,7 @@ public interface AbstractDataAttribute extends UnNaming {
      * @see #getCount()
      * @generated
      */
-    void setCount(String value);
+    void setCount( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getCount <em>Count</em>}' attribute.
@@ -406,7 +406,7 @@ public interface AbstractDataAttribute extends UnNaming {
      * @see #getRefersToEnumType()
      * @generated
      */
-    void setRefersToEnumType(EnumType value);
+    void setRefersToEnumType( EnumType value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getRefersToEnumType <em>Refers To Enum Type</em>}' reference.
@@ -449,7 +449,7 @@ public interface AbstractDataAttribute extends UnNaming {
      * @model opposite="ParentAbstractDataAttribute" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Val> getVal();
+    EList< Val > getVal();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getVal <em>Val</em>}' containment reference list.
@@ -498,7 +498,7 @@ public interface AbstractDataAttribute extends UnNaming {
      * @see #getRefersToDAType()
      * @generated
      */
-    void setRefersToDAType(DAType value);
+    void setRefersToDAType( DAType value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getRefersToDAType <em>Refers To DA Type</em>}' reference.
@@ -537,7 +537,7 @@ public interface AbstractDataAttribute extends UnNaming {
      * @model opposite="RefersToAbstractDataAttribute" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<FCDA> getReferredByFCDA();
+    EList< FCDA > getReferredByFCDA();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getReferredByFCDA <em>Referred By FCDA</em>}' reference list.
@@ -574,7 +574,7 @@ public interface AbstractDataAttribute extends UnNaming {
      * @model opposite="RefersToAbstractDataAttribute" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<ExtRef> getReferredByExtRef();
+    EList< ExtRef > getReferredByExtRef();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getReferredByExtRef <em>Referred By Ext Ref</em>}' reference list.
@@ -621,7 +621,7 @@ public interface AbstractDataAttribute extends UnNaming {
      * @see #getName()
      * @generated
      */
-    void setName(String value);
+    void setName( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getName <em>Name</em>}' attribute.
@@ -660,7 +660,7 @@ public interface AbstractDataAttribute extends UnNaming {
      * @model opposite="RefersToAbstractDataAttribute" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<DAI> getReferredByDAI();
+    EList< DAI > getReferredByDAI();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getReferredByDAI <em>Referred By DAI</em>}' reference list.
@@ -697,7 +697,7 @@ public interface AbstractDataAttribute extends UnNaming {
      * @model opposite="RefersToAbstractDataAttribute" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<SDI> getReferredBySDI();
+    EList< SDI > getReferredBySDI();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute#getReferredBySDI <em>Referred By SDI</em>}' reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractDataObject.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractDataObject.java
index b167a5a..5cb6d65 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractDataObject.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractDataObject.java
@@ -66,7 +66,7 @@ public interface AbstractDataObject extends UnNaming {
      * @see #getName()
      * @generated
      */
-    void setName(String value);
+    void setName( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataObject#getName <em>Name</em>}' attribute.
@@ -115,7 +115,7 @@ public interface AbstractDataObject extends UnNaming {
      * @see #getType()
      * @generated
      */
-    void setType(String value);
+    void setType( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataObject#getType <em>Type</em>}' attribute.
@@ -166,7 +166,7 @@ public interface AbstractDataObject extends UnNaming {
      * @see #getRefersToDOType()
      * @generated
      */
-    void setRefersToDOType(DOType value);
+    void setRefersToDOType( DOType value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataObject#getRefersToDOType <em>Refers To DO Type</em>}' reference.
@@ -205,7 +205,7 @@ public interface AbstractDataObject extends UnNaming {
      * @model opposite="RefersToAbstractDataObject" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<ExtRef> getReferredByExtRef();
+    EList< ExtRef > getReferredByExtRef();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataObject#getReferredByExtRef <em>Referred By Ext Ref</em>}' reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractEqFuncSubFunc.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractEqFuncSubFunc.java
index 9f394c9..cddf87f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractEqFuncSubFunc.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AbstractEqFuncSubFunc.java
@@ -112,7 +112,7 @@ public interface AbstractEqFuncSubFunc extends PowerSystemResource {
      * @model opposite="ParentAbstractEqFuncSubFunc" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<EqSubFunction> getEqSubFunction();
+    EList< EqSubFunction > getEqSubFunction();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractEqFuncSubFunc#getEqSubFunction <em>Eq Sub Function</em>}' containment reference list.
@@ -153,7 +153,7 @@ public interface AbstractEqFuncSubFunc extends PowerSystemResource {
      * @model opposite="ParentAbstractEqFuncSubFunc" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<GeneralEquipment> getSubGeneralEquipment();
+    EList< GeneralEquipment > getSubGeneralEquipment();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractEqFuncSubFunc#getSubGeneralEquipment <em>Sub General Equipment</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AccessControl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AccessControl.java
index 72f8ef4..32c947a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AccessControl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AccessControl.java
@@ -59,6 +59,6 @@ public interface AccessControl extends SclObject {
      * @see #getParentLDevice()
      * @generated
      */
-    void setParentLDevice(LDevice value);
+    void setParentLDevice( LDevice value );
 
 } // AccessControl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AccessPoint.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AccessPoint.java
index cace864..88804eb 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AccessPoint.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AccessPoint.java
@@ -236,7 +236,7 @@ public interface AccessPoint extends UnNaming {
      * @see #getParentIED()
      * @generated
      */
-    void setParentIED(IED value);
+    void setParentIED( IED value );
 
     /**
      * Returns the value of the '<em><b>LN</b></em>' containment reference list.
@@ -256,7 +256,7 @@ public interface AccessPoint extends UnNaming {
      * @model opposite="ParentAccessPoint" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<LN> getLN();
+    EList< LN > getLN();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint#getLN <em>LN</em>}' containment reference list.
@@ -297,7 +297,7 @@ public interface AccessPoint extends UnNaming {
      * @model opposite="ParentAccessPoint" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<SMVSecurity> getSMVSecurity();
+    EList< SMVSecurity > getSMVSecurity();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint#getSMVSecurity <em>SMV Security</em>}' containment reference list.
@@ -503,7 +503,7 @@ public interface AccessPoint extends UnNaming {
      * @model opposite="ParentAccessPoint" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<GOOSESecurity> getGOOSESecurity();
+    EList< GOOSESecurity > getGOOSESecurity();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint#getGOOSESecurity <em>GOOSE Security</em>}' containment reference list.
@@ -544,7 +544,7 @@ public interface AccessPoint extends UnNaming {
      * @model opposite="RefersToAccessPoint" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<ServerAt> getReferredByServerAt();
+    EList< ServerAt > getReferredByServerAt();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint#getReferredByServerAt <em>Referred By Server At</em>}' reference list.
@@ -595,7 +595,7 @@ public interface AccessPoint extends UnNaming {
      * @see #getName()
      * @generated
      */
-    void setName(String value);
+    void setName( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint#getName <em>Name</em>}' attribute.
@@ -638,7 +638,7 @@ public interface AccessPoint extends UnNaming {
      * @model opposite="RefersToAccessPoint" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<ConnectedAP> getReferredByConnectedAP();
+    EList< ConnectedAP > getReferredByConnectedAP();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint#getReferredByConnectedAP <em>Referred By Connected AP</em>}' reference list.
@@ -679,7 +679,7 @@ public interface AccessPoint extends UnNaming {
      * @model opposite="RefersToAccessPoint" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<KDC> getReferredByKDC();
+    EList< KDC > getReferredByKDC();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint#getReferredByKDC <em>Referred By KDC</em>}' reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Address.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Address.java
index 18aefa0..945fb08 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Address.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Address.java
@@ -63,7 +63,7 @@ public interface Address extends SclObject {
      * @see #getParentConnectedAP()
      * @generated
      */
-    void setParentConnectedAP(ConnectedAP value);
+    void setParentConnectedAP( ConnectedAP value );
 
     /**
      * Returns the value of the '<em><b>Parent Control Block</b></em>' container reference.
@@ -87,7 +87,7 @@ public interface Address extends SclObject {
      * @see #getParentControlBlock()
      * @generated
      */
-    void setParentControlBlock(ControlBlock value);
+    void setParentControlBlock( ControlBlock value );
 
     /**
      * Returns the value of the '<em><b>P</b></em>' containment reference list.
@@ -107,7 +107,7 @@ public interface Address extends SclObject {
      * @model opposite="ParentAddress" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<P> getP();
+    EList< P > getP();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Address#getP <em>P</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgAuthentication.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgAuthentication.java
index 969155b..a56a485 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgAuthentication.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgAuthentication.java
@@ -67,7 +67,7 @@ public interface AgAuthentication extends EObject {
      * @see #getCertificate()
      * @generated
      */
-    void setCertificate(Boolean value);
+    void setCertificate( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgAuthentication#getCertificate <em>Certificate</em>}' attribute.
@@ -116,7 +116,7 @@ public interface AgAuthentication extends EObject {
      * @see #getNone()
      * @generated
      */
-    void setNone(Boolean value);
+    void setNone( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgAuthentication#getNone <em>None</em>}' attribute.
@@ -165,7 +165,7 @@ public interface AgAuthentication extends EObject {
      * @see #getPassword()
      * @generated
      */
-    void setPassword(Boolean value);
+    void setPassword( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgAuthentication#getPassword <em>Password</em>}' attribute.
@@ -214,7 +214,7 @@ public interface AgAuthentication extends EObject {
      * @see #getStrong()
      * @generated
      */
-    void setStrong(Boolean value);
+    void setStrong( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgAuthentication#getStrong <em>Strong</em>}' attribute.
@@ -263,7 +263,7 @@ public interface AgAuthentication extends EObject {
      * @see #getWeak()
      * @generated
      */
-    void setWeak(Boolean value);
+    void setWeak( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgAuthentication#getWeak <em>Weak</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgDATrgOp.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgDATrgOp.java
index b697f6f..5fd67e8 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgDATrgOp.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgDATrgOp.java
@@ -66,7 +66,7 @@ public interface AgDATrgOp extends EObject {
      * @see #getDchg()
      * @generated
      */
-    void setDchg(Boolean value);
+    void setDchg( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgDATrgOp#getDchg <em>Dchg</em>}' attribute.
@@ -116,7 +116,7 @@ public interface AgDATrgOp extends EObject {
      * @see #getDupd()
      * @generated
      */
-    void setDupd(Boolean value);
+    void setDupd( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgDATrgOp#getDupd <em>Dupd</em>}' attribute.
@@ -166,7 +166,7 @@ public interface AgDATrgOp extends EObject {
      * @see #getQchg()
      * @generated
      */
-    void setQchg(Boolean value);
+    void setQchg( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgDATrgOp#getQchg <em>Qchg</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgDesc.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgDesc.java
index 0b5df21..234189a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgDesc.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgDesc.java
@@ -64,7 +64,7 @@ public interface AgDesc extends EObject {
      * @see #getDesc()
      * @generated
      */
-    void setDesc(String value);
+    void setDesc( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgDesc#getDesc <em>Desc</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgLDRef.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgLDRef.java
index 0a53bf3..e918336 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgLDRef.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgLDRef.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Ag LD Ref</b></em>'.
@@ -63,7 +62,7 @@ public interface AgLDRef extends AgDesc {
      * @see #getIedName()
      * @generated
      */
-    void setIedName(String value);
+    void setIedName( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgLDRef#getIedName <em>Ied Name</em>}' attribute.
@@ -112,7 +111,7 @@ public interface AgLDRef extends AgDesc {
      * @see #getLdInst()
      * @generated
      */
-    void setLdInst(String value);
+    void setLdInst( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgLDRef#getLdInst <em>Ld Inst</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgLNRef.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgLNRef.java
index f342901..18262be 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgLNRef.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgLNRef.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Ag LN Ref</b></em>'.
@@ -64,7 +63,7 @@ public interface AgLNRef extends AgLDRef {
      * @see #getLnClass()
      * @generated
      */
-    void setLnClass(String value);
+    void setLnClass( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgLNRef#getLnClass <em>Ln Class</em>}' attribute.
@@ -113,7 +112,7 @@ public interface AgLNRef extends AgLDRef {
      * @see #getLnInst()
      * @generated
      */
-    void setLnInst(String value);
+    void setLnInst( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgLNRef#getLnInst <em>Ln Inst</em>}' attribute.
@@ -163,7 +162,7 @@ public interface AgLNRef extends AgLDRef {
      * @see #getPrefix()
      * @generated
      */
-    void setPrefix(String value);
+    void setPrefix( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgLNRef#getPrefix <em>Prefix</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgOptFields.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgOptFields.java
index 97f69fd..92f8cf1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgOptFields.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgOptFields.java
@@ -71,7 +71,7 @@ public interface AgOptFields extends EObject {
      * @see #getBufOvfl()
      * @generated
      */
-    void setBufOvfl(Boolean value);
+    void setBufOvfl( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getBufOvfl <em>Buf Ovfl</em>}' attribute.
@@ -120,7 +120,7 @@ public interface AgOptFields extends EObject {
      * @see #getConfigRef()
      * @generated
      */
-    void setConfigRef(Boolean value);
+    void setConfigRef( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getConfigRef <em>Config Ref</em>}' attribute.
@@ -169,7 +169,7 @@ public interface AgOptFields extends EObject {
      * @see #getDataRef()
      * @generated
      */
-    void setDataRef(Boolean value);
+    void setDataRef( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getDataRef <em>Data Ref</em>}' attribute.
@@ -218,7 +218,7 @@ public interface AgOptFields extends EObject {
      * @see #getDataSet()
      * @generated
      */
-    void setDataSet(Boolean value);
+    void setDataSet( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getDataSet <em>Data Set</em>}' attribute.
@@ -267,7 +267,7 @@ public interface AgOptFields extends EObject {
      * @see #getEntryID()
      * @generated
      */
-    void setEntryID(Boolean value);
+    void setEntryID( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getEntryID <em>Entry ID</em>}' attribute.
@@ -316,7 +316,7 @@ public interface AgOptFields extends EObject {
      * @see #getReasonCode()
      * @generated
      */
-    void setReasonCode(Boolean value);
+    void setReasonCode( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getReasonCode <em>Reason Code</em>}' attribute.
@@ -365,7 +365,7 @@ public interface AgOptFields extends EObject {
      * @see #getSeqNum()
      * @generated
      */
-    void setSeqNum(Boolean value);
+    void setSeqNum( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getSeqNum <em>Seq Num</em>}' attribute.
@@ -414,7 +414,7 @@ public interface AgOptFields extends EObject {
      * @see #getTimeStamp()
      * @generated
      */
-    void setTimeStamp(Boolean value);
+    void setTimeStamp( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getTimeStamp <em>Time Stamp</em>}' attribute.
@@ -463,7 +463,7 @@ public interface AgOptFields extends EObject {
      * @see #getSegmentation()
      * @generated
      */
-    void setSegmentation(Boolean value);
+    void setSegmentation( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields#getSegmentation <em>Segmentation</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgSmvOpts.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgSmvOpts.java
index c3aad86..17f96c2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgSmvOpts.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgSmvOpts.java
@@ -70,7 +70,7 @@ public interface AgSmvOpts extends EObject {
      * @see #getDataSet()
      * @generated
      */
-    void setDataSet(Boolean value);
+    void setDataSet( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getDataSet <em>Data Set</em>}' attribute.
@@ -119,7 +119,7 @@ public interface AgSmvOpts extends EObject {
      * @see #getRefreshTime()
      * @generated
      */
-    void setRefreshTime(Boolean value);
+    void setRefreshTime( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getRefreshTime <em>Refresh Time</em>}' attribute.
@@ -168,7 +168,7 @@ public interface AgSmvOpts extends EObject {
      * @see #getSampleRate()
      * @generated
      */
-    void setSampleRate(Boolean value);
+    void setSampleRate( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getSampleRate <em>Sample Rate</em>}' attribute.
@@ -217,7 +217,7 @@ public interface AgSmvOpts extends EObject {
      * @see #getSampleSynchronized()
      * @generated
      */
-    void setSampleSynchronized(Boolean value);
+    void setSampleSynchronized( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getSampleSynchronized <em>Sample Synchronized</em>}' attribute.
@@ -266,7 +266,7 @@ public interface AgSmvOpts extends EObject {
      * @see #getSecurity()
      * @generated
      */
-    void setSecurity(Boolean value);
+    void setSecurity( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getSecurity <em>Security</em>}' attribute.
@@ -315,7 +315,7 @@ public interface AgSmvOpts extends EObject {
      * @see #getTimestamp()
      * @generated
      */
-    void setTimestamp(Boolean value);
+    void setTimestamp( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getTimestamp <em>Timestamp</em>}' attribute.
@@ -364,7 +364,7 @@ public interface AgSmvOpts extends EObject {
      * @see #getSynchSourceId()
      * @generated
      */
-    void setSynchSourceId(Boolean value);
+    void setSynchSourceId( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getSynchSourceId <em>Synch Source Id</em>}' attribute.
@@ -413,7 +413,7 @@ public interface AgSmvOpts extends EObject {
      * @see #getDataRef()
      * @generated
      */
-    void setDataRef(Boolean value);
+    void setDataRef( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts#getDataRef <em>Data Ref</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgVirtual.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgVirtual.java
index 3dcf124..27f0102 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgVirtual.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AgVirtual.java
@@ -63,7 +63,7 @@ public interface AgVirtual extends EObject {
      * @see #getVirtual()
      * @generated
      */
-    void setVirtual(Boolean value);
+    void setVirtual( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AgVirtual#getVirtual <em>Virtual</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AnyLN.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AnyLN.java
index 81953f3..dfa44b6 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AnyLN.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AnyLN.java
@@ -245,7 +245,7 @@ public interface AnyLN extends UnNaming {
      * @see #getRefersToLNodeType()
      * @generated
      */
-    void setRefersToLNodeType(LNodeType value);
+    void setRefersToLNodeType( LNodeType value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getRefersToLNodeType <em>Refers To LNode Type</em>}' reference.
@@ -343,7 +343,7 @@ public interface AnyLN extends UnNaming {
      * @model opposite="ParentAnyLN" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Log> getLog();
+    EList< Log > getLog();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getLog <em>Log</em>}' containment reference list.
@@ -384,7 +384,7 @@ public interface AnyLN extends UnNaming {
      * @model opposite="ParentAnyLN" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<DOI> getDOI();
+    EList< DOI > getDOI();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getDOI <em>DOI</em>}' containment reference list.
@@ -426,7 +426,7 @@ public interface AnyLN extends UnNaming {
      *        extendedMetaData="group='#ControlWithTriggerOpt'"
      * @generated
      */
-    EList<ReportControl> getReportControl();
+    EList< ReportControl > getReportControl();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReportControl <em>Report Control</em>}' containment reference list.
@@ -468,7 +468,7 @@ public interface AnyLN extends UnNaming {
      *        extendedMetaData="group='#ControlWithTriggerOpt'"
      * @generated
      */
-    EList<LogControl> getLogControl();
+    EList< LogControl > getLogControl();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getLogControl <em>Log Control</em>}' containment reference list.
@@ -509,7 +509,7 @@ public interface AnyLN extends UnNaming {
      * @model opposite="ParentAnyLN" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<DataSet> getDataSet();
+    EList< DataSet > getDataSet();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getDataSet <em>Data Set</em>}' containment reference list.
@@ -550,7 +550,7 @@ public interface AnyLN extends UnNaming {
      * @model opposite="RefersToAnyLN" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<ClientLN> getReferredByClientLN();
+    EList< ClientLN > getReferredByClientLN();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredByClientLN <em>Referred By Client LN</em>}' reference list.
@@ -591,7 +591,7 @@ public interface AnyLN extends UnNaming {
      * @model opposite="RefersToAnyLN" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<LogControl> getReferredByLogControl();
+    EList< LogControl > getReferredByLogControl();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredByLogControl <em>Referred By Log Control</em>}' reference list.
@@ -632,7 +632,7 @@ public interface AnyLN extends UnNaming {
      * @model opposite="RefersToAnyLN" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<Association> getReferredByAssociation();
+    EList< Association > getReferredByAssociation();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredByAssociation <em>Referred By Association</em>}' reference list.
@@ -669,7 +669,7 @@ public interface AnyLN extends UnNaming {
      * @model opposite="RefersToAnyLN" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<IEDName> getReferredByIEDName();
+    EList< IEDName > getReferredByIEDName();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredByIEDName <em>Referred By IED Name</em>}' reference list.
@@ -706,7 +706,7 @@ public interface AnyLN extends UnNaming {
      * @model opposite="RefersToAnyLN" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<LNode> getReferredByLNode();
+    EList< LNode > getReferredByLNode();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN#getReferredByLNode <em>Referred By LNode</em>}' reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Association.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Association.java
index 58ed452..88a86fd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Association.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Association.java
@@ -171,7 +171,7 @@ public interface Association extends BaseElement, AgLNRef {
      * @see #getParentServer()
      * @generated
      */
-    void setParentServer(Server value);
+    void setParentServer( Server value );
 
     /**
      * Returns the value of the '<em><b>Refers To Any LN</b></em>' reference.
@@ -203,7 +203,7 @@ public interface Association extends BaseElement, AgLNRef {
      * @see #getRefersToAnyLN()
      * @generated
      */
-    void setRefersToAnyLN(AnyLN value);
+    void setRefersToAnyLN( AnyLN value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Association#getRefersToAnyLN <em>Refers To Any LN</em>}' reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AssociationKindEnum.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AssociationKindEnum.java
index 7f5b1e4..d9a2d7a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AssociationKindEnum.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/AssociationKindEnum.java
@@ -95,7 +95,7 @@ public enum AssociationKindEnum implements Enumerator {
     private static final AssociationKindEnum[] VALUES_ARRAY = new AssociationKindEnum[] {
             PRE_ESTABLISHED,
             PREDEFINED,
-        };
+    };
 
     /**
      * A public read-only list of all the '<em><b>Association Kind Enum</b></em>' enumerators.
@@ -103,7 +103,8 @@ public enum AssociationKindEnum implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List<AssociationKindEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    public static final List< AssociationKindEnum > VALUES = Collections
+            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
      * Returns the '<em><b>Association Kind Enum</b></em>' literal with the specified literal value.
@@ -114,9 +115,9 @@ public enum AssociationKindEnum implements Enumerator {
      * @generated
      */
     public static AssociationKindEnum get( String literal ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             AssociationKindEnum result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
+            if( result.toString().equals( literal ) ) {
                 return result;
             }
         }
@@ -132,9 +133,9 @@ public enum AssociationKindEnum implements Enumerator {
      * @generated
      */
     public static AssociationKindEnum getByName( String name ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             AssociationKindEnum result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
+            if( result.getName().equals( name ) ) {
                 return result;
             }
         }
@@ -150,9 +151,11 @@ public enum AssociationKindEnum implements Enumerator {
      * @generated
      */
     public static AssociationKindEnum get( int value ) {
-        switch (value) {
-            case PRE_ESTABLISHED_VALUE: return PRE_ESTABLISHED;
-            case PREDEFINED_VALUE: return PREDEFINED;
+        switch( value ) {
+        case PRE_ESTABLISHED_VALUE:
+            return PRE_ESTABLISHED;
+        case PREDEFINED_VALUE:
+            return PREDEFINED;
         }
         return null;
     }
@@ -197,7 +200,7 @@ public enum AssociationKindEnum implements Enumerator {
      */
     @Override
     public int getValue() {
-      return value;
+        return value;
     }
 
     /**
@@ -207,7 +210,7 @@ public enum AssociationKindEnum implements Enumerator {
      */
     @Override
     public String getName() {
-      return name;
+        return name;
     }
 
     /**
@@ -217,7 +220,7 @@ public enum AssociationKindEnum implements Enumerator {
      */
     @Override
     public String getLiteral() {
-      return literal;
+        return literal;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Authentication.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Authentication.java
index ce05481..b96c062 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Authentication.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Authentication.java
@@ -59,6 +59,6 @@ public interface Authentication extends SclObject, AgAuthentication {
      * @see #getParentServer()
      * @generated
      */
-    void setParentServer(Server value);
+    void setParentServer( Server value );
 
 } // Authentication
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BDA.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BDA.java
index a58b0e3..bb26d5f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BDA.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BDA.java
@@ -59,6 +59,6 @@ public interface BDA extends AbstractDataAttribute {
      * @see #getParentDAType()
      * @generated
      */
-    void setParentDAType(DAType value);
+    void setParentDAType( DAType value );
 
 } // BDA
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BaseElement.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BaseElement.java
index 32cddc3..e7a4415 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BaseElement.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BaseElement.java
@@ -61,7 +61,7 @@ public interface BaseElement extends SclObject {
      * @model opposite="ParentBaseElement" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Private> getPrivate();
+    EList< Private > getPrivate();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.BaseElement#getPrivate <em>Private</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Bay.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Bay.java
index 2c3c184..33e17c4 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Bay.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Bay.java
@@ -64,7 +64,7 @@ public interface Bay extends EquipmentContainer {
      * @see #getParentVoltageLevel()
      * @generated
      */
-    void setParentVoltageLevel(VoltageLevel value);
+    void setParentVoltageLevel( VoltageLevel value );
 
     /**
      * Returns the value of the '<em><b>Function</b></em>' containment reference list.
@@ -84,7 +84,7 @@ public interface Bay extends EquipmentContainer {
      * @model opposite="ParentBay" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Function> getFunction();
+    EList< Function > getFunction();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay#getFunction <em>Function</em>}' containment reference list.
@@ -125,7 +125,7 @@ public interface Bay extends EquipmentContainer {
      * @model opposite="ParentBay" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<ConnectivityNode> getConnectivityNode();
+    EList< ConnectivityNode > getConnectivityNode();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay#getConnectivityNode <em>Connectivity Node</em>}' containment reference list.
@@ -166,7 +166,7 @@ public interface Bay extends EquipmentContainer {
      * @model opposite="ParentBay" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<ConductingEquipment> getConductingEquipment();
+    EList< ConductingEquipment > getConductingEquipment();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay#getConductingEquipment <em>Conducting Equipment</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BitRate.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BitRate.java
index c0773c5..3503217 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BitRate.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BitRate.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Bit Rate</b></em>'.
@@ -61,5 +60,5 @@ public interface BitRate extends BitRateInMbPerSec {
      * @see #getParentSubNetwork()
      * @generated
      */
-    void setParentSubNetwork(SubNetwork value);
+    void setParentSubNetwork( SubNetwork value );
 } // BitRate
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BitRateInMbPerSec.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BitRateInMbPerSec.java
index 2d1882d..0e93324 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BitRateInMbPerSec.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/BitRateInMbPerSec.java
@@ -22,7 +22,6 @@ package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
 import java.math.BigDecimal;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Bit Rate In Mb Per Sec</b></em>'.
@@ -68,7 +67,7 @@ public interface BitRateInMbPerSec extends SclObject {
      * @see #getValue()
      * @generated
      */
-    void setValue(BigDecimal value);
+    void setValue( BigDecimal value );
 
     /**
      * Returns the value of the '<em><b>Multiplier</b></em>' attribute.
@@ -101,7 +100,7 @@ public interface BitRateInMbPerSec extends SclObject {
      * @see #getMultiplier()
      * @generated
      */
-    void setMultiplier(UnitMultiplierEnum value);
+    void setMultiplier( UnitMultiplierEnum value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.BitRateInMbPerSec#getMultiplier <em>Multiplier</em>}' attribute.
@@ -154,7 +153,7 @@ public interface BitRateInMbPerSec extends SclObject {
      * @see #getUnit()
      * @generated
      */
-    void setUnit(String value);
+    void setUnit( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.BitRateInMbPerSec#getUnit <em>Unit</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Cert.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Cert.java
index 2ceeb9c..aad1b69 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Cert.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Cert.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Cert</b></em>'.
@@ -67,7 +66,7 @@ public interface Cert extends SclObject {
      * @see #getCommonName()
      * @generated
      */
-    void setCommonName(String value);
+    void setCommonName( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Cert#getCommonName <em>Common Name</em>}' attribute.
@@ -120,7 +119,7 @@ public interface Cert extends SclObject {
      * @see #getIdHierarchy()
      * @generated
      */
-    void setIdHierarchy(String value);
+    void setIdHierarchy( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Cert#getIdHierarchy <em>Id Hierarchy</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ClientLN.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ClientLN.java
index 9251837..92df53e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ClientLN.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ClientLN.java
@@ -114,7 +114,7 @@ public interface ClientLN extends SclObject, AgLNRef {
      * @see #getParentRptEnabled()
      * @generated
      */
-    void setParentRptEnabled(RptEnabled value);
+    void setParentRptEnabled( RptEnabled value );
 
     /**
      * Returns the value of the '<em><b>Refers To Any LN</b></em>' reference.
@@ -146,7 +146,7 @@ public interface ClientLN extends SclObject, AgLNRef {
      * @see #getRefersToAnyLN()
      * @generated
      */
-    void setRefersToAnyLN(AnyLN value);
+    void setRefersToAnyLN( AnyLN value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ClientLN#getRefersToAnyLN <em>Refers To Any LN</em>}' reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ClientServices.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ClientServices.java
index d57fcbb..169f9f4 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ClientServices.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ClientServices.java
@@ -658,7 +658,7 @@ public interface ClientServices extends SclObject {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
     /**
      * Returns the value of the '<em><b>Time Sync Prot</b></em>' containment reference.
@@ -743,7 +743,7 @@ public interface ClientServices extends SclObject {
      * @see #getRGOOSE()
      * @generated
      */
-    void setRGOOSE(Boolean value);
+    void setRGOOSE( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ClientServices#getRGOOSE <em>RGOOSE</em>}' attribute.
@@ -796,7 +796,7 @@ public interface ClientServices extends SclObject {
      * @see #getRSV()
      * @generated
      */
-    void setRSV(Boolean value);
+    void setRSV( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ClientServices#getRSV <em>RSV</em>}' attribute.
@@ -849,7 +849,7 @@ public interface ClientServices extends SclObject {
      * @see #getNoIctBinding()
      * @generated
      */
-    void setNoIctBinding(Boolean value);
+    void setNoIctBinding( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ClientServices#getNoIctBinding <em>No Ict Binding</em>}' attribute.
@@ -904,7 +904,7 @@ public interface ClientServices extends SclObject {
      * @see #getMcSecurity()
      * @generated
      */
-    void setMcSecurity(McSecurity value);
+    void setMcSecurity( McSecurity value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ClientServices#getMcSecurity <em>Mc Security</em>}' containment reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/CommProt.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/CommProt.java
index f615d09..25b4456 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/CommProt.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/CommProt.java
@@ -113,6 +113,6 @@ public interface CommProt extends SclObject {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // CommProt
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Communication.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Communication.java
index 7ee37bb..a7dfdf2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Communication.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Communication.java
@@ -58,7 +58,7 @@ public interface Communication extends UnNaming {
      * @model opposite="ParentCommunication" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<SubNetwork> getSubNetwork();
+    EList< SubNetwork > getSubNetwork();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Communication#getSubNetwork <em>Sub Network</em>}' containment reference list.
@@ -103,6 +103,6 @@ public interface Communication extends UnNaming {
      * @see #getParentSCL()
      * @generated
      */
-    void setParentSCL(SCL value);
+    void setParentSCL( SCL value );
 
 } // Communication
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConductingEquipment.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConductingEquipment.java
index 8e7be8c..7a24a40 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConductingEquipment.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConductingEquipment.java
@@ -120,7 +120,7 @@ public interface ConductingEquipment extends AbstractConductingEquipment {
      * @see #getParentBay()
      * @generated
      */
-    void setParentBay(Bay value);
+    void setParentBay( Bay value );
 
     /**
      * Returns the value of the '<em><b>Parent Function</b></em>' container reference.
@@ -144,7 +144,7 @@ public interface ConductingEquipment extends AbstractConductingEquipment {
      * @see #getParentFunction()
      * @generated
      */
-    void setParentFunction(Function value);
+    void setParentFunction( Function value );
 
     /**
      * Returns the value of the '<em><b>Parent Sub Function</b></em>' container reference.
@@ -168,7 +168,7 @@ public interface ConductingEquipment extends AbstractConductingEquipment {
      * @see #getParentSubFunction()
      * @generated
      */
-    void setParentSubFunction(SubFunction value);
+    void setParentSubFunction( SubFunction value );
 
     /**
      * Returns the value of the '<em><b>Eq Function</b></em>' containment reference list.
@@ -188,7 +188,7 @@ public interface ConductingEquipment extends AbstractConductingEquipment {
      * @model opposite="ParentConductingEquipment" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<EqFunction> getEqFunction();
+    EList< EqFunction > getEqFunction();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConductingEquipment#getEqFunction <em>Eq Function</em>}' containment reference list.
@@ -233,7 +233,7 @@ public interface ConductingEquipment extends AbstractConductingEquipment {
      * @see #getParentLine()
      * @generated
      */
-    void setParentLine(Line value);
+    void setParentLine( Line value );
 
     /**
      * Returns the value of the '<em><b>Parent Process</b></em>' container reference.
@@ -257,6 +257,6 @@ public interface ConductingEquipment extends AbstractConductingEquipment {
      * @see #getParentProcess()
      * @generated
      */
-    void setParentProcess(fr.centralesupelec.edf.riseclipse.iec61850.scl.Process value);
+    void setParentProcess( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process value );
 
 } // ConductingEquipment
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfDataSet.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfDataSet.java
index c3883cc..911893b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfDataSet.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfDataSet.java
@@ -59,6 +59,6 @@ public interface ConfDataSet extends ServiceForConfDataSet {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // ConfDataSet
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfLNs.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfLNs.java
index d638122..8e55a15 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfLNs.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfLNs.java
@@ -167,6 +167,6 @@ public interface ConfLNs extends SclObject {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // ConfLNs
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfLdName.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfLdName.java
index 5b6dca5..971fb4b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfLdName.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfLdName.java
@@ -59,6 +59,6 @@ public interface ConfLdName extends ServiceYesNo {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // ConfLdName
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfLogControl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfLogControl.java
index f8ece1e..e6db5b2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfLogControl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfLogControl.java
@@ -59,6 +59,6 @@ public interface ConfLogControl extends ServiceWithMaxNonZero {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // ConfLogControl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfReportControl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfReportControl.java
index ebf0e3f..c622115 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfReportControl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfReportControl.java
@@ -59,6 +59,6 @@ public interface ConfReportControl extends ServiceConfReportControl {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // ConfReportControl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfSG.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfSG.java
index a6cac3f..eb53242 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfSG.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfSG.java
@@ -113,6 +113,6 @@ public interface ConfSG extends SclObject {
      * @see #getParentSettingGroups()
      * @generated
      */
-    void setParentSettingGroups(SettingGroups value);
+    void setParentSettingGroups( SettingGroups value );
 
 } // ConfSG
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfSigRef.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfSigRef.java
index 1bf0398..ce34b2d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfSigRef.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConfSigRef.java
@@ -59,6 +59,6 @@ public interface ConfSigRef extends ServiceWithMaxNonZero {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // ConfSigRef
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConnectedAP.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConnectedAP.java
index 425d0dd..80f67ef 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConnectedAP.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConnectedAP.java
@@ -183,7 +183,7 @@ public interface ConnectedAP extends UnNaming {
      * @see #getRedProt()
      * @generated
      */
-    void setRedProt(String value);
+    void setRedProt( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectedAP#getRedProt <em>Red Prot</em>}' attribute.
@@ -285,7 +285,7 @@ public interface ConnectedAP extends UnNaming {
      * @see #getParentSubNetwork()
      * @generated
      */
-    void setParentSubNetwork(SubNetwork value);
+    void setParentSubNetwork( SubNetwork value );
 
     /**
      * Returns the value of the '<em><b>Refers To Access Point</b></em>' reference.
@@ -317,7 +317,7 @@ public interface ConnectedAP extends UnNaming {
      * @see #getRefersToAccessPoint()
      * @generated
      */
-    void setRefersToAccessPoint(AccessPoint value);
+    void setRefersToAccessPoint( AccessPoint value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectedAP#getRefersToAccessPoint <em>Refers To Access Point</em>}' reference.
@@ -360,7 +360,7 @@ public interface ConnectedAP extends UnNaming {
      * @model opposite="ParentConnectedAP" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<PhysConn> getPhysConn();
+    EList< PhysConn > getPhysConn();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectedAP#getPhysConn <em>Phys Conn</em>}' containment reference list.
@@ -402,7 +402,7 @@ public interface ConnectedAP extends UnNaming {
      *        extendedMetaData="group='#ControlBlock'"
      * @generated
      */
-    EList<GSE> getGSE();
+    EList< GSE > getGSE();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectedAP#getGSE <em>GSE</em>}' containment reference list.
@@ -444,7 +444,7 @@ public interface ConnectedAP extends UnNaming {
      *        extendedMetaData="group='#ControlBlock'"
      * @generated
      */
-    EList<SMV> getSMV();
+    EList< SMV > getSMV();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectedAP#getSMV <em>SMV</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConnectivityNode.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConnectivityNode.java
index adfd851..093a879 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConnectivityNode.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ConnectivityNode.java
@@ -117,7 +117,7 @@ public interface ConnectivityNode extends LNodeContainer {
      * @see #getParentBay()
      * @generated
      */
-    void setParentBay(Bay value);
+    void setParentBay( Bay value );
 
     /**
      * Returns the value of the '<em><b>Referred By Terminal</b></em>' reference list.
@@ -137,7 +137,7 @@ public interface ConnectivityNode extends LNodeContainer {
      * @model opposite="RefersToConnectivityNode" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<Terminal> getReferredByTerminal();
+    EList< Terminal > getReferredByTerminal();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode#getReferredByTerminal <em>Referred By Terminal</em>}' reference list.
@@ -182,6 +182,6 @@ public interface ConnectivityNode extends LNodeContainer {
      * @see #getParentLine()
      * @generated
      */
-    void setParentLine(Line value);
+    void setParentLine( Line value );
 
 } // ConnectivityNode
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Control.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Control.java
index 96e3b77..64413ef 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Control.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Control.java
@@ -125,7 +125,7 @@ public interface Control extends UnNaming {
      * @see #getRefersToDataSet()
      * @generated
      */
-    void setRefersToDataSet(DataSet value);
+    void setRefersToDataSet( DataSet value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Control#getRefersToDataSet <em>Refers To Data Set</em>}' reference.
@@ -178,7 +178,7 @@ public interface Control extends UnNaming {
      * @see #getName()
      * @generated
      */
-    void setName(String value);
+    void setName( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Control#getName <em>Name</em>}' attribute.
@@ -217,7 +217,7 @@ public interface Control extends UnNaming {
      * @model opposite="RefersToControl" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<ExtRef> getReferredByExtRef();
+    EList< ExtRef > getReferredByExtRef();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Control#getReferredByExtRef <em>Referred By Ext Ref</em>}' reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ControlBlock.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ControlBlock.java
index ef165c9..e61e540 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ControlBlock.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ControlBlock.java
@@ -231,7 +231,7 @@ public interface ControlBlock extends UnNaming {
      * @see #getRefersToControlWithIEDName()
      * @generated
      */
-    void setRefersToControlWithIEDName(ControlWithIEDName value);
+    void setRefersToControlWithIEDName( ControlWithIEDName value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlBlock#getRefersToControlWithIEDName <em>Refers To Control With IED Name</em>}' reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ControlWithIEDName.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ControlWithIEDName.java
index 17bba15..eaadecd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ControlWithIEDName.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ControlWithIEDName.java
@@ -113,7 +113,7 @@ public interface ControlWithIEDName extends Control {
      * @model opposite="ParentControlWithIEDName" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<IEDName> getIEDName();
+    EList< IEDName > getIEDName();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlWithIEDName#getIEDName <em>IED Name</em>}' containment reference list.
@@ -154,7 +154,7 @@ public interface ControlWithIEDName extends Control {
      * @model opposite="RefersToControlWithIEDName" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<ControlBlock> getReferredByControlBlock();
+    EList< ControlBlock > getReferredByControlBlock();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlWithIEDName#getReferredByControlBlock <em>Referred By Control Block</em>}' reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DA.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DA.java
index c439d30..0347566 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DA.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DA.java
@@ -119,7 +119,7 @@ public interface DA extends AbstractDataAttribute, AgDATrgOp {
      * @see #getParentDOType()
      * @generated
      */
-    void setParentDOType(DOType value);
+    void setParentDOType( DOType value );
 
     /**
      * Returns the value of the '<em><b>Prot Ns</b></em>' containment reference list.
@@ -139,7 +139,7 @@ public interface DA extends AbstractDataAttribute, AgDATrgOp {
      * @model opposite="ParentDA" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<ProtNs> getProtNs();
+    EList< ProtNs > getProtNs();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DA#getProtNs <em>Prot Ns</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DAI.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DAI.java
index 721e13e..e5f622a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DAI.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DAI.java
@@ -280,7 +280,7 @@ public interface DAI extends UnNaming {
      * @model opposite="ParentDAI" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Val> getVal();
+    EList< Val > getVal();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAI#getVal <em>Val</em>}' containment reference list.
@@ -325,7 +325,7 @@ public interface DAI extends UnNaming {
      * @see #getParentDOI()
      * @generated
      */
-    void setParentDOI(DOI value);
+    void setParentDOI( DOI value );
 
     /**
      * Returns the value of the '<em><b>Parent SDI</b></em>' container reference.
@@ -349,7 +349,7 @@ public interface DAI extends UnNaming {
      * @see #getParentSDI()
      * @generated
      */
-    void setParentSDI(SDI value);
+    void setParentSDI( SDI value );
 
     /**
      * Returns the value of the '<em><b>Name</b></em>' attribute.
@@ -375,7 +375,7 @@ public interface DAI extends UnNaming {
      * @see #getName()
      * @generated
      */
-    void setName(String value);
+    void setName( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAI#getName <em>Name</em>}' attribute.
@@ -426,7 +426,7 @@ public interface DAI extends UnNaming {
      * @see #getRefersToAbstractDataAttribute()
      * @generated
      */
-    void setRefersToAbstractDataAttribute(AbstractDataAttribute value);
+    void setRefersToAbstractDataAttribute( AbstractDataAttribute value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAI#getRefersToAbstractDataAttribute <em>Refers To Abstract Data Attribute</em>}' reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DAType.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DAType.java
index 44d920b..6f64da4 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DAType.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DAType.java
@@ -114,7 +114,7 @@ public interface DAType extends IDNaming {
      * @model opposite="ParentDAType" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<BDA> getBDA();
+    EList< BDA > getBDA();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getBDA <em>BDA</em>}' containment reference list.
@@ -151,7 +151,7 @@ public interface DAType extends IDNaming {
      * @model opposite="RefersToDAType" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<AbstractDataAttribute> getReferredByAbstractDataAttribute();
+    EList< AbstractDataAttribute > getReferredByAbstractDataAttribute();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getReferredByAbstractDataAttribute <em>Referred By Abstract Data Attribute</em>}' reference list.
@@ -196,7 +196,7 @@ public interface DAType extends IDNaming {
      * @see #getParentDataTypeTemplates()
      * @generated
      */
-    void setParentDataTypeTemplates(DataTypeTemplates value);
+    void setParentDataTypeTemplates( DataTypeTemplates value );
 
     /**
      * Returns the value of the '<em><b>Prot Ns</b></em>' containment reference list.
@@ -216,7 +216,7 @@ public interface DAType extends IDNaming {
      * @model opposite="ParentDAType" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<ProtNs> getProtNs();
+    EList< ProtNs > getProtNs();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType#getProtNs <em>Prot Ns</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DO.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DO.java
index 8453d85..b7fd5bb 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DO.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DO.java
@@ -118,7 +118,7 @@ public interface DO extends AbstractDataObject {
      * @see #getParentLNodeType()
      * @generated
      */
-    void setParentLNodeType(LNodeType value);
+    void setParentLNodeType( LNodeType value );
 
     /**
      * Returns the value of the '<em><b>Access Control</b></em>' attribute.
@@ -144,7 +144,7 @@ public interface DO extends AbstractDataObject {
      * @see #getAccessControl()
      * @generated
      */
-    void setAccessControl(String value);
+    void setAccessControl( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DO#getAccessControl <em>Access Control</em>}' attribute.
@@ -183,7 +183,7 @@ public interface DO extends AbstractDataObject {
      * @model opposite="RefersToDO" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<DOI> getReferredByDOI();
+    EList< DOI > getReferredByDOI();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DO#getReferredByDOI <em>Referred By DOI</em>}' reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DOI.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DOI.java
index 7a6637c..6edb2cd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DOI.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DOI.java
@@ -120,7 +120,7 @@ public interface DOI extends UnNaming {
      * @see #getParentAnyLN()
      * @generated
      */
-    void setParentAnyLN(AnyLN value);
+    void setParentAnyLN( AnyLN value );
 
     /**
      * Returns the value of the '<em><b>DAI</b></em>' containment reference list.
@@ -140,7 +140,7 @@ public interface DOI extends UnNaming {
      * @model opposite="ParentDOI" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<DAI> getDAI();
+    EList< DAI > getDAI();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DOI#getDAI <em>DAI</em>}' containment reference list.
@@ -181,7 +181,7 @@ public interface DOI extends UnNaming {
      * @model opposite="ParentDOI" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<SDI> getSDI();
+    EList< SDI > getSDI();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DOI#getSDI <em>SDI</em>}' containment reference list.
@@ -228,7 +228,7 @@ public interface DOI extends UnNaming {
      * @see #getAccessControl()
      * @generated
      */
-    void setAccessControl(String value);
+    void setAccessControl( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DOI#getAccessControl <em>Access Control</em>}' attribute.
@@ -277,7 +277,7 @@ public interface DOI extends UnNaming {
      * @see #getName()
      * @generated
      */
-    void setName(String value);
+    void setName( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DOI#getName <em>Name</em>}' attribute.
@@ -328,7 +328,7 @@ public interface DOI extends UnNaming {
      * @see #getRefersToDO()
      * @generated
      */
-    void setRefersToDO(DO value);
+    void setRefersToDO( DO value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DOI#getRefersToDO <em>Refers To DO</em>}' reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DOType.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DOType.java
index 5c85dc7..b391537 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DOType.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DOType.java
@@ -169,7 +169,7 @@ public interface DOType extends IDNaming {
      * @model opposite="ParentDOType" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<DA> getDA();
+    EList< DA > getDA();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DOType#getDA <em>DA</em>}' containment reference list.
@@ -206,7 +206,7 @@ public interface DOType extends IDNaming {
      * @model opposite="RefersToDOType" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<AbstractDataObject> getReferredByAbstractDataObject();
+    EList< AbstractDataObject > getReferredByAbstractDataObject();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DOType#getReferredByAbstractDataObject <em>Referred By Abstract Data Object</em>}' reference list.
@@ -251,7 +251,7 @@ public interface DOType extends IDNaming {
      * @see #getParentDataTypeTemplates()
      * @generated
      */
-    void setParentDataTypeTemplates(DataTypeTemplates value);
+    void setParentDataTypeTemplates( DataTypeTemplates value );
 
     /**
      * Returns the value of the '<em><b>SDO</b></em>' containment reference list.
@@ -271,7 +271,7 @@ public interface DOType extends IDNaming {
      * @model opposite="ParentDOType" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<SDO> getSDO();
+    EList< SDO > getSDO();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DOType#getSDO <em>SDO</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataObjectDirectory.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataObjectDirectory.java
index c0ef6ff..40169fc 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataObjectDirectory.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataObjectDirectory.java
@@ -59,6 +59,6 @@ public interface DataObjectDirectory extends ServiceYesNo {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // DataObjectDirectory
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataSet.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataSet.java
index 4598b05..3761096 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataSet.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataSet.java
@@ -64,7 +64,7 @@ public interface DataSet extends UnNaming {
      * @see #getParentAnyLN()
      * @generated
      */
-    void setParentAnyLN(AnyLN value);
+    void setParentAnyLN( AnyLN value );
 
     /**
      * Returns the value of the '<em><b>Referred By Control</b></em>' reference list.
@@ -84,7 +84,7 @@ public interface DataSet extends UnNaming {
      * @model opposite="RefersToDataSet" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<Control> getReferredByControl();
+    EList< Control > getReferredByControl();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DataSet#getReferredByControl <em>Referred By Control</em>}' reference list.
@@ -125,7 +125,7 @@ public interface DataSet extends UnNaming {
      * @model opposite="ParentDataSet" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<FCDA> getFCDA();
+    EList< FCDA > getFCDA();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DataSet#getFCDA <em>FCDA</em>}' containment reference list.
@@ -176,7 +176,7 @@ public interface DataSet extends UnNaming {
      * @see #getName()
      * @generated
      */
-    void setName(String value);
+    void setName( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DataSet#getName <em>Name</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataSetDirectory.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataSetDirectory.java
index 4015ab7..ad8fd1b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataSetDirectory.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataSetDirectory.java
@@ -59,6 +59,6 @@ public interface DataSetDirectory extends ServiceYesNo {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // DataSetDirectory
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataTypeTemplates.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataTypeTemplates.java
index 773adf9..0bea1c6 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataTypeTemplates.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DataTypeTemplates.java
@@ -61,7 +61,7 @@ public interface DataTypeTemplates extends SclObject {
      * @model opposite="ParentDataTypeTemplates" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<DAType> getDAType();
+    EList< DAType > getDAType();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DataTypeTemplates#getDAType <em>DA Type</em>}' containment reference list.
@@ -102,7 +102,7 @@ public interface DataTypeTemplates extends SclObject {
      * @model opposite="ParentDataTypeTemplates" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<DOType> getDOType();
+    EList< DOType > getDOType();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DataTypeTemplates#getDOType <em>DO Type</em>}' containment reference list.
@@ -143,7 +143,7 @@ public interface DataTypeTemplates extends SclObject {
      * @model opposite="ParentDataTypeTemplates" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<EnumType> getEnumType();
+    EList< EnumType > getEnumType();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DataTypeTemplates#getEnumType <em>Enum Type</em>}' containment reference list.
@@ -184,7 +184,7 @@ public interface DataTypeTemplates extends SclObject {
      * @model opposite="ParentDataTypeTemplates" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<LNodeType> getLNodeType();
+    EList< LNodeType > getLNodeType();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DataTypeTemplates#getLNodeType <em>LNode Type</em>}' containment reference list.
@@ -229,6 +229,6 @@ public interface DataTypeTemplates extends SclObject {
      * @see #getParentSCL()
      * @generated
      */
-    void setParentSCL(SCL value);
+    void setParentSCL( SCL value );
 
 } // DataTypeTemplates
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DurationInMilliSec.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DurationInMilliSec.java
index cf31aed..fcac608 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DurationInMilliSec.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DurationInMilliSec.java
@@ -67,7 +67,7 @@ public interface DurationInMilliSec extends SclObject {
      * @see #getValue()
      * @generated
      */
-    void setValue(BigDecimal value);
+    void setValue( BigDecimal value );
 
     /**
      * Returns the value of the '<em><b>Multiplier</b></em>' attribute.
@@ -100,7 +100,7 @@ public interface DurationInMilliSec extends SclObject {
      * @see #getMultiplier()
      * @generated
      */
-    void setMultiplier(UnitMultiplierEnum value);
+    void setMultiplier( UnitMultiplierEnum value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DurationInMilliSec#getMultiplier <em>Multiplier</em>}' attribute.
@@ -153,7 +153,7 @@ public interface DurationInMilliSec extends SclObject {
      * @see #getUnit()
      * @generated
      */
-    void setUnit(String value);
+    void setUnit( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DurationInMilliSec#getUnit <em>Unit</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DurationInSec.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DurationInSec.java
index b378c52..6c3ac7b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DurationInSec.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DurationInSec.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Duration In Sec</b></em>'.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DynAssociation.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DynAssociation.java
index c6bc01a..e4789ea 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DynAssociation.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DynAssociation.java
@@ -59,6 +59,6 @@ public interface DynAssociation extends ServiceWithOptionalMax {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // DynAssociation
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DynDataSet.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DynDataSet.java
index 5c6b8f3..e0733ab 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DynDataSet.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/DynDataSet.java
@@ -59,6 +59,6 @@ public interface DynDataSet extends ServiceWithMaxAndMaxAttributes {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // DynDataSet
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EnumType.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EnumType.java
index cee038a..6570a37 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EnumType.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EnumType.java
@@ -59,7 +59,7 @@ public interface EnumType extends IDNaming {
      * @model opposite="RefersToEnumType" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<AbstractDataAttribute> getReferredByAbstractDataAttribute();
+    EList< AbstractDataAttribute > getReferredByAbstractDataAttribute();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.EnumType#getReferredByAbstractDataAttribute <em>Referred By Abstract Data Attribute</em>}' reference list.
@@ -104,7 +104,7 @@ public interface EnumType extends IDNaming {
      * @see #getParentDataTypeTemplates()
      * @generated
      */
-    void setParentDataTypeTemplates(DataTypeTemplates value);
+    void setParentDataTypeTemplates( DataTypeTemplates value );
 
     /**
      * Returns the value of the '<em><b>Enum Val</b></em>' containment reference list.
@@ -124,7 +124,7 @@ public interface EnumType extends IDNaming {
      * @model opposite="ParentEnumType" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<EnumVal> getEnumVal();
+    EList< EnumVal > getEnumVal();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.EnumType#getEnumVal <em>Enum Val</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EnumVal.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EnumVal.java
index 87da8d7..bb35d5e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EnumVal.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EnumVal.java
@@ -114,7 +114,7 @@ public interface EnumVal extends SclObject, AgDesc {
      * @see #getParentEnumType()
      * @generated
      */
-    void setParentEnumType(EnumType value);
+    void setParentEnumType( EnumType value );
 
     /**
      * Returns the value of the '<em><b>Value</b></em>' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EqFunction.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EqFunction.java
index ccd5b00..68ccdc8 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EqFunction.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EqFunction.java
@@ -64,7 +64,7 @@ public interface EqFunction extends AbstractEqFuncSubFunc {
      * @see #getParentConductingEquipment()
      * @generated
      */
-    void setParentConductingEquipment(ConductingEquipment value);
+    void setParentConductingEquipment( ConductingEquipment value );
 
     /**
      * Returns the value of the '<em><b>Parent General Equipment</b></em>' container reference.
@@ -88,7 +88,7 @@ public interface EqFunction extends AbstractEqFuncSubFunc {
      * @see #getParentGeneralEquipment()
      * @generated
      */
-    void setParentGeneralEquipment(GeneralEquipment value);
+    void setParentGeneralEquipment( GeneralEquipment value );
 
     /**
      * Returns the value of the '<em><b>Parent Power Transformer</b></em>' container reference.
@@ -112,7 +112,7 @@ public interface EqFunction extends AbstractEqFuncSubFunc {
      * @see #getParentPowerTransformer()
      * @generated
      */
-    void setParentPowerTransformer(PowerTransformer value);
+    void setParentPowerTransformer( PowerTransformer value );
 
     /**
      * Returns the value of the '<em><b>Parent Sub Equipment</b></em>' container reference.
@@ -136,7 +136,7 @@ public interface EqFunction extends AbstractEqFuncSubFunc {
      * @see #getParentSubEquipment()
      * @generated
      */
-    void setParentSubEquipment(SubEquipment value);
+    void setParentSubEquipment( SubEquipment value );
 
     /**
      * Returns the value of the '<em><b>Parent Transformer Winding</b></em>' container reference.
@@ -160,7 +160,7 @@ public interface EqFunction extends AbstractEqFuncSubFunc {
      * @see #getParentTransformerWinding()
      * @generated
      */
-    void setParentTransformerWinding(TransformerWinding value);
+    void setParentTransformerWinding( TransformerWinding value );
 
     /**
      * Returns the value of the '<em><b>Parent Tap Changer</b></em>' container reference.
@@ -184,6 +184,6 @@ public interface EqFunction extends AbstractEqFuncSubFunc {
      * @see #getParentTapChanger()
      * @generated
      */
-    void setParentTapChanger(TapChanger value);
+    void setParentTapChanger( TapChanger value );
 
 } // EqFunction
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EqSubFunction.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EqSubFunction.java
index e98821d..73e2bcf 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EqSubFunction.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EqSubFunction.java
@@ -59,6 +59,6 @@ public interface EqSubFunction extends AbstractEqFuncSubFunc {
      * @see #getParentAbstractEqFuncSubFunc()
      * @generated
      */
-    void setParentAbstractEqFuncSubFunc(AbstractEqFuncSubFunc value);
+    void setParentAbstractEqFuncSubFunc( AbstractEqFuncSubFunc value );
 
 } // EqSubFunction
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EquipmentContainer.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EquipmentContainer.java
index 8047c0a..8f776df 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EquipmentContainer.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/EquipmentContainer.java
@@ -58,7 +58,7 @@ public interface EquipmentContainer extends PowerSystemResource {
      * @model opposite="ParentEquipmentContainer" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<PowerTransformer> getPowerTransformer();
+    EList< PowerTransformer > getPowerTransformer();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.EquipmentContainer#getPowerTransformer <em>Power Transformer</em>}' containment reference list.
@@ -99,7 +99,7 @@ public interface EquipmentContainer extends PowerSystemResource {
      * @model opposite="ParentEquipmentContainer" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<GeneralEquipment> getGeneralEquipment();
+    EList< GeneralEquipment > getGeneralEquipment();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.EquipmentContainer#getGeneralEquipment <em>General Equipment</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ExtRef.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ExtRef.java
index eaf41e4..38a98df 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ExtRef.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ExtRef.java
@@ -826,7 +826,7 @@ public interface ExtRef extends BaseElement, AgDesc {
      * @see #getParentInputs()
      * @generated
      */
-    void setParentInputs(Inputs value);
+    void setParentInputs( Inputs value );
 
     /**
      * Returns the value of the '<em><b>Refers To Abstract Data Attribute</b></em>' reference.
@@ -854,7 +854,7 @@ public interface ExtRef extends BaseElement, AgDesc {
      * @see #getRefersToAbstractDataAttribute()
      * @generated
      */
-    void setRefersToAbstractDataAttribute(AbstractDataAttribute value);
+    void setRefersToAbstractDataAttribute( AbstractDataAttribute value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ExtRef#getRefersToAbstractDataAttribute <em>Refers To Abstract Data Attribute</em>}' reference.
@@ -905,7 +905,7 @@ public interface ExtRef extends BaseElement, AgDesc {
      * @see #getRefersToAbstractDataObject()
      * @generated
      */
-    void setRefersToAbstractDataObject(AbstractDataObject value);
+    void setRefersToAbstractDataObject( AbstractDataObject value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ExtRef#getRefersToAbstractDataObject <em>Refers To Abstract Data Object</em>}' reference.
@@ -961,7 +961,7 @@ public interface ExtRef extends BaseElement, AgDesc {
      * @see #getPServT()
      * @generated
      */
-    void setPServT(ServiceType value);
+    void setPServT( ServiceType value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ExtRef#getPServT <em>PServ T</em>}' attribute.
@@ -1014,7 +1014,7 @@ public interface ExtRef extends BaseElement, AgDesc {
      * @see #getPLN()
      * @generated
      */
-    void setPLN(String value);
+    void setPLN( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ExtRef#getPLN <em>PLN</em>}' attribute.
@@ -1067,7 +1067,7 @@ public interface ExtRef extends BaseElement, AgDesc {
      * @see #getPDO()
      * @generated
      */
-    void setPDO(String value);
+    void setPDO( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ExtRef#getPDO <em>PDO</em>}' attribute.
@@ -1120,7 +1120,7 @@ public interface ExtRef extends BaseElement, AgDesc {
      * @see #getPDA()
      * @generated
      */
-    void setPDA(String value);
+    void setPDA( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ExtRef#getPDA <em>PDA</em>}' attribute.
@@ -1171,7 +1171,7 @@ public interface ExtRef extends BaseElement, AgDesc {
      * @see #getRefersToControl()
      * @generated
      */
-    void setRefersToControl(Control value);
+    void setRefersToControl( Control value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ExtRef#getRefersToControl <em>Refers To Control</em>}' reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/FCDA.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/FCDA.java
index 5cb95d6..e0c1fcb 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/FCDA.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/FCDA.java
@@ -498,7 +498,7 @@ public interface FCDA extends SclObject {
      * @see #getParentDataSet()
      * @generated
      */
-    void setParentDataSet(DataSet value);
+    void setParentDataSet( DataSet value );
 
     /**
      * Returns the value of the '<em><b>Refers To Abstract Data Attribute</b></em>' reference list.
@@ -514,7 +514,7 @@ public interface FCDA extends SclObject {
      * @model opposite="ReferredByFCDA" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<AbstractDataAttribute> getRefersToAbstractDataAttribute();
+    EList< AbstractDataAttribute > getRefersToAbstractDataAttribute();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.FCDA#getRefersToAbstractDataAttribute <em>Refers To Abstract Data Attribute</em>}' reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/FCEnum.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/FCEnum.java
index 774f605..6e1dafb 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/FCEnum.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/FCEnum.java
@@ -381,7 +381,7 @@ public enum FCEnum implements Enumerator {
             SR,
             BL,
             OR,
-        };
+    };
 
     /**
      * A public read-only list of all the '<em><b>FC Enum</b></em>' enumerators.
@@ -389,7 +389,7 @@ public enum FCEnum implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List<FCEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    public static final List< FCEnum > VALUES = Collections.unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
      * Returns the '<em><b>FC Enum</b></em>' literal with the specified literal value.
@@ -400,9 +400,9 @@ public enum FCEnum implements Enumerator {
      * @generated
      */
     public static FCEnum get( String literal ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             FCEnum result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
+            if( result.toString().equals( literal ) ) {
                 return result;
             }
         }
@@ -418,9 +418,9 @@ public enum FCEnum implements Enumerator {
      * @generated
      */
     public static FCEnum getByName( String name ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             FCEnum result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
+            if( result.getName().equals( name ) ) {
                 return result;
             }
         }
@@ -436,20 +436,33 @@ public enum FCEnum implements Enumerator {
      * @generated
      */
     public static FCEnum get( int value ) {
-        switch (value) {
-            case ST_VALUE: return ST;
-            case MX_VALUE: return MX;
-            case CO_VALUE: return CO;
-            case SP_VALUE: return SP;
-            case SG_VALUE: return SG;
-            case SE_VALUE: return SE;
-            case SV_VALUE: return SV;
-            case CF_VALUE: return CF;
-            case DC_VALUE: return DC;
-            case EX_VALUE: return EX;
-            case SR_VALUE: return SR;
-            case BL_VALUE: return BL;
-            case OR_VALUE: return OR;
+        switch( value ) {
+        case ST_VALUE:
+            return ST;
+        case MX_VALUE:
+            return MX;
+        case CO_VALUE:
+            return CO;
+        case SP_VALUE:
+            return SP;
+        case SG_VALUE:
+            return SG;
+        case SE_VALUE:
+            return SE;
+        case SV_VALUE:
+            return SV;
+        case CF_VALUE:
+            return CF;
+        case DC_VALUE:
+            return DC;
+        case EX_VALUE:
+            return EX;
+        case SR_VALUE:
+            return SR;
+        case BL_VALUE:
+            return BL;
+        case OR_VALUE:
+            return OR;
         }
         return null;
     }
@@ -494,7 +507,7 @@ public enum FCEnum implements Enumerator {
      */
     @Override
     public int getValue() {
-      return value;
+        return value;
     }
 
     /**
@@ -504,7 +517,7 @@ public enum FCEnum implements Enumerator {
      */
     @Override
     public String getName() {
-      return name;
+        return name;
     }
 
     /**
@@ -514,7 +527,7 @@ public enum FCEnum implements Enumerator {
      */
     @Override
     public String getLiteral() {
-      return literal;
+        return literal;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/FileHandling.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/FileHandling.java
index 06be6a7..4a0dd0f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/FileHandling.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/FileHandling.java
@@ -221,6 +221,6 @@ public interface FileHandling extends SclObject {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // FileHandling
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Function.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Function.java
index 2e633d7..f275260 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Function.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Function.java
@@ -121,7 +121,7 @@ public interface Function extends PowerSystemResource {
      * @see #getParentBay()
      * @generated
      */
-    void setParentBay(Bay value);
+    void setParentBay( Bay value );
 
     /**
      * Returns the value of the '<em><b>Conducting Equipment</b></em>' containment reference list.
@@ -141,7 +141,7 @@ public interface Function extends PowerSystemResource {
      * @model opposite="ParentFunction" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<ConductingEquipment> getConductingEquipment();
+    EList< ConductingEquipment > getConductingEquipment();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Function#getConductingEquipment <em>Conducting Equipment</em>}' containment reference list.
@@ -186,7 +186,7 @@ public interface Function extends PowerSystemResource {
      * @see #getParentGeneralEquipmentContainer()
      * @generated
      */
-    void setParentGeneralEquipmentContainer(GeneralEquipmentContainer value);
+    void setParentGeneralEquipmentContainer( GeneralEquipmentContainer value );
 
     /**
      * Returns the value of the '<em><b>Parent Substation</b></em>' container reference.
@@ -210,7 +210,7 @@ public interface Function extends PowerSystemResource {
      * @see #getParentSubstation()
      * @generated
      */
-    void setParentSubstation(Substation value);
+    void setParentSubstation( Substation value );
 
     /**
      * Returns the value of the '<em><b>Parent Voltage Level</b></em>' container reference.
@@ -234,7 +234,7 @@ public interface Function extends PowerSystemResource {
      * @see #getParentVoltageLevel()
      * @generated
      */
-    void setParentVoltageLevel(VoltageLevel value);
+    void setParentVoltageLevel( VoltageLevel value );
 
     /**
      * Returns the value of the '<em><b>Sub Function</b></em>' containment reference list.
@@ -254,7 +254,7 @@ public interface Function extends PowerSystemResource {
      * @model opposite="ParentFunction" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<SubFunction> getSubFunction();
+    EList< SubFunction > getSubFunction();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Function#getSubFunction <em>Sub Function</em>}' containment reference list.
@@ -295,7 +295,7 @@ public interface Function extends PowerSystemResource {
      * @model opposite="ParentFunction" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<GeneralEquipment> getGeneralEquipment();
+    EList< GeneralEquipment > getGeneralEquipment();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Function#getGeneralEquipment <em>General Equipment</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GOOSE.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GOOSE.java
index 6a5dc47..1f23cfa 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GOOSE.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GOOSE.java
@@ -115,7 +115,7 @@ public interface GOOSE extends ServiceWithMax {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
     /**
      * Returns the value of the '<em><b>Goose</b></em>' attribute.
@@ -145,7 +145,7 @@ public interface GOOSE extends ServiceWithMax {
      * @see #getGoose()
      * @generated
      */
-    void setGoose(Boolean value);
+    void setGoose( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GOOSE#getGoose <em>Goose</em>}' attribute.
@@ -198,7 +198,7 @@ public interface GOOSE extends ServiceWithMax {
      * @see #getRGOOSE()
      * @generated
      */
-    void setRGOOSE(Boolean value);
+    void setRGOOSE( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GOOSE#getRGOOSE <em>RGOOSE</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GOOSESecurity.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GOOSESecurity.java
index 3f30cac..e39238b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GOOSESecurity.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GOOSESecurity.java
@@ -59,6 +59,6 @@ public interface GOOSESecurity extends Certificate {
      * @see #getParentAccessPoint()
      * @generated
      */
-    void setParentAccessPoint(AccessPoint value);
+    void setParentAccessPoint( AccessPoint value );
 
 } // GOOSESecurity
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSE.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSE.java
index 7b39068..73a6e2c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSE.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSE.java
@@ -67,7 +67,7 @@ public interface GSE extends ControlBlock {
      * @see #getMaxTime()
      * @generated
      */
-    void setMaxTime(MaxTime value);
+    void setMaxTime( MaxTime value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GSE#getMaxTime <em>Max Time</em>}' containment reference.
@@ -104,6 +104,7 @@ public interface GSE extends ControlBlock {
      * @model opposite="GSE" resolveProxies="false" unsettable="true" ordered="false"
      * @generated
      */
+    @Override
     ConnectedAP getParentConnectedAP();
 
     /**
@@ -114,7 +115,7 @@ public interface GSE extends ControlBlock {
      * @see #getParentConnectedAP()
      * @generated
      */
-    void setParentConnectedAP(ConnectedAP value);
+    void setParentConnectedAP( ConnectedAP value );
 
     /**
      * Returns the value of the '<em><b>Min Time</b></em>' containment reference.
@@ -144,7 +145,7 @@ public interface GSE extends ControlBlock {
      * @see #getMinTime()
      * @generated
      */
-    void setMinTime(MinTime value);
+    void setMinTime( MinTime value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GSE#getMinTime <em>Min Time</em>}' containment reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSEControl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSEControl.java
index f425cda..6242c20 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSEControl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSEControl.java
@@ -284,6 +284,6 @@ public interface GSEControl extends ControlWithIEDName {
      * @see #getParentLN0()
      * @generated
      */
-    void setParentLN0(LN0 value);
+    void setParentLN0( LN0 value );
 
 } // GSEControl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSEControlTypeEnum.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSEControlTypeEnum.java
index d11b62b..8ba0736 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSEControlTypeEnum.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSEControlTypeEnum.java
@@ -95,7 +95,7 @@ public enum GSEControlTypeEnum implements Enumerator {
     private static final GSEControlTypeEnum[] VALUES_ARRAY = new GSEControlTypeEnum[] {
             GSSE,
             GOOSE,
-        };
+    };
 
     /**
      * A public read-only list of all the '<em><b>GSE Control Type Enum</b></em>' enumerators.
@@ -103,7 +103,8 @@ public enum GSEControlTypeEnum implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List<GSEControlTypeEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    public static final List< GSEControlTypeEnum > VALUES = Collections
+            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
      * Returns the '<em><b>GSE Control Type Enum</b></em>' literal with the specified literal value.
@@ -114,9 +115,9 @@ public enum GSEControlTypeEnum implements Enumerator {
      * @generated
      */
     public static GSEControlTypeEnum get( String literal ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             GSEControlTypeEnum result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
+            if( result.toString().equals( literal ) ) {
                 return result;
             }
         }
@@ -132,9 +133,9 @@ public enum GSEControlTypeEnum implements Enumerator {
      * @generated
      */
     public static GSEControlTypeEnum getByName( String name ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             GSEControlTypeEnum result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
+            if( result.getName().equals( name ) ) {
                 return result;
             }
         }
@@ -150,9 +151,11 @@ public enum GSEControlTypeEnum implements Enumerator {
      * @generated
      */
     public static GSEControlTypeEnum get( int value ) {
-        switch (value) {
-            case GSSE_VALUE: return GSSE;
-            case GOOSE_VALUE: return GOOSE;
+        switch( value ) {
+        case GSSE_VALUE:
+            return GSSE;
+        case GOOSE_VALUE:
+            return GOOSE;
         }
         return null;
     }
@@ -197,7 +200,7 @@ public enum GSEControlTypeEnum implements Enumerator {
      */
     @Override
     public int getValue() {
-      return value;
+        return value;
     }
 
     /**
@@ -207,7 +210,7 @@ public enum GSEControlTypeEnum implements Enumerator {
      */
     @Override
     public String getName() {
-      return name;
+        return name;
     }
 
     /**
@@ -217,7 +220,7 @@ public enum GSEControlTypeEnum implements Enumerator {
      */
     @Override
     public String getLiteral() {
-      return literal;
+        return literal;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSEDir.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSEDir.java
index 4c44cd5..599e35f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSEDir.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSEDir.java
@@ -59,6 +59,6 @@ public interface GSEDir extends ServiceYesNo {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // GSEDir
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSESettings.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSESettings.java
index f0e53ef..17c8c91 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSESettings.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSESettings.java
@@ -177,7 +177,7 @@ public interface GSESettings extends ServiceSettings {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
     /**
      * Returns the value of the '<em><b>Mc Security</b></em>' containment reference.
@@ -209,7 +209,7 @@ public interface GSESettings extends ServiceSettings {
      * @see #getMcSecurity()
      * @generated
      */
-    void setMcSecurity(McSecurity value);
+    void setMcSecurity( McSecurity value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GSESettings#getMcSecurity <em>Mc Security</em>}' containment reference.
@@ -262,7 +262,7 @@ public interface GSESettings extends ServiceSettings {
      * @see #getKdaParticipant()
      * @generated
      */
-    void setKdaParticipant(Boolean value);
+    void setKdaParticipant( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GSESettings#getKdaParticipant <em>Kda Participant</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSSE.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSSE.java
index a1ba4e3..73e02f0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSSE.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GSSE.java
@@ -59,6 +59,6 @@ public interface GSSE extends ServiceWithMax {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // GSSE
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GeneralEquipment.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GeneralEquipment.java
index 3ead808..0dd94fe 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GeneralEquipment.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GeneralEquipment.java
@@ -120,7 +120,7 @@ public interface GeneralEquipment extends Equipment {
      * @see #getParentAbstractEqFuncSubFunc()
      * @generated
      */
-    void setParentAbstractEqFuncSubFunc(AbstractEqFuncSubFunc value);
+    void setParentAbstractEqFuncSubFunc( AbstractEqFuncSubFunc value );
 
     /**
      * Returns the value of the '<em><b>Eq Function</b></em>' containment reference list.
@@ -140,7 +140,7 @@ public interface GeneralEquipment extends Equipment {
      * @model opposite="ParentGeneralEquipment" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<EqFunction> getEqFunction();
+    EList< EqFunction > getEqFunction();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GeneralEquipment#getEqFunction <em>Eq Function</em>}' containment reference list.
@@ -185,7 +185,7 @@ public interface GeneralEquipment extends Equipment {
      * @see #getParentEquipmentContainer()
      * @generated
      */
-    void setParentEquipmentContainer(EquipmentContainer value);
+    void setParentEquipmentContainer( EquipmentContainer value );
 
     /**
      * Returns the value of the '<em><b>Parent Function</b></em>' container reference.
@@ -209,7 +209,7 @@ public interface GeneralEquipment extends Equipment {
      * @see #getParentFunction()
      * @generated
      */
-    void setParentFunction(Function value);
+    void setParentFunction( Function value );
 
     /**
      * Returns the value of the '<em><b>Parent General Equipment Container</b></em>' container reference.
@@ -233,7 +233,7 @@ public interface GeneralEquipment extends Equipment {
      * @see #getParentGeneralEquipmentContainer()
      * @generated
      */
-    void setParentGeneralEquipmentContainer(GeneralEquipmentContainer value);
+    void setParentGeneralEquipmentContainer( GeneralEquipmentContainer value );
 
     /**
      * Returns the value of the '<em><b>Parent Sub Function</b></em>' container reference.
@@ -257,6 +257,6 @@ public interface GeneralEquipment extends Equipment {
      * @see #getParentSubFunction()
      * @generated
      */
-    void setParentSubFunction(SubFunction value);
+    void setParentSubFunction( SubFunction value );
 
 } // GeneralEquipment
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GeneralEquipmentContainer.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GeneralEquipmentContainer.java
index e8d0b5d..c611ab0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GeneralEquipmentContainer.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GeneralEquipmentContainer.java
@@ -58,7 +58,7 @@ public interface GeneralEquipmentContainer extends PowerSystemResource {
      * @model opposite="ParentGeneralEquipmentContainer" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Function> getFunction();
+    EList< Function > getFunction();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GeneralEquipmentContainer#getFunction <em>Function</em>}' containment reference list.
@@ -99,7 +99,7 @@ public interface GeneralEquipmentContainer extends PowerSystemResource {
      * @model opposite="ParentGeneralEquipmentContainer" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<GeneralEquipment> getGeneralEquipment();
+    EList< GeneralEquipment > getGeneralEquipment();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GeneralEquipmentContainer#getGeneralEquipment <em>General Equipment</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetCBValues.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetCBValues.java
index 523348c..2739292 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetCBValues.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetCBValues.java
@@ -59,6 +59,6 @@ public interface GetCBValues extends ServiceYesNo {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // GetCBValues
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetDataObjectDefinition.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetDataObjectDefinition.java
index 43edc18..a3ddf8b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetDataObjectDefinition.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetDataObjectDefinition.java
@@ -59,6 +59,6 @@ public interface GetDataObjectDefinition extends ServiceYesNo {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // GetDataObjectDefinition
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetDataSetValue.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetDataSetValue.java
index eb5c924..9cb1fbd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetDataSetValue.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetDataSetValue.java
@@ -59,6 +59,6 @@ public interface GetDataSetValue extends ServiceYesNo {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // GetDataSetValue
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetDirectory.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetDirectory.java
index 42fb3b9..b447f83 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetDirectory.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/GetDirectory.java
@@ -59,6 +59,6 @@ public interface GetDirectory extends ServiceYesNo {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // GetDirectory
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Header.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Header.java
index 7cec6bd..fc3519d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Header.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Header.java
@@ -333,7 +333,7 @@ public interface Header extends SclObject {
      * @see #getParentSCL()
      * @generated
      */
-    void setParentSCL(SCL value);
+    void setParentSCL( SCL value );
 
     /**
      * Returns the value of the '<em><b>Text</b></em>' containment reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/History.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/History.java
index 96ec562..b0ac15e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/History.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/History.java
@@ -62,7 +62,7 @@ public interface History extends SclObject {
      * @see #getParentHeader()
      * @generated
      */
-    void setParentHeader(Header value);
+    void setParentHeader( Header value );
 
     /**
      * Returns the value of the '<em><b>Hitem</b></em>' containment reference list.
@@ -82,7 +82,7 @@ public interface History extends SclObject {
      * @model opposite="ParentHistory" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Hitem> getHitem();
+    EList< Hitem > getHitem();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.History#getHitem <em>Hitem</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Hitem.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Hitem.java
index 8cd4bb4..a14a3e6 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Hitem.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Hitem.java
@@ -383,6 +383,6 @@ public interface Hitem extends SclObject {
      * @see #getParentHistory()
      * @generated
      */
-    void setParentHistory(History value);
+    void setParentHistory( History value );
 
 } // Hitem
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/IED.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/IED.java
index 8da2b08..ed9b2e9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/IED.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/IED.java
@@ -133,7 +133,7 @@ public interface IED extends UnNaming {
      * @see #getEngRight()
      * @generated
      */
-    void setEngRight(String value);
+    void setEngRight( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getEngRight <em>Eng Right</em>}' attribute.
@@ -239,7 +239,7 @@ public interface IED extends UnNaming {
      * @see #getOriginalSclRevision()
      * @generated
      */
-    void setOriginalSclRevision(String value);
+    void setOriginalSclRevision( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getOriginalSclRevision <em>Original Scl Revision</em>}' attribute.
@@ -292,7 +292,7 @@ public interface IED extends UnNaming {
      * @see #getOriginalSclVersion()
      * @generated
      */
-    void setOriginalSclVersion(String value);
+    void setOriginalSclVersion( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getOriginalSclVersion <em>Original Scl Version</em>}' attribute.
@@ -441,7 +441,7 @@ public interface IED extends UnNaming {
      * @model opposite="ParentIED" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<AccessPoint> getAccessPoint();
+    EList< AccessPoint > getAccessPoint();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getAccessPoint <em>Access Point</em>}' containment reference list.
@@ -482,7 +482,7 @@ public interface IED extends UnNaming {
      * @model opposite="ParentIED" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<KDC> getKDC();
+    EList< KDC > getKDC();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getKDC <em>KDC</em>}' containment reference list.
@@ -582,7 +582,7 @@ public interface IED extends UnNaming {
      * @see #getParentSCL()
      * @generated
      */
-    void setParentSCL(SCL value);
+    void setParentSCL( SCL value );
 
     /**
      * Returns the value of the '<em><b>Name</b></em>' attribute.
@@ -612,7 +612,7 @@ public interface IED extends UnNaming {
      * @see #getName()
      * @generated
      */
-    void setName(String value);
+    void setName( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getName <em>Name</em>}' attribute.
@@ -665,7 +665,7 @@ public interface IED extends UnNaming {
      * @see #getOriginalSclRelease()
      * @generated
      */
-    void setOriginalSclRelease(Integer value);
+    void setOriginalSclRelease( Integer value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getOriginalSclRelease <em>Original Scl Release</em>}' attribute.
@@ -716,7 +716,7 @@ public interface IED extends UnNaming {
      * @see #getReferredByIEDName()
      * @generated
      */
-    void setReferredByIEDName(IEDName value);
+    void setReferredByIEDName( IEDName value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IED#getReferredByIEDName <em>Referred By IED Name</em>}' reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/IEDName.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/IEDName.java
index 3611fe5..7884297 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/IEDName.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/IEDName.java
@@ -334,7 +334,7 @@ public interface IEDName extends SclObject {
      * @see #getParentControlWithIEDName()
      * @generated
      */
-    void setParentControlWithIEDName(ControlWithIEDName value);
+    void setParentControlWithIEDName( ControlWithIEDName value );
 
     /**
      * Returns the value of the '<em><b>Refers To Any LN</b></em>' reference.
@@ -366,7 +366,7 @@ public interface IEDName extends SclObject {
      * @see #getRefersToAnyLN()
      * @generated
      */
-    void setRefersToAnyLN(AnyLN value);
+    void setRefersToAnyLN( AnyLN value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IEDName#getRefersToAnyLN <em>Refers To Any LN</em>}' reference.
@@ -420,7 +420,7 @@ public interface IEDName extends SclObject {
      * @see #getValue()
      * @generated
      */
-    void setValue(String value);
+    void setValue( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IEDName#getValue <em>Value</em>}' attribute.
@@ -471,7 +471,7 @@ public interface IEDName extends SclObject {
      * @see #getRefersToIED()
      * @generated
      */
-    void setRefersToIED(IED value);
+    void setRefersToIED( IED value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IEDName#getRefersToIED <em>Refers To IED</em>}' reference.
@@ -522,7 +522,7 @@ public interface IEDName extends SclObject {
      * @see #getRefersToLDevice()
      * @generated
      */
-    void setRefersToLDevice(LDevice value);
+    void setRefersToLDevice( LDevice value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.IEDName#getRefersToLDevice <em>Refers To LDevice</em>}' reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Inputs.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Inputs.java
index 598a132..d1f06c2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Inputs.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Inputs.java
@@ -62,7 +62,7 @@ public interface Inputs extends UnNaming {
      * @see #getParentAnyLN()
      * @generated
      */
-    void setParentAnyLN(AnyLN value);
+    void setParentAnyLN( AnyLN value );
 
     /**
      * Returns the value of the '<em><b>Ext Ref</b></em>' containment reference list.
@@ -82,7 +82,7 @@ public interface Inputs extends UnNaming {
      * @model opposite="ParentInputs" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<ExtRef> getExtRef();
+    EList< ExtRef > getExtRef();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Inputs#getExtRef <em>Ext Ref</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/IssuerName.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/IssuerName.java
index 663b46a..7f798af 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/IssuerName.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/IssuerName.java
@@ -59,6 +59,6 @@ public interface IssuerName extends Cert {
      * @see #getParentCertificate()
      * @generated
      */
-    void setParentCertificate(Certificate value);
+    void setParentCertificate( Certificate value );
 
 } // IssuerName
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/KDC.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/KDC.java
index 86b53ea..cfbe2af 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/KDC.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/KDC.java
@@ -168,7 +168,7 @@ public interface KDC extends SclObject {
      * @see #getParentIED()
      * @generated
      */
-    void setParentIED(IED value);
+    void setParentIED( IED value );
 
     /**
      * Returns the value of the '<em><b>Refers To Access Point</b></em>' reference.
@@ -200,7 +200,7 @@ public interface KDC extends SclObject {
      * @see #getRefersToAccessPoint()
      * @generated
      */
-    void setRefersToAccessPoint(AccessPoint value);
+    void setRefersToAccessPoint( AccessPoint value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.KDC#getRefersToAccessPoint <em>Refers To Access Point</em>}' reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LDevice.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LDevice.java
index 59a6502..a74a314 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LDevice.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LDevice.java
@@ -232,7 +232,7 @@ public interface LDevice extends UnNaming {
      * @see #getParentServer()
      * @generated
      */
-    void setParentServer(Server value);
+    void setParentServer( Server value );
 
     /**
      * Returns the value of the '<em><b>Any LN</b></em>' attribute list.
@@ -266,7 +266,7 @@ public interface LDevice extends UnNaming {
      *        extendedMetaData="group='#AnyLN'"
      * @generated
      */
-    EList<LN> getLN();
+    EList< LN > getLN();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getLN <em>LN</em>}' containment reference list.
@@ -315,7 +315,7 @@ public interface LDevice extends UnNaming {
      * @see #getReferredByIEDName()
      * @generated
      */
-    void setReferredByIEDName(IEDName value);
+    void setReferredByIEDName( IEDName value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice#getReferredByIEDName <em>Referred By IED Name</em>}' reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LN.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LN.java
index 9febcf6..2816670 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LN.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LN.java
@@ -115,7 +115,7 @@ public interface LN extends AnyLN {
      * @see #getParentAccessPoint()
      * @generated
      */
-    void setParentAccessPoint(AccessPoint value);
+    void setParentAccessPoint( AccessPoint value );
 
     /**
      * Returns the value of the '<em><b>Parent LDevice</b></em>' container reference.
@@ -129,6 +129,7 @@ public interface LN extends AnyLN {
      * @model opposite="LN" resolveProxies="false" unsettable="true" ordered="false"
      * @generated
      */
+    @Override
     LDevice getParentLDevice();
 
     /**
@@ -139,6 +140,6 @@ public interface LN extends AnyLN {
      * @see #getParentLDevice()
      * @generated
      */
-    void setParentLDevice(LDevice value);
+    void setParentLDevice( LDevice value );
 
 } // LN
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LN0.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LN0.java
index 88b3fef..9b1847b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LN0.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LN0.java
@@ -63,7 +63,7 @@ public interface LN0 extends AnyLN {
      *        extendedMetaData="group='#ControlWithIEDName'"
      * @generated
      */
-    EList<GSEControl> getGSEControl();
+    EList< GSEControl > getGSEControl();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN0#getGSEControl <em>GSE Control</em>}' containment reference list.
@@ -98,6 +98,7 @@ public interface LN0 extends AnyLN {
      * @model opposite="LN0" resolveProxies="false" unsettable="true" ordered="false"
      * @generated
      */
+    @Override
     LDevice getParentLDevice();
 
     /**
@@ -108,7 +109,7 @@ public interface LN0 extends AnyLN {
      * @see #getParentLDevice()
      * @generated
      */
-    void setParentLDevice(LDevice value);
+    void setParentLDevice( LDevice value );
 
     /**
      * Returns the value of the '<em><b>Sampled Value Control</b></em>' containment reference list.
@@ -129,7 +130,7 @@ public interface LN0 extends AnyLN {
      *        extendedMetaData="group='#ControlWithIEDName'"
      * @generated
      */
-    EList<SampledValueControl> getSampledValueControl();
+    EList< SampledValueControl > getSampledValueControl();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LN0#getSampledValueControl <em>Sampled Value Control</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LNode.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LNode.java
index 749c099..0bb3bcc 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LNode.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LNode.java
@@ -393,7 +393,7 @@ public interface LNode extends UnNaming {
      * @see #getRefersToAnyLN()
      * @generated
      */
-    void setRefersToAnyLN(AnyLN value);
+    void setRefersToAnyLN( AnyLN value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode#getRefersToAnyLN <em>Refers To Any LN</em>}' reference.
@@ -440,7 +440,7 @@ public interface LNode extends UnNaming {
      * @see #getParentLNodeContainer()
      * @generated
      */
-    void setParentLNodeContainer(LNodeContainer value);
+    void setParentLNodeContainer( LNodeContainer value );
 
     /**
      * Returns the value of the '<em><b>Refers To LNode Type</b></em>' reference.
@@ -468,7 +468,7 @@ public interface LNode extends UnNaming {
      * @see #getRefersToLNodeType()
      * @generated
      */
-    void setRefersToLNodeType(LNodeType value);
+    void setRefersToLNodeType( LNodeType value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode#getRefersToLNodeType <em>Refers To LNode Type</em>}' reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LNodeContainer.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LNodeContainer.java
index 8c4b62a..19fbe82 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LNodeContainer.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LNodeContainer.java
@@ -57,7 +57,7 @@ public interface LNodeContainer extends Naming {
      * @model opposite="ParentLNodeContainer" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<LNode> getLNode();
+    EList< LNode > getLNode();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LNodeContainer#getLNode <em>LNode</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LNodeType.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LNodeType.java
index dcdcbd5..b35f9cb 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LNodeType.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LNodeType.java
@@ -169,7 +169,7 @@ public interface LNodeType extends IDNaming {
      * @model opposite="ParentLNodeType" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<DO> getDO();
+    EList< DO > getDO();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LNodeType#getDO <em>DO</em>}' containment reference list.
@@ -214,7 +214,7 @@ public interface LNodeType extends IDNaming {
      * @see #getParentDataTypeTemplates()
      * @generated
      */
-    void setParentDataTypeTemplates(DataTypeTemplates value);
+    void setParentDataTypeTemplates( DataTypeTemplates value );
 
     /**
      * Returns the value of the '<em><b>Referred By Any LN</b></em>' reference list.
@@ -234,7 +234,7 @@ public interface LNodeType extends IDNaming {
      * @model opposite="RefersToLNodeType" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<AnyLN> getReferredByAnyLN();
+    EList< AnyLN > getReferredByAnyLN();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LNodeType#getReferredByAnyLN <em>Referred By Any LN</em>}' reference list.
@@ -271,7 +271,7 @@ public interface LNodeType extends IDNaming {
      * @model opposite="RefersToLNodeType" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<LNode> getReferredByLNode();
+    EList< LNode > getReferredByLNode();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LNodeType#getReferredByLNode <em>Referred By LNode</em>}' reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Line.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Line.java
index 2f164f5..0fc217d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Line.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Line.java
@@ -122,7 +122,7 @@ public interface Line extends GeneralEquipmentContainer {
      * @see #getParentProcess()
      * @generated
      */
-    void setParentProcess(fr.centralesupelec.edf.riseclipse.iec61850.scl.Process value);
+    void setParentProcess( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process value );
 
     /**
      * Returns the value of the '<em><b>Parent SCL</b></em>' container reference.
@@ -146,7 +146,7 @@ public interface Line extends GeneralEquipmentContainer {
      * @see #getParentSCL()
      * @generated
      */
-    void setParentSCL(SCL value);
+    void setParentSCL( SCL value );
 
     /**
      * Returns the value of the '<em><b>Connectivity Node</b></em>' containment reference list.
@@ -166,7 +166,7 @@ public interface Line extends GeneralEquipmentContainer {
      * @model opposite="ParentLine" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<ConnectivityNode> getConnectivityNode();
+    EList< ConnectivityNode > getConnectivityNode();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Line#getConnectivityNode <em>Connectivity Node</em>}' containment reference list.
@@ -207,7 +207,7 @@ public interface Line extends GeneralEquipmentContainer {
      * @model opposite="ParentLine" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<ConductingEquipment> getConductingEquipment();
+    EList< ConductingEquipment > getConductingEquipment();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Line#getConductingEquipment <em>Conducting Equipment</em>}' containment reference list.
@@ -260,7 +260,7 @@ public interface Line extends GeneralEquipmentContainer {
      * @see #getVoltage()
      * @generated
      */
-    void setVoltage(Voltage value);
+    void setVoltage( Voltage value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Line#getVoltage <em>Voltage</em>}' containment reference.
@@ -313,7 +313,7 @@ public interface Line extends GeneralEquipmentContainer {
      * @see #getNomFreq()
      * @generated
      */
-    void setNomFreq(BigDecimal value);
+    void setNomFreq( BigDecimal value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Line#getNomFreq <em>Nom Freq</em>}' attribute.
@@ -366,7 +366,7 @@ public interface Line extends GeneralEquipmentContainer {
      * @see #getNumPhases()
      * @generated
      */
-    void setNumPhases(Integer value);
+    void setNumPhases( Integer value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Line#getNumPhases <em>Num Phases</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Log.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Log.java
index c5dfc6c..269133f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Log.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Log.java
@@ -63,7 +63,7 @@ public interface Log extends UnNaming {
      * @see #getParentAnyLN()
      * @generated
      */
-    void setParentAnyLN(AnyLN value);
+    void setParentAnyLN( AnyLN value );
 
     /**
      * Returns the value of the '<em><b>Name</b></em>' attribute.
@@ -93,7 +93,7 @@ public interface Log extends UnNaming {
      * @see #getName()
      * @generated
      */
-    void setName(String value);
+    void setName( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Log#getName <em>Name</em>}' attribute.
@@ -136,7 +136,7 @@ public interface Log extends UnNaming {
      * @model opposite="RefersToLog" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<LogControl> getReferredByLogControl();
+    EList< LogControl > getReferredByLogControl();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Log#getReferredByLogControl <em>Referred By Log Control</em>}' reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LogControl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LogControl.java
index c4e41e2..3147266 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LogControl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LogControl.java
@@ -488,6 +488,7 @@ public interface LogControl extends ControlWithTriggerOpt {
      * @model opposite="LogControl" resolveProxies="false" unsettable="true" ordered="false"
      * @generated
      */
+    @Override
     AnyLN getParentAnyLN();
 
     /**
@@ -498,7 +499,7 @@ public interface LogControl extends ControlWithTriggerOpt {
      * @see #getParentAnyLN()
      * @generated
      */
-    void setParentAnyLN(AnyLN value);
+    void setParentAnyLN( AnyLN value );
 
     /**
      * Returns the value of the '<em><b>Refers To Any LN</b></em>' reference.
@@ -530,7 +531,7 @@ public interface LogControl extends ControlWithTriggerOpt {
      * @see #getRefersToAnyLN()
      * @generated
      */
-    void setRefersToAnyLN(AnyLN value);
+    void setRefersToAnyLN( AnyLN value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LogControl#getRefersToAnyLN <em>Refers To Any LN</em>}' reference.
@@ -585,7 +586,7 @@ public interface LogControl extends ControlWithTriggerOpt {
      * @see #getRefersToLog()
      * @generated
      */
-    void setRefersToLog(Log value);
+    void setRefersToLog( Log value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LogControl#getRefersToLog <em>Refers To Log</em>}' reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LogSettings.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LogSettings.java
index 24b307a..220f33b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LogSettings.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/LogSettings.java
@@ -233,6 +233,6 @@ public interface LogSettings extends ServiceSettings {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // LogSettings
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/MaxTime.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/MaxTime.java
index df130fc..ead906d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/MaxTime.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/MaxTime.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Max Time</b></em>'.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/McSecurity.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/McSecurity.java
index f8599b6..21bd1e8 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/McSecurity.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/McSecurity.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Mc Security</b></em>'.
@@ -64,7 +63,7 @@ public interface McSecurity extends SclObject {
      * @see #getParentClientServices()
      * @generated
      */
-    void setParentClientServices(ClientServices value);
+    void setParentClientServices( ClientServices value );
 
     /**
      * Returns the value of the '<em><b>Parent GSE Settings</b></em>' container reference.
@@ -88,7 +87,7 @@ public interface McSecurity extends SclObject {
      * @see #getParentGSESettings()
      * @generated
      */
-    void setParentGSESettings(GSESettings value);
+    void setParentGSESettings( GSESettings value );
 
     /**
      * Returns the value of the '<em><b>Parent SMV Settings</b></em>' container reference.
@@ -112,7 +111,7 @@ public interface McSecurity extends SclObject {
      * @see #getParentSMVSettings()
      * @generated
      */
-    void setParentSMVSettings(SMVSettings value);
+    void setParentSMVSettings( SMVSettings value );
 
     /**
      * Returns the value of the '<em><b>Signature</b></em>' attribute.
@@ -142,7 +141,7 @@ public interface McSecurity extends SclObject {
      * @see #getSignature()
      * @generated
      */
-    void setSignature(Boolean value);
+    void setSignature( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.McSecurity#getSignature <em>Signature</em>}' attribute.
@@ -195,7 +194,7 @@ public interface McSecurity extends SclObject {
      * @see #getEncryption()
      * @generated
      */
-    void setEncryption(Boolean value);
+    void setEncryption( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.McSecurity#getEncryption <em>Encryption</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/MinTime.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/MinTime.java
index b6e2162..fd98dd8 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/MinTime.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/MinTime.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Min Time</b></em>'.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/NeutralPoint.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/NeutralPoint.java
index 03c5db3..90a8347 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/NeutralPoint.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/NeutralPoint.java
@@ -59,6 +59,6 @@ public interface NeutralPoint extends Terminal {
      * @see #getParentTransformerWinding()
      * @generated
      */
-    void setParentTransformerWinding(TransformerWinding value);
+    void setParentTransformerWinding( TransformerWinding value );
 
 } // NeutralPoint
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/OptFields.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/OptFields.java
index a52eaa4..ab35992 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/OptFields.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/OptFields.java
@@ -59,6 +59,6 @@ public interface OptFields extends SclObject, AgOptFields {
      * @see #getParentReportControl()
      * @generated
      */
-    void setParentReportControl(ReportControl value);
+    void setParentReportControl( ReportControl value );
 
 } // OptFields
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/P.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/P.java
index 5cb4f5f..ec63d2f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/P.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/P.java
@@ -59,6 +59,6 @@ public interface P extends PAddr {
      * @see #getParentAddress()
      * @generated
      */
-    void setParentAddress(Address value);
+    void setParentAddress( Address value );
 
 } // P
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/P_PhysConn.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/P_PhysConn.java
index f392188..29c280d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/P_PhysConn.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/P_PhysConn.java
@@ -59,6 +59,6 @@ public interface P_PhysConn extends PAddr {
      * @see #getParentPhysConn()
      * @generated
      */
-    void setParentPhysConn(PhysConn value);
+    void setParentPhysConn( PhysConn value );
 
 } // P_PhysConn
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PhaseEnum.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PhaseEnum.java
index bb27f2b..eb2c108 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PhaseEnum.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PhaseEnum.java
@@ -277,7 +277,7 @@ public enum PhaseEnum implements Enumerator {
             AB,
             BC,
             CA,
-        };
+    };
 
     /**
      * A public read-only list of all the '<em><b>Phase Enum</b></em>' enumerators.
@@ -285,7 +285,7 @@ public enum PhaseEnum implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List<PhaseEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    public static final List< PhaseEnum > VALUES = Collections.unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
      * Returns the '<em><b>Phase Enum</b></em>' literal with the specified literal value.
@@ -296,9 +296,9 @@ public enum PhaseEnum implements Enumerator {
      * @generated
      */
     public static PhaseEnum get( String literal ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             PhaseEnum result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
+            if( result.toString().equals( literal ) ) {
                 return result;
             }
         }
@@ -314,9 +314,9 @@ public enum PhaseEnum implements Enumerator {
      * @generated
      */
     public static PhaseEnum getByName( String name ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             PhaseEnum result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
+            if( result.getName().equals( name ) ) {
                 return result;
             }
         }
@@ -332,16 +332,25 @@ public enum PhaseEnum implements Enumerator {
      * @generated
      */
     public static PhaseEnum get( int value ) {
-        switch (value) {
-            case A_VALUE: return A;
-            case B_VALUE: return B;
-            case C_VALUE: return C;
-            case N_VALUE: return N;
-            case ALL_VALUE: return ALL;
-            case NONE_VALUE: return NONE;
-            case AB_VALUE: return AB;
-            case BC_VALUE: return BC;
-            case CA_VALUE: return CA;
+        switch( value ) {
+        case A_VALUE:
+            return A;
+        case B_VALUE:
+            return B;
+        case C_VALUE:
+            return C;
+        case N_VALUE:
+            return N;
+        case ALL_VALUE:
+            return ALL;
+        case NONE_VALUE:
+            return NONE;
+        case AB_VALUE:
+            return AB;
+        case BC_VALUE:
+            return BC;
+        case CA_VALUE:
+            return CA;
         }
         return null;
     }
@@ -386,7 +395,7 @@ public enum PhaseEnum implements Enumerator {
      */
     @Override
     public int getValue() {
-      return value;
+        return value;
     }
 
     /**
@@ -396,7 +405,7 @@ public enum PhaseEnum implements Enumerator {
      */
     @Override
     public String getName() {
-      return name;
+        return name;
     }
 
     /**
@@ -406,7 +415,7 @@ public enum PhaseEnum implements Enumerator {
      */
     @Override
     public String getLiteral() {
-      return literal;
+        return literal;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PhysConn.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PhysConn.java
index 2ae0ce6..998a5b0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PhysConn.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PhysConn.java
@@ -116,7 +116,7 @@ public interface PhysConn extends UnNaming {
      * @see #getParentConnectedAP()
      * @generated
      */
-    void setParentConnectedAP(ConnectedAP value);
+    void setParentConnectedAP( ConnectedAP value );
 
     /**
      * Returns the value of the '<em><b>P</b></em>' containment reference list.
@@ -136,7 +136,7 @@ public interface PhysConn extends UnNaming {
      * @model opposite="ParentPhysConn" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<P_PhysConn> getP();
+    EList< P_PhysConn > getP();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.PhysConn#getP <em>P</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PowerTransformer.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PowerTransformer.java
index 678bdeb..05173d7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PowerTransformer.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PowerTransformer.java
@@ -114,7 +114,7 @@ public interface PowerTransformer extends Equipment {
      * @model opposite="ParentPowerTransformer" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<EqFunction> getEqFunction();
+    EList< EqFunction > getEqFunction();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.PowerTransformer#getEqFunction <em>Eq Function</em>}' containment reference list.
@@ -159,7 +159,7 @@ public interface PowerTransformer extends Equipment {
      * @see #getParentEquipmentContainer()
      * @generated
      */
-    void setParentEquipmentContainer(EquipmentContainer value);
+    void setParentEquipmentContainer( EquipmentContainer value );
 
     /**
      * Returns the value of the '<em><b>Sub Equipment</b></em>' containment reference list.
@@ -179,7 +179,7 @@ public interface PowerTransformer extends Equipment {
      * @model opposite="ParentPowerTransformer" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<SubEquipment> getSubEquipment();
+    EList< SubEquipment > getSubEquipment();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.PowerTransformer#getSubEquipment <em>Sub Equipment</em>}' containment reference list.
@@ -220,7 +220,7 @@ public interface PowerTransformer extends Equipment {
      * @model opposite="ParentPowerTransformer" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<TransformerWinding> getTransformerWinding();
+    EList< TransformerWinding > getTransformerWinding();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.PowerTransformer#getTransformerWinding <em>Transformer Winding</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PredefinedTypeOfSecurityEnum.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PredefinedTypeOfSecurityEnum.java
index fe7c987..cb7e4dc 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PredefinedTypeOfSecurityEnum.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/PredefinedTypeOfSecurityEnum.java
@@ -121,7 +121,7 @@ public enum PredefinedTypeOfSecurityEnum implements Enumerator {
             NONE,
             SIGNATURE,
             SIGNATURE_AND_ENCRYPTION,
-        };
+    };
 
     /**
      * A public read-only list of all the '<em><b>Predefined Type Of Security Enum</b></em>' enumerators.
@@ -129,7 +129,8 @@ public enum PredefinedTypeOfSecurityEnum implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List<PredefinedTypeOfSecurityEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    public static final List< PredefinedTypeOfSecurityEnum > VALUES = Collections
+            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
      * Returns the '<em><b>Predefined Type Of Security Enum</b></em>' literal with the specified literal value.
@@ -140,9 +141,9 @@ public enum PredefinedTypeOfSecurityEnum implements Enumerator {
      * @generated
      */
     public static PredefinedTypeOfSecurityEnum get( String literal ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             PredefinedTypeOfSecurityEnum result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
+            if( result.toString().equals( literal ) ) {
                 return result;
             }
         }
@@ -158,9 +159,9 @@ public enum PredefinedTypeOfSecurityEnum implements Enumerator {
      * @generated
      */
     public static PredefinedTypeOfSecurityEnum getByName( String name ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             PredefinedTypeOfSecurityEnum result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
+            if( result.getName().equals( name ) ) {
                 return result;
             }
         }
@@ -176,10 +177,13 @@ public enum PredefinedTypeOfSecurityEnum implements Enumerator {
      * @generated
      */
     public static PredefinedTypeOfSecurityEnum get( int value ) {
-        switch (value) {
-            case NONE_VALUE: return NONE;
-            case SIGNATURE_VALUE: return SIGNATURE;
-            case SIGNATURE_AND_ENCRYPTION_VALUE: return SIGNATURE_AND_ENCRYPTION;
+        switch( value ) {
+        case NONE_VALUE:
+            return NONE;
+        case SIGNATURE_VALUE:
+            return SIGNATURE;
+        case SIGNATURE_AND_ENCRYPTION_VALUE:
+            return SIGNATURE_AND_ENCRYPTION;
         }
         return null;
     }
@@ -224,7 +228,7 @@ public enum PredefinedTypeOfSecurityEnum implements Enumerator {
      */
     @Override
     public int getValue() {
-      return value;
+        return value;
     }
 
     /**
@@ -234,7 +238,7 @@ public enum PredefinedTypeOfSecurityEnum implements Enumerator {
      */
     @Override
     public String getName() {
-      return name;
+        return name;
     }
 
     /**
@@ -244,7 +248,7 @@ public enum PredefinedTypeOfSecurityEnum implements Enumerator {
      */
     @Override
     public String getLiteral() {
-      return literal;
+        return literal;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Private.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Private.java
index ba556e0..ea194e8 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Private.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Private.java
@@ -167,6 +167,6 @@ public interface Private extends AnyContentFromOtherNamespace {
      * @see #getParentBaseElement()
      * @generated
      */
-    void setParentBaseElement(BaseElement value);
+    void setParentBaseElement( BaseElement value );
 
 } // Private
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Process.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Process.java
index f5407c2..e70464d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Process.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Process.java
@@ -116,7 +116,7 @@ public interface Process extends GeneralEquipmentContainer {
      * @model opposite="ParentProcess" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Line> getLine();
+    EList< Line > getLine();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Process#getLine <em>Line</em>}' containment reference list.
@@ -161,7 +161,7 @@ public interface Process extends GeneralEquipmentContainer {
      * @see #getParentSCL()
      * @generated
      */
-    void setParentSCL(SCL value);
+    void setParentSCL( SCL value );
 
     /**
      * Returns the value of the '<em><b>Conducting Equipment</b></em>' containment reference list.
@@ -181,7 +181,7 @@ public interface Process extends GeneralEquipmentContainer {
      * @model opposite="ParentProcess" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<ConductingEquipment> getConductingEquipment();
+    EList< ConductingEquipment > getConductingEquipment();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Process#getConductingEquipment <em>Conducting Equipment</em>}' containment reference list.
@@ -222,7 +222,7 @@ public interface Process extends GeneralEquipmentContainer {
      * @model opposite="ParentProcess" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Substation> getSubstation();
+    EList< Substation > getSubstation();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Process#getSubstation <em>Substation</em>}' containment reference list.
@@ -263,7 +263,7 @@ public interface Process extends GeneralEquipmentContainer {
      * @model opposite="ParentProcess" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Process> getSubProcesses();
+    EList< Process > getSubProcesses();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Process#getSubProcesses <em>Sub Processes</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ProtNs.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ProtNs.java
index 65d94e2..6e1527a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ProtNs.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ProtNs.java
@@ -115,7 +115,7 @@ public interface ProtNs extends SclObject {
      * @see #getParentDA()
      * @generated
      */
-    void setParentDA(DA value);
+    void setParentDA( DA value );
 
     /**
      * Returns the value of the '<em><b>Parent DA Type</b></em>' container reference.
@@ -139,7 +139,7 @@ public interface ProtNs extends SclObject {
      * @see #getParentDAType()
      * @generated
      */
-    void setParentDAType(DAType value);
+    void setParentDAType( DAType value );
 
     /**
      * Returns the value of the '<em><b>Value</b></em>' attribute.
@@ -165,6 +165,6 @@ public interface ProtNs extends SclObject {
      * @see #getValue()
      * @generated
      */
-    void setValue(String value);
+    void setValue( String value );
 
 } // ProtNs
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Protocol.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Protocol.java
index e055f25..0d2847e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Protocol.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Protocol.java
@@ -113,6 +113,6 @@ public interface Protocol extends SclObject {
      * @see #getParentControlWithIEDName()
      * @generated
      */
-    void setParentControlWithIEDName(ControlWithIEDName value);
+    void setParentControlWithIEDName( ControlWithIEDName value );
 
 } // Protocol
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ReadWrite.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ReadWrite.java
index c5a5407..2a60abb 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ReadWrite.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ReadWrite.java
@@ -59,6 +59,6 @@ public interface ReadWrite extends ServiceYesNo {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // ReadWrite
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/RedProt.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/RedProt.java
index d68fa11..ca01821 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/RedProt.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/RedProt.java
@@ -221,6 +221,6 @@ public interface RedProt extends SclObject {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // RedProt
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ReportControl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ReportControl.java
index a691541..d1099c4 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ReportControl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ReportControl.java
@@ -324,6 +324,7 @@ public interface ReportControl extends ControlWithTriggerOpt {
      * @model opposite="ReportControl" resolveProxies="false" unsettable="true" ordered="false"
      * @generated
      */
+    @Override
     AnyLN getParentAnyLN();
 
     /**
@@ -334,7 +335,7 @@ public interface ReportControl extends ControlWithTriggerOpt {
      * @see #getParentAnyLN()
      * @generated
      */
-    void setParentAnyLN(AnyLN value);
+    void setParentAnyLN( AnyLN value );
 
     /**
      * Returns the value of the '<em><b>Opt Fields</b></em>' containment reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ReportSettings.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ReportSettings.java
index a23789f..6b19ef0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ReportSettings.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ReportSettings.java
@@ -459,6 +459,6 @@ public interface ReportSettings extends ServiceSettings {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // ReportSettings
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/RptEnabled.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/RptEnabled.java
index e99f0aa..ce570f2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/RptEnabled.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/RptEnabled.java
@@ -112,7 +112,7 @@ public interface RptEnabled extends UnNaming {
      * @model opposite="ParentRptEnabled" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<ClientLN> getClientLN();
+    EList< ClientLN > getClientLN();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.RptEnabled#getClientLN <em>Client LN</em>}' containment reference list.
@@ -157,6 +157,6 @@ public interface RptEnabled extends UnNaming {
      * @see #getParentReportControl()
      * @generated
      */
-    void setParentReportControl(ReportControl value);
+    void setParentReportControl( ReportControl value );
 
 } // RptEnabled
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SCL.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SCL.java
index faeb239..d29658b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SCL.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SCL.java
@@ -227,7 +227,7 @@ public interface SCL extends BaseElement {
      * @model opposite="ParentSCL" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Line> getLine();
+    EList< Line > getLine();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SCL#getLine <em>Line</em>}' containment reference list.
@@ -268,7 +268,7 @@ public interface SCL extends BaseElement {
      * @model opposite="ParentSCL" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<fr.centralesupelec.edf.riseclipse.iec61850.scl.Process> getProcess();
+    EList< fr.centralesupelec.edf.riseclipse.iec61850.scl.Process > getProcess();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SCL#getProcess <em>Process</em>}' containment reference list.
@@ -309,7 +309,7 @@ public interface SCL extends BaseElement {
      * @model opposite="ParentSCL" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<IED> getIED();
+    EList< IED > getIED();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SCL#getIED <em>IED</em>}' containment reference list.
@@ -460,7 +460,7 @@ public interface SCL extends BaseElement {
      * @model opposite="ParentSCL" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Substation> getSubstation();
+    EList< Substation > getSubstation();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SCL#getSubstation <em>Substation</em>}' containment reference list.
@@ -511,7 +511,7 @@ public interface SCL extends BaseElement {
      * @see #getRelease()
      * @generated
      */
-    void setRelease(Integer value);
+    void setRelease( Integer value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SCL#getRelease <em>Release</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SDI.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SDI.java
index 823bb84..2e25cb5 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SDI.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SDI.java
@@ -171,7 +171,7 @@ public interface SDI extends UnNaming {
      * @model opposite="ParentSDI" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<DAI> getDAI();
+    EList< DAI > getDAI();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SDI#getDAI <em>DAI</em>}' containment reference list.
@@ -216,7 +216,7 @@ public interface SDI extends UnNaming {
      * @see #getParentDOI()
      * @generated
      */
-    void setParentDOI(DOI value);
+    void setParentDOI( DOI value );
 
     /**
      * Returns the value of the '<em><b>Sub SDI</b></em>' containment reference list.
@@ -237,7 +237,7 @@ public interface SDI extends UnNaming {
      *        extendedMetaData="kind='element' name='SDI' namespace='http://www.iec.ch/61850/2003/SCL'"
      * @generated
      */
-    EList<SDI> getSubSDI();
+    EList< SDI > getSubSDI();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SDI#getSubSDI <em>Sub SDI</em>}' containment reference list.
@@ -312,7 +312,7 @@ public interface SDI extends UnNaming {
      * @see #getName()
      * @generated
      */
-    void setName(String value);
+    void setName( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SDI#getName <em>Name</em>}' attribute.
@@ -363,7 +363,7 @@ public interface SDI extends UnNaming {
      * @see #getRefersToSDO()
      * @generated
      */
-    void setRefersToSDO(SDO value);
+    void setRefersToSDO( SDO value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SDI#getRefersToSDO <em>Refers To SDO</em>}' reference.
@@ -414,7 +414,7 @@ public interface SDI extends UnNaming {
      * @see #getRefersToAbstractDataAttribute()
      * @generated
      */
-    void setRefersToAbstractDataAttribute(AbstractDataAttribute value);
+    void setRefersToAbstractDataAttribute( AbstractDataAttribute value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SDI#getRefersToAbstractDataAttribute <em>Refers To Abstract Data Attribute</em>}' reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SDO.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SDO.java
index 873d391..cf99630 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SDO.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SDO.java
@@ -69,7 +69,7 @@ public interface SDO extends AbstractDataObject {
      * @see #getCount()
      * @generated
      */
-    void setCount(String value);
+    void setCount( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SDO#getCount <em>Count</em>}' attribute.
@@ -116,7 +116,7 @@ public interface SDO extends AbstractDataObject {
      * @see #getParentDOType()
      * @generated
      */
-    void setParentDOType(DOType value);
+    void setParentDOType( DOType value );
 
     /**
      * Returns the value of the '<em><b>Referred By SDI</b></em>' reference list.
@@ -132,7 +132,7 @@ public interface SDO extends AbstractDataObject {
      * @model opposite="RefersToSDO" resolveProxies="false" unsettable="true" transient="true" ordered="false"
      * @generated
      */
-    EList<SDI> getReferredBySDI();
+    EList< SDI > getReferredBySDI();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SDO#getReferredBySDI <em>Referred By SDI</em>}' reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SGEdit.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SGEdit.java
index 8279af0..f0210c9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SGEdit.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SGEdit.java
@@ -113,6 +113,6 @@ public interface SGEdit extends SclObject {
      * @see #getParentSettingGroups()
      * @generated
      */
-    void setParentSettingGroups(SettingGroups value);
+    void setParentSettingGroups( SettingGroups value );
 
 } // SGEdit
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMV.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMV.java
index b8ce2c0..2528dc4 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMV.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMV.java
@@ -49,6 +49,7 @@ public interface SMV extends ControlBlock {
      * @model opposite="SMV" resolveProxies="false" unsettable="true" ordered="false"
      * @generated
      */
+    @Override
     ConnectedAP getParentConnectedAP();
 
     /**
@@ -59,6 +60,6 @@ public interface SMV extends ControlBlock {
      * @see #getParentConnectedAP()
      * @generated
      */
-    void setParentConnectedAP(ConnectedAP value);
+    void setParentConnectedAP( ConnectedAP value );
 
 } // SMV
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVDeliveryEnum.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVDeliveryEnum.java
index 66ed4f9..2a13f34 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVDeliveryEnum.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVDeliveryEnum.java
@@ -121,7 +121,7 @@ public enum SMVDeliveryEnum implements Enumerator {
             UNICAST,
             MULTICAST,
             BOTH,
-        };
+    };
 
     /**
      * A public read-only list of all the '<em><b>SMV Delivery Enum</b></em>' enumerators.
@@ -129,7 +129,7 @@ public enum SMVDeliveryEnum implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List<SMVDeliveryEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    public static final List< SMVDeliveryEnum > VALUES = Collections.unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
      * Returns the '<em><b>SMV Delivery Enum</b></em>' literal with the specified literal value.
@@ -140,9 +140,9 @@ public enum SMVDeliveryEnum implements Enumerator {
      * @generated
      */
     public static SMVDeliveryEnum get( String literal ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             SMVDeliveryEnum result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
+            if( result.toString().equals( literal ) ) {
                 return result;
             }
         }
@@ -158,9 +158,9 @@ public enum SMVDeliveryEnum implements Enumerator {
      * @generated
      */
     public static SMVDeliveryEnum getByName( String name ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             SMVDeliveryEnum result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
+            if( result.getName().equals( name ) ) {
                 return result;
             }
         }
@@ -176,10 +176,13 @@ public enum SMVDeliveryEnum implements Enumerator {
      * @generated
      */
     public static SMVDeliveryEnum get( int value ) {
-        switch (value) {
-            case UNICAST_VALUE: return UNICAST;
-            case MULTICAST_VALUE: return MULTICAST;
-            case BOTH_VALUE: return BOTH;
+        switch( value ) {
+        case UNICAST_VALUE:
+            return UNICAST;
+        case MULTICAST_VALUE:
+            return MULTICAST;
+        case BOTH_VALUE:
+            return BOTH;
         }
         return null;
     }
@@ -224,7 +227,7 @@ public enum SMVDeliveryEnum implements Enumerator {
      */
     @Override
     public int getValue() {
-      return value;
+        return value;
     }
 
     /**
@@ -234,7 +237,7 @@ public enum SMVDeliveryEnum implements Enumerator {
      */
     @Override
     public String getName() {
-      return name;
+        return name;
     }
 
     /**
@@ -244,7 +247,7 @@ public enum SMVDeliveryEnum implements Enumerator {
      */
     @Override
     public String getLiteral() {
-      return literal;
+        return literal;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVSecurity.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVSecurity.java
index feb0f4f..85c35c6 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVSecurity.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVSecurity.java
@@ -59,6 +59,6 @@ public interface SMVSecurity extends Certificate {
      * @see #getParentAccessPoint()
      * @generated
      */
-    void setParentAccessPoint(AccessPoint value);
+    void setParentAccessPoint( AccessPoint value );
 
 } // SMVSecurity
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVSettings.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVSettings.java
index eb2e144..0da38fc 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVSettings.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVSettings.java
@@ -84,7 +84,7 @@ public interface SMVSettings extends ServiceSettings {
      * @see #getSvID()
      * @generated
      */
-    void setSvID(ServiceSettingsEnum value);
+    void setSvID( ServiceSettingsEnum value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings#getSvID <em>Sv ID</em>}' attribute.
@@ -141,7 +141,7 @@ public interface SMVSettings extends ServiceSettings {
      * @see #getOptFields()
      * @generated
      */
-    void setOptFields(ServiceSettingsEnum value);
+    void setOptFields( ServiceSettingsEnum value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings#getOptFields <em>Opt Fields</em>}' attribute.
@@ -199,7 +199,7 @@ public interface SMVSettings extends ServiceSettings {
      * @see #getSmpRateAttribute()
      * @generated
      */
-    void setSmpRateAttribute(ServiceSettingsEnum value);
+    void setSmpRateAttribute( ServiceSettingsEnum value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings#getSmpRateAttribute <em>Smp Rate Attribute</em>}' attribute.
@@ -254,7 +254,7 @@ public interface SMVSettings extends ServiceSettings {
      * @see #isSamplesPerSecAttribute()
      * @generated
      */
-    void setSamplesPerSecAttribute(boolean value);
+    void setSamplesPerSecAttribute( boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings#isSamplesPerSecAttribute <em>Samples Per Sec Attribute</em>}' attribute.
@@ -308,7 +308,7 @@ public interface SMVSettings extends ServiceSettings {
      * @see #isPdcTimeStamp()
      * @generated
      */
-    void setPdcTimeStamp(boolean value);
+    void setPdcTimeStamp( boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings#isPdcTimeStamp <em>Pdc Time Stamp</em>}' attribute.
@@ -351,7 +351,7 @@ public interface SMVSettings extends ServiceSettings {
      * @model opposite="ParentSMVSettings" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<SmpRate> getSmpRate();
+    EList< SmpRate > getSmpRate();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings#getSmpRate <em>Smp Rate</em>}' containment reference list.
@@ -392,7 +392,7 @@ public interface SMVSettings extends ServiceSettings {
      * @model opposite="ParentSMVSettings" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<SamplesPerSec> getSamplesPerSec();
+    EList< SamplesPerSec > getSamplesPerSec();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings#getSamplesPerSec <em>Samples Per Sec</em>}' containment reference list.
@@ -433,7 +433,7 @@ public interface SMVSettings extends ServiceSettings {
      * @model opposite="ParentSMVSettings" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<SecPerSamples> getSecPerSamples();
+    EList< SecPerSamples > getSecPerSamples();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings#getSecPerSamples <em>Sec Per Samples</em>}' containment reference list.
@@ -478,7 +478,7 @@ public interface SMVSettings extends ServiceSettings {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
     /**
      * Returns the value of the '<em><b>Synch Src Id</b></em>' attribute.
@@ -509,7 +509,7 @@ public interface SMVSettings extends ServiceSettings {
      * @see #getSynchSrcId()
      * @generated
      */
-    void setSynchSrcId(Boolean value);
+    void setSynchSrcId( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings#getSynchSrcId <em>Synch Src Id</em>}' attribute.
@@ -566,7 +566,7 @@ public interface SMVSettings extends ServiceSettings {
      * @see #getNofASDU()
      * @generated
      */
-    void setNofASDU(ServiceSettingsNoDynEnum value);
+    void setNofASDU( ServiceSettingsNoDynEnum value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings#getNofASDU <em>Nof ASDU</em>}' attribute.
@@ -620,7 +620,7 @@ public interface SMVSettings extends ServiceSettings {
      * @see #getKdaParticipant()
      * @generated
      */
-    void setKdaParticipant(Boolean value);
+    void setKdaParticipant( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings#getKdaParticipant <em>Kda Participant</em>}' attribute.
@@ -675,7 +675,7 @@ public interface SMVSettings extends ServiceSettings {
      * @see #getMcSecurity()
      * @generated
      */
-    void setMcSecurity(McSecurity value);
+    void setMcSecurity( McSecurity value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings#getMcSecurity <em>Mc Security</em>}' containment reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVsc.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVsc.java
index 282cb49..d72f0f5 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVsc.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SMVsc.java
@@ -173,7 +173,7 @@ public interface SMVsc extends ServiceWithMax {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
     /**
      * Returns the value of the '<em><b>Sv</b></em>' attribute.
@@ -203,7 +203,7 @@ public interface SMVsc extends ServiceWithMax {
      * @see #getSv()
      * @generated
      */
-    void setSv(Boolean value);
+    void setSv( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVsc#getSv <em>Sv</em>}' attribute.
@@ -256,7 +256,7 @@ public interface SMVsc extends ServiceWithMax {
      * @see #getRSV()
      * @generated
      */
-    void setRSV(Boolean value);
+    void setRSV( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVsc#getRSV <em>RSV</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SampledValueControl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SampledValueControl.java
index 3508e7b..39f50ed 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SampledValueControl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SampledValueControl.java
@@ -393,7 +393,7 @@ public interface SampledValueControl extends ControlWithIEDName {
      * @see #getParentLN0()
      * @generated
      */
-    void setParentLN0(LN0 value);
+    void setParentLN0( LN0 value );
 
     /**
      * Returns the value of the '<em><b>Smv Opts</b></em>' containment reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SamplesPerSec.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SamplesPerSec.java
index e073e23..52bcf49 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SamplesPerSec.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SamplesPerSec.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Samples Per Sec</b></em>'.
@@ -64,7 +63,7 @@ public interface SamplesPerSec extends SclObject {
      * @see #getValue()
      * @generated
      */
-    void setValue(Integer value);
+    void setValue( Integer value );
 
     /**
      * Returns the value of the '<em><b>Parent SMV Settings</b></em>' container reference.
@@ -88,6 +87,6 @@ public interface SamplesPerSec extends SclObject {
      * @see #getParentSMVSettings()
      * @generated
      */
-    void setParentSMVSettings(SMVSettings value);
+    void setParentSMVSettings( SMVSettings value );
 
 } // SamplesPerSec
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SclObject.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SclObject.java
index 0c26982..59c77a4 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SclObject.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SclObject.java
@@ -89,7 +89,7 @@ public interface SclObject extends EObject {
      * @see #isExplicitLinksBuilt()
      * @generated
      */
-    void setExplicitLinksBuilt(boolean value);
+    void setExplicitLinksBuilt( boolean value );
 
     /**
      * <!-- begin-user-doc -->
@@ -97,6 +97,6 @@ public interface SclObject extends EObject {
      * @model consoleType="fr.centralesupelec.edf.riseclipse.iec61850.scl.IRiseClipseConsole"
      * @generated
      */
-    boolean buildExplicitLinks(IRiseClipseConsole console, Boolean forceUpdate);
+    boolean buildExplicitLinks( IRiseClipseConsole console, Boolean forceUpdate );
 
 } // SclObject
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SecPerSamples.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SecPerSamples.java
index 6f93de9..b4f249d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SecPerSamples.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SecPerSamples.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Sec Per Samples</b></em>'.
@@ -64,7 +63,7 @@ public interface SecPerSamples extends SclObject {
      * @see #getValue()
      * @generated
      */
-    void setValue(Integer value);
+    void setValue( Integer value );
 
     /**
      * Returns the value of the '<em><b>Parent SMV Settings</b></em>' container reference.
@@ -88,6 +87,6 @@ public interface SecPerSamples extends SclObject {
      * @see #getParentSMVSettings()
      * @generated
      */
-    void setParentSMVSettings(SMVSettings value);
+    void setParentSMVSettings( SMVSettings value );
 
 } // SecPerSamples
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Server.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Server.java
index 6bb18ab..607d272 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Server.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Server.java
@@ -118,7 +118,7 @@ public interface Server extends UnNaming {
      * @see #getParentAccessPoint()
      * @generated
      */
-    void setParentAccessPoint(AccessPoint value);
+    void setParentAccessPoint( AccessPoint value );
 
     /**
      * Returns the value of the '<em><b>Association</b></em>' containment reference list.
@@ -138,7 +138,7 @@ public interface Server extends UnNaming {
      * @model opposite="ParentServer" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Association> getAssociation();
+    EList< Association > getAssociation();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Server#getAssociation <em>Association</em>}' containment reference list.
@@ -234,7 +234,7 @@ public interface Server extends UnNaming {
      * @model opposite="ParentServer" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<LDevice> getLDevice();
+    EList< LDevice > getLDevice();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Server#getLDevice <em>LDevice</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServerAt.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServerAt.java
index 8a8aa50..5962a53 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServerAt.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServerAt.java
@@ -114,7 +114,7 @@ public interface ServerAt extends UnNaming {
      * @see #getParentAccessPoint()
      * @generated
      */
-    void setParentAccessPoint(AccessPoint value);
+    void setParentAccessPoint( AccessPoint value );
 
     /**
      * Returns the value of the '<em><b>Refers To Access Point</b></em>' reference.
@@ -146,7 +146,7 @@ public interface ServerAt extends UnNaming {
      * @see #getRefersToAccessPoint()
      * @generated
      */
-    void setRefersToAccessPoint(AccessPoint value);
+    void setRefersToAccessPoint( AccessPoint value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ServerAt#getRefersToAccessPoint <em>Refers To Access Point</em>}' reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceConfReportControl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceConfReportControl.java
index 753d108..13f71c7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceConfReportControl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceConfReportControl.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Service Conf Report Control</b></em>'.
@@ -71,7 +70,7 @@ public interface ServiceConfReportControl extends ServiceWithMax {
      * @see #getBufMode()
      * @generated
      */
-    void setBufMode(bufModeEnum value);
+    void setBufMode( bufModeEnum value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceConfReportControl#getBufMode <em>Buf Mode</em>}' attribute.
@@ -124,7 +123,7 @@ public interface ServiceConfReportControl extends ServiceWithMax {
      * @see #getBufConf()
      * @generated
      */
-    void setBufConf(Boolean value);
+    void setBufConf( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceConfReportControl#getBufConf <em>Buf Conf</em>}' attribute.
@@ -177,7 +176,7 @@ public interface ServiceConfReportControl extends ServiceWithMax {
      * @see #getMaxBuf()
      * @generated
      */
-    void setMaxBuf(Integer value);
+    void setMaxBuf( Integer value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceConfReportControl#getMaxBuf <em>Max Buf</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceForConfDataSet.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceForConfDataSet.java
index b9b5e28..67d16f2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceForConfDataSet.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceForConfDataSet.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Service For Conf Data Set</b></em>'.
@@ -66,7 +65,7 @@ public interface ServiceForConfDataSet extends ServiceWithMaxAndMaxAttributes {
      * @see #getModify()
      * @generated
      */
-    void setModify(Boolean value);
+    void setModify( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceForConfDataSet#getModify <em>Modify</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceSettingsEnum.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceSettingsEnum.java
index 1b9a6f1..2034e16 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceSettingsEnum.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceSettingsEnum.java
@@ -121,7 +121,7 @@ public enum ServiceSettingsEnum implements Enumerator {
             DYN,
             CONF,
             FIX,
-        };
+    };
 
     /**
      * A public read-only list of all the '<em><b>Service Settings Enum</b></em>' enumerators.
@@ -129,7 +129,8 @@ public enum ServiceSettingsEnum implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List<ServiceSettingsEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    public static final List< ServiceSettingsEnum > VALUES = Collections
+            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
      * Returns the '<em><b>Service Settings Enum</b></em>' literal with the specified literal value.
@@ -140,9 +141,9 @@ public enum ServiceSettingsEnum implements Enumerator {
      * @generated
      */
     public static ServiceSettingsEnum get( String literal ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             ServiceSettingsEnum result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
+            if( result.toString().equals( literal ) ) {
                 return result;
             }
         }
@@ -158,9 +159,9 @@ public enum ServiceSettingsEnum implements Enumerator {
      * @generated
      */
     public static ServiceSettingsEnum getByName( String name ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             ServiceSettingsEnum result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
+            if( result.getName().equals( name ) ) {
                 return result;
             }
         }
@@ -176,10 +177,13 @@ public enum ServiceSettingsEnum implements Enumerator {
      * @generated
      */
     public static ServiceSettingsEnum get( int value ) {
-        switch (value) {
-            case DYN_VALUE: return DYN;
-            case CONF_VALUE: return CONF;
-            case FIX_VALUE: return FIX;
+        switch( value ) {
+        case DYN_VALUE:
+            return DYN;
+        case CONF_VALUE:
+            return CONF;
+        case FIX_VALUE:
+            return FIX;
         }
         return null;
     }
@@ -224,7 +228,7 @@ public enum ServiceSettingsEnum implements Enumerator {
      */
     @Override
     public int getValue() {
-      return value;
+        return value;
     }
 
     /**
@@ -234,7 +238,7 @@ public enum ServiceSettingsEnum implements Enumerator {
      */
     @Override
     public String getName() {
-      return name;
+        return name;
     }
 
     /**
@@ -244,7 +248,7 @@ public enum ServiceSettingsEnum implements Enumerator {
      */
     @Override
     public String getLiteral() {
-      return literal;
+        return literal;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceSettingsNoDynEnum.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceSettingsNoDynEnum.java
index 58bc587..8c58826 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceSettingsNoDynEnum.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceSettingsNoDynEnum.java
@@ -95,7 +95,7 @@ public enum ServiceSettingsNoDynEnum implements Enumerator {
     private static final ServiceSettingsNoDynEnum[] VALUES_ARRAY = new ServiceSettingsNoDynEnum[] {
             CONF,
             FIX,
-        };
+    };
 
     /**
      * A public read-only list of all the '<em><b>Service Settings No Dyn Enum</b></em>' enumerators.
@@ -103,7 +103,8 @@ public enum ServiceSettingsNoDynEnum implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List<ServiceSettingsNoDynEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    public static final List< ServiceSettingsNoDynEnum > VALUES = Collections
+            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
      * Returns the '<em><b>Service Settings No Dyn Enum</b></em>' literal with the specified literal value.
@@ -114,9 +115,9 @@ public enum ServiceSettingsNoDynEnum implements Enumerator {
      * @generated
      */
     public static ServiceSettingsNoDynEnum get( String literal ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             ServiceSettingsNoDynEnum result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
+            if( result.toString().equals( literal ) ) {
                 return result;
             }
         }
@@ -132,9 +133,9 @@ public enum ServiceSettingsNoDynEnum implements Enumerator {
      * @generated
      */
     public static ServiceSettingsNoDynEnum getByName( String name ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             ServiceSettingsNoDynEnum result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
+            if( result.getName().equals( name ) ) {
                 return result;
             }
         }
@@ -150,9 +151,11 @@ public enum ServiceSettingsNoDynEnum implements Enumerator {
      * @generated
      */
     public static ServiceSettingsNoDynEnum get( int value ) {
-        switch (value) {
-            case CONF_VALUE: return CONF;
-            case FIX_VALUE: return FIX;
+        switch( value ) {
+        case CONF_VALUE:
+            return CONF;
+        case FIX_VALUE:
+            return FIX;
         }
         return null;
     }
@@ -197,7 +200,7 @@ public enum ServiceSettingsNoDynEnum implements Enumerator {
      */
     @Override
     public int getValue() {
-      return value;
+        return value;
     }
 
     /**
@@ -207,7 +210,7 @@ public enum ServiceSettingsNoDynEnum implements Enumerator {
      */
     @Override
     public String getName() {
-      return name;
+        return name;
     }
 
     /**
@@ -217,7 +220,7 @@ public enum ServiceSettingsNoDynEnum implements Enumerator {
      */
     @Override
     public String getLiteral() {
-      return literal;
+        return literal;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceType.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceType.java
index 84b650b..c5ca903 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceType.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceType.java
@@ -147,7 +147,7 @@ public enum ServiceType implements Enumerator {
             REPORT,
             GOOSE,
             SMV,
-        };
+    };
 
     /**
      * A public read-only list of all the '<em><b>Service Type</b></em>' enumerators.
@@ -155,7 +155,7 @@ public enum ServiceType implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List<ServiceType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    public static final List< ServiceType > VALUES = Collections.unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
      * Returns the '<em><b>Service Type</b></em>' literal with the specified literal value.
@@ -166,9 +166,9 @@ public enum ServiceType implements Enumerator {
      * @generated
      */
     public static ServiceType get( String literal ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             ServiceType result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
+            if( result.toString().equals( literal ) ) {
                 return result;
             }
         }
@@ -184,9 +184,9 @@ public enum ServiceType implements Enumerator {
      * @generated
      */
     public static ServiceType getByName( String name ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             ServiceType result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
+            if( result.getName().equals( name ) ) {
                 return result;
             }
         }
@@ -202,11 +202,15 @@ public enum ServiceType implements Enumerator {
      * @generated
      */
     public static ServiceType get( int value ) {
-        switch (value) {
-            case POLL_VALUE: return POLL;
-            case REPORT_VALUE: return REPORT;
-            case GOOSE_VALUE: return GOOSE;
-            case SMV_VALUE: return SMV;
+        switch( value ) {
+        case POLL_VALUE:
+            return POLL;
+        case REPORT_VALUE:
+            return REPORT;
+        case GOOSE_VALUE:
+            return GOOSE;
+        case SMV_VALUE:
+            return SMV;
         }
         return null;
     }
@@ -251,7 +255,7 @@ public enum ServiceType implements Enumerator {
      */
     @Override
     public int getValue() {
-      return value;
+        return value;
     }
 
     /**
@@ -261,7 +265,7 @@ public enum ServiceType implements Enumerator {
      */
     @Override
     public String getName() {
-      return name;
+        return name;
     }
 
     /**
@@ -271,7 +275,7 @@ public enum ServiceType implements Enumerator {
      */
     @Override
     public String getLiteral() {
-      return literal;
+        return literal;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithMaxAndMaxAttributes.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithMaxAndMaxAttributes.java
index cc2e6e6..5c8c5d0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithMaxAndMaxAttributes.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithMaxAndMaxAttributes.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Service With Max And Max Attributes</b></em>'.
@@ -66,7 +65,7 @@ public interface ServiceWithMaxAndMaxAttributes extends ServiceWithMax {
      * @see #getMaxAttributes()
      * @generated
      */
-    void setMaxAttributes(Integer value);
+    void setMaxAttributes( Integer value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceWithMaxAndMaxAttributes#getMaxAttributes <em>Max Attributes</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithMaxAndModify.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithMaxAndModify.java
index 2d91c9d..c0dedb9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithMaxAndModify.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithMaxAndModify.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Service With Max And Modify</b></em>'.
@@ -66,7 +65,7 @@ public interface ServiceWithMaxAndModify extends ServiceWithMax {
      * @see #getModify()
      * @generated
      */
-    void setModify(Boolean value);
+    void setModify( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceWithMaxAndModify#getModify <em>Modify</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithMaxNonZero.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithMaxNonZero.java
index 305a344..cefd443 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithMaxNonZero.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithMaxNonZero.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Service With Max Non Zero</b></em>'.
@@ -66,7 +65,7 @@ public interface ServiceWithMaxNonZero extends SclObject {
      * @see #getMax()
      * @generated
      */
-    void setMax(Integer value);
+    void setMax( Integer value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceWithMaxNonZero#getMax <em>Max</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithOptionalMax.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithOptionalMax.java
index 07b4fc8..596229f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithOptionalMax.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceWithOptionalMax.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Service With Optional Max</b></em>'.
@@ -66,7 +65,7 @@ public interface ServiceWithOptionalMax extends SclObject {
      * @see #getMax()
      * @generated
      */
-    void setMax(Integer value);
+    void setMax( Integer value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceWithOptionalMax#getMax <em>Max</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceYesNo.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceYesNo.java
index e9d3db9..e1fb6ff 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceYesNo.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ServiceYesNo.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Service Yes No</b></em>'.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Services.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Services.java
index 17361a8..84caa23 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Services.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Services.java
@@ -100,7 +100,7 @@ public interface Services extends SclObject {
      * @see #getNameLength()
      * @generated
      */
-    void setNameLength(Integer value);
+    void setNameLength( Integer value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Services#getNameLength <em>Name Length</em>}' attribute.
@@ -147,7 +147,7 @@ public interface Services extends SclObject {
      * @see #getParentAccessPoint()
      * @generated
      */
-    void setParentAccessPoint(AccessPoint value);
+    void setParentAccessPoint( AccessPoint value );
 
     /**
      * Returns the value of the '<em><b>Client Services</b></em>' containment reference.
@@ -1326,7 +1326,7 @@ public interface Services extends SclObject {
      * @see #getParentIED()
      * @generated
      */
-    void setParentIED(IED value);
+    void setParentIED( IED value );
 
     /**
      * Returns the value of the '<em><b>Log Settings</b></em>' containment reference.
@@ -1963,7 +1963,7 @@ public interface Services extends SclObject {
      * @see #getSMVSettings()
      * @generated
      */
-    void setSMVSettings(SMVSettings value);
+    void setSMVSettings( SMVSettings value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Services#getSMVSettings <em>SMV Settings</em>}' containment reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SetDataSetValue.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SetDataSetValue.java
index 4ac6b4a..10ef0a3 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SetDataSetValue.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SetDataSetValue.java
@@ -59,6 +59,6 @@ public interface SetDataSetValue extends ServiceYesNo {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // SetDataSetValue
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SettingControl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SettingControl.java
index 880376e..9e72f07 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SettingControl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SettingControl.java
@@ -222,6 +222,6 @@ public interface SettingControl extends UnNaming {
      * @see #getParentLN0()
      * @generated
      */
-    void setParentLN0(LN0 value);
+    void setParentLN0( LN0 value );
 
 } // SettingControl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SettingGroups.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SettingGroups.java
index fe80289..0f0a344 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SettingGroups.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SettingGroups.java
@@ -171,6 +171,6 @@ public interface SettingGroups extends SclObject {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // SettingGroups
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SmpMod.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SmpMod.java
index c1ba2de..afa8c9c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SmpMod.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SmpMod.java
@@ -121,7 +121,7 @@ public enum SmpMod implements Enumerator {
             SMP_PER_PERIOD,
             SMP_PER_SEC,
             SEC_PER_SMP,
-        };
+    };
 
     /**
      * A public read-only list of all the '<em><b>Smp Mod</b></em>' enumerators.
@@ -129,7 +129,7 @@ public enum SmpMod implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List<SmpMod> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    public static final List< SmpMod > VALUES = Collections.unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
      * Returns the '<em><b>Smp Mod</b></em>' literal with the specified literal value.
@@ -140,9 +140,9 @@ public enum SmpMod implements Enumerator {
      * @generated
      */
     public static SmpMod get( String literal ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             SmpMod result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
+            if( result.toString().equals( literal ) ) {
                 return result;
             }
         }
@@ -158,9 +158,9 @@ public enum SmpMod implements Enumerator {
      * @generated
      */
     public static SmpMod getByName( String name ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             SmpMod result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
+            if( result.getName().equals( name ) ) {
                 return result;
             }
         }
@@ -176,10 +176,13 @@ public enum SmpMod implements Enumerator {
      * @generated
      */
     public static SmpMod get( int value ) {
-        switch (value) {
-            case SMP_PER_PERIOD_VALUE: return SMP_PER_PERIOD;
-            case SMP_PER_SEC_VALUE: return SMP_PER_SEC;
-            case SEC_PER_SMP_VALUE: return SEC_PER_SMP;
+        switch( value ) {
+        case SMP_PER_PERIOD_VALUE:
+            return SMP_PER_PERIOD;
+        case SMP_PER_SEC_VALUE:
+            return SMP_PER_SEC;
+        case SEC_PER_SMP_VALUE:
+            return SEC_PER_SMP;
         }
         return null;
     }
@@ -224,7 +227,7 @@ public enum SmpMod implements Enumerator {
      */
     @Override
     public int getValue() {
-      return value;
+        return value;
     }
 
     /**
@@ -234,7 +237,7 @@ public enum SmpMod implements Enumerator {
      */
     @Override
     public String getName() {
-      return name;
+        return name;
     }
 
     /**
@@ -244,7 +247,7 @@ public enum SmpMod implements Enumerator {
      */
     @Override
     public String getLiteral() {
-      return literal;
+        return literal;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SmpRate.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SmpRate.java
index 8ab6ef9..317309e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SmpRate.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SmpRate.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Smp Rate</b></em>'.
@@ -64,7 +63,7 @@ public interface SmpRate extends SclObject {
      * @see #getValue()
      * @generated
      */
-    void setValue(Integer value);
+    void setValue( Integer value );
 
     /**
      * Returns the value of the '<em><b>Parent SMV Settings</b></em>' container reference.
@@ -88,6 +87,6 @@ public interface SmpRate extends SclObject {
      * @see #getParentSMVSettings()
      * @generated
      */
-    void setParentSMVSettings(SMVSettings value);
+    void setParentSMVSettings( SMVSettings value );
 
 } // SmpRate
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SmvOpts.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SmvOpts.java
index bcba29d..3d67973 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SmvOpts.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SmvOpts.java
@@ -59,6 +59,6 @@ public interface SmvOpts extends SclObject, AgSmvOpts {
      * @see #getParentSampledValueControl()
      * @generated
      */
-    void setParentSampledValueControl(SampledValueControl value);
+    void setParentSampledValueControl( SampledValueControl value );
 
 } // SmvOpts
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SubEquipment.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SubEquipment.java
index e210717..695c8b7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SubEquipment.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SubEquipment.java
@@ -122,7 +122,7 @@ public interface SubEquipment extends PowerSystemResource, AgVirtual {
      * @see #getParentAbstractConductingEquipment()
      * @generated
      */
-    void setParentAbstractConductingEquipment(AbstractConductingEquipment value);
+    void setParentAbstractConductingEquipment( AbstractConductingEquipment value );
 
     /**
      * Returns the value of the '<em><b>Eq Function</b></em>' containment reference list.
@@ -142,7 +142,7 @@ public interface SubEquipment extends PowerSystemResource, AgVirtual {
      * @model opposite="ParentSubEquipment" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<EqFunction> getEqFunction();
+    EList< EqFunction > getEqFunction();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SubEquipment#getEqFunction <em>Eq Function</em>}' containment reference list.
@@ -187,7 +187,7 @@ public interface SubEquipment extends PowerSystemResource, AgVirtual {
      * @see #getParentPowerTransformer()
      * @generated
      */
-    void setParentPowerTransformer(PowerTransformer value);
+    void setParentPowerTransformer( PowerTransformer value );
 
     /**
      * Returns the value of the '<em><b>Parent Tap Changer</b></em>' container reference.
@@ -211,6 +211,6 @@ public interface SubEquipment extends PowerSystemResource, AgVirtual {
      * @see #getParentTapChanger()
      * @generated
      */
-    void setParentTapChanger(TapChanger value);
+    void setParentTapChanger( TapChanger value );
 
 } // SubEquipment
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SubFunction.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SubFunction.java
index e1d5949..1a15d68 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SubFunction.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SubFunction.java
@@ -115,7 +115,7 @@ public interface SubFunction extends PowerSystemResource {
      * @model opposite="ParentSubFunction" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<ConductingEquipment> getConductingEquipment();
+    EList< ConductingEquipment > getConductingEquipment();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SubFunction#getConductingEquipment <em>Conducting Equipment</em>}' containment reference list.
@@ -160,7 +160,7 @@ public interface SubFunction extends PowerSystemResource {
      * @see #getParentFunction()
      * @generated
      */
-    void setParentFunction(Function value);
+    void setParentFunction( Function value );
 
     /**
      * Returns the value of the '<em><b>General Equipment</b></em>' containment reference list.
@@ -180,7 +180,7 @@ public interface SubFunction extends PowerSystemResource {
      * @model opposite="ParentSubFunction" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<GeneralEquipment> getGeneralEquipment();
+    EList< GeneralEquipment > getGeneralEquipment();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SubFunction#getGeneralEquipment <em>General Equipment</em>}' containment reference list.
@@ -221,7 +221,7 @@ public interface SubFunction extends PowerSystemResource {
      * @model opposite="ParentSubFunction" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<SubFunction> getSubSubFunctions();
+    EList< SubFunction > getSubSubFunctions();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SubFunction#getSubSubFunctions <em>Sub Sub Functions</em>}' containment reference list.
@@ -266,6 +266,6 @@ public interface SubFunction extends PowerSystemResource {
      * @see #getParentSubFunction()
      * @generated
      */
-    void setParentSubFunction(SubFunction value);
+    void setParentSubFunction( SubFunction value );
 
 } // SubFunction
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SubNetwork.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SubNetwork.java
index 9736d56..96be20b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SubNetwork.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SubNetwork.java
@@ -125,7 +125,7 @@ public interface SubNetwork extends Naming {
      * @see #getBitRate()
      * @generated
      */
-    void setBitRate(BitRate value);
+    void setBitRate( BitRate value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SubNetwork#getBitRate <em>Bit Rate</em>}' containment reference.
@@ -172,7 +172,7 @@ public interface SubNetwork extends Naming {
      * @see #getParentCommunication()
      * @generated
      */
-    void setParentCommunication(Communication value);
+    void setParentCommunication( Communication value );
 
     /**
      * Returns the value of the '<em><b>Connected AP</b></em>' containment reference list.
@@ -192,7 +192,7 @@ public interface SubNetwork extends Naming {
      * @model opposite="ParentSubNetwork" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<ConnectedAP> getConnectedAP();
+    EList< ConnectedAP > getConnectedAP();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SubNetwork#getConnectedAP <em>Connected AP</em>}' containment reference list.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Subject.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Subject.java
index 79052e2..c596124 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Subject.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Subject.java
@@ -59,6 +59,6 @@ public interface Subject extends Cert {
      * @see #getParentCertificate()
      * @generated
      */
-    void setParentCertificate(Certificate value);
+    void setParentCertificate( Certificate value );
 
 } // Subject
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Substation.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Substation.java
index eb72620..ef655f1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Substation.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Substation.java
@@ -60,7 +60,7 @@ public interface Substation extends EquipmentContainer {
      * @model opposite="ParentSubstation" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Function> getFunction();
+    EList< Function > getFunction();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Substation#getFunction <em>Function</em>}' containment reference list.
@@ -101,7 +101,7 @@ public interface Substation extends EquipmentContainer {
      * @model opposite="ParentSubstation" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<VoltageLevel> getVoltageLevel();
+    EList< VoltageLevel > getVoltageLevel();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Substation#getVoltageLevel <em>Voltage Level</em>}' containment reference list.
@@ -146,7 +146,7 @@ public interface Substation extends EquipmentContainer {
      * @see #getParentProcess()
      * @generated
      */
-    void setParentProcess(fr.centralesupelec.edf.riseclipse.iec61850.scl.Process value);
+    void setParentProcess( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process value );
 
     /**
      * Returns the value of the '<em><b>Parent SCL</b></em>' container reference.
@@ -170,6 +170,6 @@ public interface Substation extends EquipmentContainer {
      * @see #getParentSCL()
      * @generated
      */
-    void setParentSCL(SCL value);
+    void setParentSCL( SCL value );
 
 } // Substation
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SupSubscription.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SupSubscription.java
index 0986ad6..4083e35 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SupSubscription.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SupSubscription.java
@@ -167,6 +167,6 @@ public interface SupSubscription extends SclObject {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // SupSubscription
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TapChanger.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TapChanger.java
index 7356eb0..c9d1b13 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TapChanger.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TapChanger.java
@@ -113,7 +113,7 @@ public interface TapChanger extends PowerSystemResource, AgVirtual {
      * @model opposite="ParentTapChanger" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<EqFunction> getEqFunction();
+    EList< EqFunction > getEqFunction();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.TapChanger#getEqFunction <em>Eq Function</em>}' containment reference list.
@@ -154,7 +154,7 @@ public interface TapChanger extends PowerSystemResource, AgVirtual {
      * @model opposite="ParentTapChanger" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<SubEquipment> getSubEquipment();
+    EList< SubEquipment > getSubEquipment();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.TapChanger#getSubEquipment <em>Sub Equipment</em>}' containment reference list.
@@ -199,6 +199,6 @@ public interface TapChanger extends PowerSystemResource, AgVirtual {
      * @see #getParentTransformerWinding()
      * @generated
      */
-    void setParentTransformerWinding(TransformerWinding value);
+    void setParentTransformerWinding( TransformerWinding value );
 
 } // TapChanger
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Terminal.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Terminal.java
index 08e9c45..da9e59f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Terminal.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Terminal.java
@@ -386,7 +386,7 @@ public interface Terminal extends UnNaming {
      * @see #getParentAbstractConductingEquipment()
      * @generated
      */
-    void setParentAbstractConductingEquipment(AbstractConductingEquipment value);
+    void setParentAbstractConductingEquipment( AbstractConductingEquipment value );
 
     /**
      * Returns the value of the '<em><b>Refers To Connectivity Node</b></em>' reference.
@@ -418,7 +418,7 @@ public interface Terminal extends UnNaming {
      * @see #getRefersToConnectivityNode()
      * @generated
      */
-    void setRefersToConnectivityNode(ConnectivityNode value);
+    void setRefersToConnectivityNode( ConnectivityNode value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal#getRefersToConnectivityNode <em>Refers To Connectivity Node</em>}' reference.
@@ -471,7 +471,7 @@ public interface Terminal extends UnNaming {
      * @see #getName()
      * @generated
      */
-    void setName(String value);
+    void setName( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal#getName <em>Name</em>}' attribute.
@@ -524,7 +524,7 @@ public interface Terminal extends UnNaming {
      * @see #getLineName()
      * @generated
      */
-    void setLineName(String value);
+    void setLineName( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal#getLineName <em>Line Name</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Text.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Text.java
index fb783c4..91ce2ad 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Text.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Text.java
@@ -115,7 +115,7 @@ public interface Text extends SclObject {
      * @see #getParentBaseElement()
      * @generated
      */
-    void setParentBaseElement(BaseElement value);
+    void setParentBaseElement( BaseElement value );
 
     /**
      * Returns the value of the '<em><b>Parent Header</b></em>' container reference.
@@ -139,7 +139,7 @@ public interface Text extends SclObject {
      * @see #getParentHeader()
      * @generated
      */
-    void setParentHeader(Header value);
+    void setParentHeader( Header value );
 
     /**
      * Returns the value of the '<em><b>Value</b></em>' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TimeSyncProt.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TimeSyncProt.java
index f73c8e6..eabc8a1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TimeSyncProt.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TimeSyncProt.java
@@ -223,7 +223,7 @@ public interface TimeSyncProt extends SclObject {
      * @see #getParentClientServices()
      * @generated
      */
-    void setParentClientServices(ClientServices value);
+    void setParentClientServices( ClientServices value );
 
     /**
      * Returns the value of the '<em><b>Parent Services</b></em>' container reference.
@@ -247,7 +247,7 @@ public interface TimeSyncProt extends SclObject {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
     /**
      * Returns the value of the '<em><b>Iec61850 93</b></em>' attribute.
@@ -277,7 +277,7 @@ public interface TimeSyncProt extends SclObject {
      * @see #getIec61850_9_3()
      * @generated
      */
-    void setIec61850_9_3(Boolean value);
+    void setIec61850_9_3( Boolean value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.TimeSyncProt#getIec61850_9_3 <em>Iec61850 93</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TimerActivatedControl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TimerActivatedControl.java
index 9e32918..db2bb00 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TimerActivatedControl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TimerActivatedControl.java
@@ -59,6 +59,6 @@ public interface TimerActivatedControl extends ServiceYesNo {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // TimerActivatedControl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TransformerWinding.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TransformerWinding.java
index 7b9993d..57ebfe0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TransformerWinding.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TransformerWinding.java
@@ -114,7 +114,7 @@ public interface TransformerWinding extends AbstractConductingEquipment {
      * @model opposite="ParentTransformerWinding" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<EqFunction> getEqFunction();
+    EList< EqFunction > getEqFunction();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.TransformerWinding#getEqFunction <em>Eq Function</em>}' containment reference list.
@@ -214,7 +214,7 @@ public interface TransformerWinding extends AbstractConductingEquipment {
      * @see #getParentPowerTransformer()
      * @generated
      */
-    void setParentPowerTransformer(PowerTransformer value);
+    void setParentPowerTransformer( PowerTransformer value );
 
     /**
      * Returns the value of the '<em><b>Tap Changer</b></em>' containment reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TrgOps.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TrgOps.java
index c2447a3..9b2225f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TrgOps.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/TrgOps.java
@@ -329,6 +329,6 @@ public interface TrgOps extends SclObject {
      * @see #getParentControlWithTriggerOpt()
      * @generated
      */
-    void setParentControlWithTriggerOpt(ControlWithTriggerOpt value);
+    void setParentControlWithTriggerOpt( ControlWithTriggerOpt value );
 
 } // TrgOps
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/UnNaming.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/UnNaming.java
index e723b1b..05b6bcc 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/UnNaming.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/UnNaming.java
@@ -20,7 +20,6 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Un Naming</b></em>'.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/UnitMultiplierEnum.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/UnitMultiplierEnum.java
index 4045257..a8f9e59 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/UnitMultiplierEnum.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/UnitMultiplierEnum.java
@@ -589,7 +589,7 @@ public enum UnitMultiplierEnum implements Enumerator {
             Z,
             Y,
             NONE,
-        };
+    };
 
     /**
      * A public read-only list of all the '<em><b>Unit Multiplier Enum</b></em>' enumerators.
@@ -597,7 +597,8 @@ public enum UnitMultiplierEnum implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List<UnitMultiplierEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    public static final List< UnitMultiplierEnum > VALUES = Collections
+            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
      * Returns the '<em><b>Unit Multiplier Enum</b></em>' literal with the specified literal value.
@@ -608,9 +609,9 @@ public enum UnitMultiplierEnum implements Enumerator {
      * @generated
      */
     public static UnitMultiplierEnum get( String literal ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             UnitMultiplierEnum result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
+            if( result.toString().equals( literal ) ) {
                 return result;
             }
         }
@@ -626,9 +627,9 @@ public enum UnitMultiplierEnum implements Enumerator {
      * @generated
      */
     public static UnitMultiplierEnum getByName( String name ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             UnitMultiplierEnum result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
+            if( result.getName().equals( name ) ) {
                 return result;
             }
         }
@@ -644,28 +645,49 @@ public enum UnitMultiplierEnum implements Enumerator {
      * @generated
      */
     public static UnitMultiplierEnum get( int value ) {
-        switch (value) {
-            case MILLI_VALUE: return MILLI;
-            case K_VALUE: return K;
-            case M_VALUE: return M;
-            case MU_VALUE: return MU;
-            case YOCTO_VALUE: return YOCTO;
-            case ZEPTO_VALUE: return ZEPTO;
-            case A_VALUE: return A;
-            case F_VALUE: return F;
-            case PICO_VALUE: return PICO;
-            case N_VALUE: return N;
-            case C_VALUE: return C;
-            case D_VALUE: return D;
-            case DA_VALUE: return DA;
-            case H_VALUE: return H;
-            case G_VALUE: return G;
-            case T_VALUE: return T;
-            case P_VALUE: return P;
-            case E_VALUE: return E;
-            case Z_VALUE: return Z;
-            case Y_VALUE: return Y;
-            case NONE_VALUE: return NONE;
+        switch( value ) {
+        case MILLI_VALUE:
+            return MILLI;
+        case K_VALUE:
+            return K;
+        case M_VALUE:
+            return M;
+        case MU_VALUE:
+            return MU;
+        case YOCTO_VALUE:
+            return YOCTO;
+        case ZEPTO_VALUE:
+            return ZEPTO;
+        case A_VALUE:
+            return A;
+        case F_VALUE:
+            return F;
+        case PICO_VALUE:
+            return PICO;
+        case N_VALUE:
+            return N;
+        case C_VALUE:
+            return C;
+        case D_VALUE:
+            return D;
+        case DA_VALUE:
+            return DA;
+        case H_VALUE:
+            return H;
+        case G_VALUE:
+            return G;
+        case T_VALUE:
+            return T;
+        case P_VALUE:
+            return P;
+        case E_VALUE:
+            return E;
+        case Z_VALUE:
+            return Z;
+        case Y_VALUE:
+            return Y;
+        case NONE_VALUE:
+            return NONE;
         }
         return null;
     }
@@ -710,7 +732,7 @@ public enum UnitMultiplierEnum implements Enumerator {
      */
     @Override
     public int getValue() {
-      return value;
+        return value;
     }
 
     /**
@@ -720,7 +742,7 @@ public enum UnitMultiplierEnum implements Enumerator {
      */
     @Override
     public String getName() {
-      return name;
+        return name;
     }
 
     /**
@@ -730,7 +752,7 @@ public enum UnitMultiplierEnum implements Enumerator {
      */
     @Override
     public String getLiteral() {
-      return literal;
+        return literal;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Val.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Val.java
index 1d303ab..71995d1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Val.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Val.java
@@ -115,7 +115,7 @@ public interface Val extends SclObject {
      * @see #getParentAbstractDataAttribute()
      * @generated
      */
-    void setParentAbstractDataAttribute(AbstractDataAttribute value);
+    void setParentAbstractDataAttribute( AbstractDataAttribute value );
 
     /**
      * Returns the value of the '<em><b>Parent DAI</b></em>' container reference.
@@ -139,7 +139,7 @@ public interface Val extends SclObject {
      * @see #getParentDAI()
      * @generated
      */
-    void setParentDAI(DAI value);
+    void setParentDAI( DAI value );
 
     /**
      * Returns the value of the '<em><b>Value</b></em>' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ValKindEnum.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ValKindEnum.java
index 5bce00a..9f51857 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ValKindEnum.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ValKindEnum.java
@@ -147,7 +147,7 @@ public enum ValKindEnum implements Enumerator {
             CONF,
             RO,
             SET,
-        };
+    };
 
     /**
      * A public read-only list of all the '<em><b>Val Kind Enum</b></em>' enumerators.
@@ -155,7 +155,7 @@ public enum ValKindEnum implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List<ValKindEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    public static final List< ValKindEnum > VALUES = Collections.unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
      * Returns the '<em><b>Val Kind Enum</b></em>' literal with the specified literal value.
@@ -166,9 +166,9 @@ public enum ValKindEnum implements Enumerator {
      * @generated
      */
     public static ValKindEnum get( String literal ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             ValKindEnum result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
+            if( result.toString().equals( literal ) ) {
                 return result;
             }
         }
@@ -184,9 +184,9 @@ public enum ValKindEnum implements Enumerator {
      * @generated
      */
     public static ValKindEnum getByName( String name ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             ValKindEnum result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
+            if( result.getName().equals( name ) ) {
                 return result;
             }
         }
@@ -202,11 +202,15 @@ public enum ValKindEnum implements Enumerator {
      * @generated
      */
     public static ValKindEnum get( int value ) {
-        switch (value) {
-            case SPEC_VALUE: return SPEC;
-            case CONF_VALUE: return CONF;
-            case RO_VALUE: return RO;
-            case SET_VALUE: return SET;
+        switch( value ) {
+        case SPEC_VALUE:
+            return SPEC;
+        case CONF_VALUE:
+            return CONF;
+        case RO_VALUE:
+            return RO;
+        case SET_VALUE:
+            return SET;
         }
         return null;
     }
@@ -251,7 +255,7 @@ public enum ValKindEnum implements Enumerator {
      */
     @Override
     public int getValue() {
-      return value;
+        return value;
     }
 
     /**
@@ -261,7 +265,7 @@ public enum ValKindEnum implements Enumerator {
      */
     @Override
     public String getName() {
-      return name;
+        return name;
     }
 
     /**
@@ -271,7 +275,7 @@ public enum ValKindEnum implements Enumerator {
      */
     @Override
     public String getLiteral() {
-      return literal;
+        return literal;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ValueHandling.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ValueHandling.java
index 7f7183d..a39a020 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ValueHandling.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ValueHandling.java
@@ -113,6 +113,6 @@ public interface ValueHandling extends SclObject {
      * @see #getParentServices()
      * @generated
      */
-    void setParentServices(Services value);
+    void setParentServices( Services value );
 
 } // ValueHandling
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ValueWithUnit.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ValueWithUnit.java
index 5e03b0e..6b9c7a5 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ValueWithUnit.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/ValueWithUnit.java
@@ -66,7 +66,7 @@ public interface ValueWithUnit extends SclObject {
      * @see #getValue()
      * @generated
      */
-    void setValue(BigDecimal value);
+    void setValue( BigDecimal value );
 
     /**
      * Returns the value of the '<em><b>Multiplier</b></em>' attribute.
@@ -99,7 +99,7 @@ public interface ValueWithUnit extends SclObject {
      * @see #getMultiplier()
      * @generated
      */
-    void setMultiplier(UnitMultiplierEnum value);
+    void setMultiplier( UnitMultiplierEnum value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ValueWithUnit#getMultiplier <em>Multiplier</em>}' attribute.
@@ -152,7 +152,7 @@ public interface ValueWithUnit extends SclObject {
      * @see #getUnit()
      * @generated
      */
-    void setUnit(String value);
+    void setUnit( String value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ValueWithUnit#getUnit <em>Unit</em>}' attribute.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Voltage.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Voltage.java
index 7feb634..fb8774f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Voltage.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/Voltage.java
@@ -61,7 +61,7 @@ public interface Voltage extends ValueWithUnit {
      * @see #getParentLine()
      * @generated
      */
-    void setParentLine(Line value);
+    void setParentLine( Line value );
 
     /**
      * Returns the value of the '<em><b>Parent Voltage Level</b></em>' container reference.
@@ -85,6 +85,6 @@ public interface Voltage extends ValueWithUnit {
      * @see #getParentVoltageLevel()
      * @generated
      */
-    void setParentVoltageLevel(VoltageLevel value);
+    void setParentVoltageLevel( VoltageLevel value );
 
 } // Voltage
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/VoltageLevel.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/VoltageLevel.java
index 21468da..06a0e69 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/VoltageLevel.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/VoltageLevel.java
@@ -127,7 +127,7 @@ public interface VoltageLevel extends EquipmentContainer {
      * @see #getNumPhases()
      * @generated
      */
-    void setNumPhases(Integer value);
+    void setNumPhases( Integer value );
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.VoltageLevel#getNumPhases <em>Num Phases</em>}' attribute.
@@ -170,7 +170,7 @@ public interface VoltageLevel extends EquipmentContainer {
      * @model opposite="ParentVoltageLevel" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Bay> getBay();
+    EList< Bay > getBay();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.VoltageLevel#getBay <em>Bay</em>}' containment reference list.
@@ -211,7 +211,7 @@ public interface VoltageLevel extends EquipmentContainer {
      * @model opposite="ParentVoltageLevel" containment="true" unsettable="true" ordered="false"
      * @generated
      */
-    EList<Function> getFunction();
+    EList< Function > getFunction();
 
     /**
      * Unsets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.VoltageLevel#getFunction <em>Function</em>}' containment reference list.
@@ -256,7 +256,7 @@ public interface VoltageLevel extends EquipmentContainer {
      * @see #getParentSubstation()
      * @generated
      */
-    void setParentSubstation(Substation value);
+    void setParentSubstation( Substation value );
 
     /**
      * Returns the value of the '<em><b>Voltage</b></em>' containment reference.
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/bufModeEnum.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/bufModeEnum.java
index d25b499..8981d30 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/bufModeEnum.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/bufModeEnum.java
@@ -121,7 +121,7 @@ public enum bufModeEnum implements Enumerator {
             UNBUFFERED,
             BUFFERED,
             BOTH,
-        };
+    };
 
     /**
      * A public read-only list of all the '<em><b>buf Mode Enum</b></em>' enumerators.
@@ -129,7 +129,7 @@ public enum bufModeEnum implements Enumerator {
      * <!-- end-user-doc -->
      * @generated
      */
-    public static final List<bufModeEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    public static final List< bufModeEnum > VALUES = Collections.unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
 
     /**
      * Returns the '<em><b>buf Mode Enum</b></em>' literal with the specified literal value.
@@ -140,9 +140,9 @@ public enum bufModeEnum implements Enumerator {
      * @generated
      */
     public static bufModeEnum get( String literal ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             bufModeEnum result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
+            if( result.toString().equals( literal ) ) {
                 return result;
             }
         }
@@ -158,9 +158,9 @@ public enum bufModeEnum implements Enumerator {
      * @generated
      */
     public static bufModeEnum getByName( String name ) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+        for( int i = 0; i < VALUES_ARRAY.length; ++i ) {
             bufModeEnum result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
+            if( result.getName().equals( name ) ) {
                 return result;
             }
         }
@@ -176,10 +176,13 @@ public enum bufModeEnum implements Enumerator {
      * @generated
      */
     public static bufModeEnum get( int value ) {
-        switch (value) {
-            case UNBUFFERED_VALUE: return UNBUFFERED;
-            case BUFFERED_VALUE: return BUFFERED;
-            case BOTH_VALUE: return BOTH;
+        switch( value ) {
+        case UNBUFFERED_VALUE:
+            return UNBUFFERED;
+        case BUFFERED_VALUE:
+            return BUFFERED;
+        case BOTH_VALUE:
+            return BOTH;
         }
         return null;
     }
@@ -224,7 +227,7 @@ public enum bufModeEnum implements Enumerator {
      */
     @Override
     public int getValue() {
-      return value;
+        return value;
     }
 
     /**
@@ -234,7 +237,7 @@ public enum bufModeEnum implements Enumerator {
      */
     @Override
     public String getName() {
-      return name;
+        return name;
     }
 
     /**
@@ -244,7 +247,7 @@ public enum bufModeEnum implements Enumerator {
      */
     @Override
     public String getLiteral() {
-      return literal;
+        return literal;
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractConductingEquipmentImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractConductingEquipmentImpl.java
index bea9c5b..98fdacd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractConductingEquipmentImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractConductingEquipmentImpl.java
@@ -60,7 +60,7 @@ public class AbstractConductingEquipmentImpl extends EquipmentImpl implements Ab
      * @generated
      * @ordered
      */
-    protected EList<SubEquipment> subEquipment;
+    protected EList< SubEquipment > subEquipment;
 
     /**
      * The cached value of the '{@link #getTerminal() <em>Terminal</em>}' containment reference list.
@@ -70,7 +70,7 @@ public class AbstractConductingEquipmentImpl extends EquipmentImpl implements Ab
      * @generated
      * @ordered
      */
-    protected EList<Terminal> terminal;
+    protected EList< Terminal > terminal;
 
     /**
      * <!-- begin-user-doc -->
@@ -97,9 +97,11 @@ public class AbstractConductingEquipmentImpl extends EquipmentImpl implements Ab
      * @generated
      */
     @Override
-    public EList<SubEquipment> getSubEquipment() {
-        if (subEquipment == null) {
-            subEquipment = new EObjectContainmentWithInverseEList.Unsettable<SubEquipment>(SubEquipment.class, this, SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT, SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT);
+    public EList< SubEquipment > getSubEquipment() {
+        if( subEquipment == null ) {
+            subEquipment = new EObjectContainmentWithInverseEList.Unsettable< SubEquipment >( SubEquipment.class, this,
+                    SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT,
+                    SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT );
         }
         return subEquipment;
     }
@@ -111,7 +113,7 @@ public class AbstractConductingEquipmentImpl extends EquipmentImpl implements Ab
      */
     @Override
     public void unsetSubEquipment() {
-        if (subEquipment != null) ((InternalEList.Unsettable<?>)subEquipment).unset();
+        if( subEquipment != null ) ( ( InternalEList.Unsettable< ? > ) subEquipment ).unset();
     }
 
     /**
@@ -121,7 +123,7 @@ public class AbstractConductingEquipmentImpl extends EquipmentImpl implements Ab
      */
     @Override
     public boolean isSetSubEquipment() {
-        return subEquipment != null && ((InternalEList.Unsettable<?>)subEquipment).isSet();
+        return subEquipment != null && ( ( InternalEList.Unsettable< ? > ) subEquipment ).isSet();
     }
 
     /**
@@ -130,9 +132,11 @@ public class AbstractConductingEquipmentImpl extends EquipmentImpl implements Ab
      * @generated
      */
     @Override
-    public EList<Terminal> getTerminal() {
-        if (terminal == null) {
-            terminal = new EObjectContainmentWithInverseEList.Unsettable<Terminal>(Terminal.class, this, SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL, SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT);
+    public EList< Terminal > getTerminal() {
+        if( terminal == null ) {
+            terminal = new EObjectContainmentWithInverseEList.Unsettable< Terminal >( Terminal.class, this,
+                    SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL,
+                    SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT );
         }
         return terminal;
     }
@@ -144,7 +148,7 @@ public class AbstractConductingEquipmentImpl extends EquipmentImpl implements Ab
      */
     @Override
     public void unsetTerminal() {
-        if (terminal != null) ((InternalEList.Unsettable<?>)terminal).unset();
+        if( terminal != null ) ( ( InternalEList.Unsettable< ? > ) terminal ).unset();
     }
 
     /**
@@ -154,7 +158,7 @@ public class AbstractConductingEquipmentImpl extends EquipmentImpl implements Ab
      */
     @Override
     public boolean isSetTerminal() {
-        return terminal != null && ((InternalEList.Unsettable<?>)terminal).isSet();
+        return terminal != null && ( ( InternalEList.Unsettable< ? > ) terminal ).isSet();
     }
 
     /**
@@ -165,13 +169,15 @@ public class AbstractConductingEquipmentImpl extends EquipmentImpl implements Ab
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSubEquipment()).basicAdd(otherEnd, msgs);
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getTerminal()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSubEquipment() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getTerminal() ).basicAdd( otherEnd,
+                    msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -181,13 +187,13 @@ public class AbstractConductingEquipmentImpl extends EquipmentImpl implements Ab
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
-                return ((InternalEList<?>)getSubEquipment()).basicRemove(otherEnd, msgs);
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
-                return ((InternalEList<?>)getTerminal()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
+            return ( ( InternalEList< ? > ) getSubEquipment() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
+            return ( ( InternalEList< ? > ) getTerminal() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -197,13 +203,13 @@ public class AbstractConductingEquipmentImpl extends EquipmentImpl implements Ab
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
-                return getSubEquipment();
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
-                return getTerminal();
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
+            return getSubEquipment();
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
+            return getTerminal();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -214,17 +220,17 @@ public class AbstractConductingEquipmentImpl extends EquipmentImpl implements Ab
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
-                getSubEquipment().clear();
-                getSubEquipment().addAll((Collection<? extends SubEquipment>)newValue);
-                return;
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
-                getTerminal().clear();
-                getTerminal().addAll((Collection<? extends Terminal>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
+            getSubEquipment().clear();
+            getSubEquipment().addAll( ( Collection< ? extends SubEquipment > ) newValue );
+            return;
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
+            getTerminal().clear();
+            getTerminal().addAll( ( Collection< ? extends Terminal > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -234,15 +240,15 @@ public class AbstractConductingEquipmentImpl extends EquipmentImpl implements Ab
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
-                unsetSubEquipment();
-                return;
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
-                unsetTerminal();
-                return;
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
+            unsetSubEquipment();
+            return;
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
+            unsetTerminal();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -252,13 +258,13 @@ public class AbstractConductingEquipmentImpl extends EquipmentImpl implements Ab
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
-                return isSetSubEquipment();
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
-                return isSetTerminal();
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT:
+            return isSetSubEquipment();
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL:
+            return isSetTerminal();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //AbstractConductingEquipmentImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractDataAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractDataAttributeImpl.java
index 71cbf34..67dad5c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractDataAttributeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractDataAttributeImpl.java
@@ -280,7 +280,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * @generated
      * @ordered
      */
-    protected EList<Val> val;
+    protected EList< Val > val;
 
     /**
      * The cached value of the '{@link #getRefersToDAType() <em>Refers To DA Type</em>}' reference.
@@ -309,7 +309,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * @generated
      * @ordered
      */
-    protected EList<FCDA> referredByFCDA;
+    protected EList< FCDA > referredByFCDA;
 
     /**
      * The cached value of the '{@link #getReferredByExtRef() <em>Referred By Ext Ref</em>}' reference list.
@@ -319,7 +319,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * @generated
      * @ordered
      */
-    protected EList<ExtRef> referredByExtRef;
+    protected EList< ExtRef > referredByExtRef;
 
     /**
      * The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -358,7 +358,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * @generated
      * @ordered
      */
-    protected EList<DAI> referredByDAI;
+    protected EList< DAI > referredByDAI;
 
     /**
      * The cached value of the '{@link #getReferredBySDI() <em>Referred By SDI</em>}' reference list.
@@ -368,7 +368,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * @generated
      * @ordered
      */
-    protected EList<SDI> referredBySDI;
+    protected EList< SDI > referredBySDI;
 
     /**
      * <!-- begin-user-doc -->
@@ -410,8 +410,9 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
         bType = newBType;
         boolean oldBTypeESet = bTypeESet;
         bTypeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE, oldBType, bType, !oldBTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE, oldBType,
+                    bType, !oldBTypeESet ) );
     }
 
     /**
@@ -425,8 +426,9 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
         boolean oldBTypeESet = bTypeESet;
         bType = BTYPE_EDEFAULT;
         bTypeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE, oldBType, BTYPE_EDEFAULT, oldBTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE,
+                    oldBType, BTYPE_EDEFAULT, oldBTypeESet ) );
     }
 
     /**
@@ -455,13 +457,14 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * @generated
      */
     @Override
-    public void setCount(String newCount) {
+    public void setCount( String newCount ) {
         String oldCount = count;
         count = newCount;
         boolean oldCountESet = countESet;
         countESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT, oldCount, count, !oldCountESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT, oldCount,
+                    count, !oldCountESet ) );
     }
 
     /**
@@ -475,8 +478,9 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
         boolean oldCountESet = countESet;
         count = COUNT_EDEFAULT;
         countESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT, oldCount, COUNT_EDEFAULT, oldCountESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT,
+                    oldCount, COUNT_EDEFAULT, oldCountESet ) );
     }
 
     /**
@@ -510,8 +514,9 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
         sAddr = newSAddr;
         boolean oldSAddrESet = sAddrESet;
         sAddrESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR, oldSAddr, sAddr, !oldSAddrESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR, oldSAddr,
+                    sAddr, !oldSAddrESet ) );
     }
 
     /**
@@ -525,8 +530,9 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
         boolean oldSAddrESet = sAddrESet;
         sAddr = SADDR_EDEFAULT;
         sAddrESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR, oldSAddr, SADDR_EDEFAULT, oldSAddrESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR,
+                    oldSAddr, SADDR_EDEFAULT, oldSAddrESet ) );
     }
 
     /**
@@ -560,8 +566,9 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE, oldType,
+                    type, !oldTypeESet ) );
     }
 
     /**
@@ -575,8 +582,9 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE, oldType,
+                    TYPE_EDEFAULT, oldTypeESet ) );
     }
 
     /**
@@ -610,8 +618,9 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
         valImport = newValImport;
         boolean oldValImportESet = valImportESet;
         valImportESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT, oldValImport, valImport, !oldValImportESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT,
+                    oldValImport, valImport, !oldValImportESet ) );
     }
 
     /**
@@ -625,8 +634,9 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
         boolean oldValImportESet = valImportESet;
         valImport = VAL_IMPORT_EDEFAULT;
         valImportESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT, oldValImport, VAL_IMPORT_EDEFAULT, oldValImportESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT,
+                    oldValImport, VAL_IMPORT_EDEFAULT, oldValImportESet ) );
     }
 
     /**
@@ -660,8 +670,9 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
         valKind = newValKind == null ? VAL_KIND_EDEFAULT : newValKind;
         boolean oldValKindESet = valKindESet;
         valKindESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND, oldValKind, valKind, !oldValKindESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND,
+                    oldValKind, valKind, !oldValKindESet ) );
     }
 
     /**
@@ -675,8 +686,9 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
         boolean oldValKindESet = valKindESet;
         valKind = VAL_KIND_EDEFAULT;
         valKindESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND, oldValKind, VAL_KIND_EDEFAULT, oldValKindESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND,
+                    oldValKind, VAL_KIND_EDEFAULT, oldValKindESet ) );
     }
 
     /**
@@ -704,14 +716,19 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToEnumType(EnumType newRefersToEnumType, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToEnumType( EnumType newRefersToEnumType, NotificationChain msgs ) {
         EnumType oldRefersToEnumType = refersToEnumType;
         refersToEnumType = newRefersToEnumType;
         boolean oldRefersToEnumTypeESet = refersToEnumTypeESet;
         refersToEnumTypeESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE, oldRefersToEnumType, newRefersToEnumType, !oldRefersToEnumTypeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE, oldRefersToEnumType, newRefersToEnumType,
+                    !oldRefersToEnumTypeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -722,21 +739,25 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * @generated
      */
     @Override
-    public void setRefersToEnumType(EnumType newRefersToEnumType) {
-        if (newRefersToEnumType != refersToEnumType) {
+    public void setRefersToEnumType( EnumType newRefersToEnumType ) {
+        if( newRefersToEnumType != refersToEnumType ) {
             NotificationChain msgs = null;
-            if (refersToEnumType != null)
-                msgs = ((InternalEObject)refersToEnumType).eInverseRemove(this, SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, EnumType.class, msgs);
-            if (newRefersToEnumType != null)
-                msgs = ((InternalEObject)newRefersToEnumType).eInverseAdd(this, SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, EnumType.class, msgs);
-            msgs = basicSetRefersToEnumType(newRefersToEnumType, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToEnumType != null )
+                msgs = ( ( InternalEObject ) refersToEnumType ).eInverseRemove( this,
+                        SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, EnumType.class, msgs );
+            if( newRefersToEnumType != null )
+                msgs = ( ( InternalEObject ) newRefersToEnumType ).eInverseAdd( this,
+                        SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, EnumType.class, msgs );
+            msgs = basicSetRefersToEnumType( newRefersToEnumType, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToEnumTypeESet = refersToEnumTypeESet;
             refersToEnumTypeESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE, newRefersToEnumType, newRefersToEnumType, !oldRefersToEnumTypeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET,
+                        SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE, newRefersToEnumType,
+                        newRefersToEnumType, !oldRefersToEnumTypeESet ) );
         }
     }
 
@@ -745,14 +766,19 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToEnumType(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToEnumType( NotificationChain msgs ) {
         EnumType oldRefersToEnumType = refersToEnumType;
         refersToEnumType = null;
         boolean oldRefersToEnumTypeESet = refersToEnumTypeESet;
         refersToEnumTypeESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE, oldRefersToEnumType, null, oldRefersToEnumTypeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE, oldRefersToEnumType, null,
+                    oldRefersToEnumTypeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -764,17 +790,20 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public void unsetRefersToEnumType() {
-        if (refersToEnumType != null) {
+        if( refersToEnumType != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToEnumType).eInverseRemove(this, SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, EnumType.class, msgs);
-            msgs = basicUnsetRefersToEnumType(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToEnumType ).eInverseRemove( this,
+                    SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, EnumType.class, msgs );
+            msgs = basicUnsetRefersToEnumType( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToEnumTypeESet = refersToEnumTypeESet;
             refersToEnumTypeESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE, null, null, oldRefersToEnumTypeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET,
+                        SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE, null, null,
+                        oldRefersToEnumTypeESet ) );
         }
     }
 
@@ -794,9 +823,10 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * @generated
      */
     @Override
-    public EList<Val> getVal() {
-        if (val == null) {
-            val = new EObjectContainmentWithInverseEList.Unsettable<Val>(Val.class, this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL, SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE);
+    public EList< Val > getVal() {
+        if( val == null ) {
+            val = new EObjectContainmentWithInverseEList.Unsettable< Val >( Val.class, this,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL, SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE );
         }
         return val;
     }
@@ -808,7 +838,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public void unsetVal() {
-        if (val != null) ((InternalEList.Unsettable<?>)val).unset();
+        if( val != null ) ( ( InternalEList.Unsettable< ? > ) val ).unset();
     }
 
     /**
@@ -818,7 +848,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public boolean isSetVal() {
-        return val != null && ((InternalEList.Unsettable<?>)val).isSet();
+        return val != null && ( ( InternalEList.Unsettable< ? > ) val ).isSet();
     }
 
     /**
@@ -836,14 +866,19 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToDAType(DAType newRefersToDAType, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToDAType( DAType newRefersToDAType, NotificationChain msgs ) {
         DAType oldRefersToDAType = refersToDAType;
         refersToDAType = newRefersToDAType;
         boolean oldRefersToDATypeESet = refersToDATypeESet;
         refersToDATypeESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE, oldRefersToDAType, newRefersToDAType, !oldRefersToDATypeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE, oldRefersToDAType, newRefersToDAType,
+                    !oldRefersToDATypeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -854,21 +889,25 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * @generated
      */
     @Override
-    public void setRefersToDAType(DAType newRefersToDAType) {
-        if (newRefersToDAType != refersToDAType) {
+    public void setRefersToDAType( DAType newRefersToDAType ) {
+        if( newRefersToDAType != refersToDAType ) {
             NotificationChain msgs = null;
-            if (refersToDAType != null)
-                msgs = ((InternalEObject)refersToDAType).eInverseRemove(this, SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, DAType.class, msgs);
-            if (newRefersToDAType != null)
-                msgs = ((InternalEObject)newRefersToDAType).eInverseAdd(this, SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, DAType.class, msgs);
-            msgs = basicSetRefersToDAType(newRefersToDAType, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToDAType != null )
+                msgs = ( ( InternalEObject ) refersToDAType ).eInverseRemove( this,
+                        SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, DAType.class, msgs );
+            if( newRefersToDAType != null )
+                msgs = ( ( InternalEObject ) newRefersToDAType ).eInverseAdd( this,
+                        SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, DAType.class, msgs );
+            msgs = basicSetRefersToDAType( newRefersToDAType, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToDATypeESet = refersToDATypeESet;
             refersToDATypeESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE, newRefersToDAType, newRefersToDAType, !oldRefersToDATypeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET,
+                        SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE, newRefersToDAType, newRefersToDAType,
+                        !oldRefersToDATypeESet ) );
         }
     }
 
@@ -877,14 +916,19 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToDAType(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToDAType( NotificationChain msgs ) {
         DAType oldRefersToDAType = refersToDAType;
         refersToDAType = null;
         boolean oldRefersToDATypeESet = refersToDATypeESet;
         refersToDATypeESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE, oldRefersToDAType, null, oldRefersToDATypeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE, oldRefersToDAType, null,
+                    oldRefersToDATypeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -896,17 +940,19 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public void unsetRefersToDAType() {
-        if (refersToDAType != null) {
+        if( refersToDAType != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToDAType).eInverseRemove(this, SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, DAType.class, msgs);
-            msgs = basicUnsetRefersToDAType(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToDAType ).eInverseRemove( this,
+                    SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, DAType.class, msgs );
+            msgs = basicUnsetRefersToDAType( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToDATypeESet = refersToDATypeESet;
             refersToDATypeESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE, null, null, oldRefersToDATypeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET,
+                        SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE, null, null, oldRefersToDATypeESet ) );
         }
     }
 
@@ -926,9 +972,11 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * @generated
      */
     @Override
-    public EList<FCDA> getReferredByFCDA() {
-        if (referredByFCDA == null) {
-            referredByFCDA = new EObjectWithInverseEList.Unsettable.ManyInverse<FCDA>(FCDA.class, this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA, SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE);
+    public EList< FCDA > getReferredByFCDA() {
+        if( referredByFCDA == null ) {
+            referredByFCDA = new EObjectWithInverseEList.Unsettable.ManyInverse< FCDA >( FCDA.class, this,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA,
+                    SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE );
         }
         return referredByFCDA;
     }
@@ -940,7 +988,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public void unsetReferredByFCDA() {
-        if (referredByFCDA != null) ((InternalEList.Unsettable<?>)referredByFCDA).unset();
+        if( referredByFCDA != null ) ( ( InternalEList.Unsettable< ? > ) referredByFCDA ).unset();
     }
 
     /**
@@ -950,7 +998,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public boolean isSetReferredByFCDA() {
-        return referredByFCDA != null && ((InternalEList.Unsettable<?>)referredByFCDA).isSet();
+        return referredByFCDA != null && ( ( InternalEList.Unsettable< ? > ) referredByFCDA ).isSet();
     }
 
     /**
@@ -959,9 +1007,11 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * @generated
      */
     @Override
-    public EList<ExtRef> getReferredByExtRef() {
-        if (referredByExtRef == null) {
-            referredByExtRef = new EObjectWithInverseEList.Unsettable<ExtRef>(ExtRef.class, this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF, SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE);
+    public EList< ExtRef > getReferredByExtRef() {
+        if( referredByExtRef == null ) {
+            referredByExtRef = new EObjectWithInverseEList.Unsettable< ExtRef >( ExtRef.class, this,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF,
+                    SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE );
         }
         return referredByExtRef;
     }
@@ -973,7 +1023,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public void unsetReferredByExtRef() {
-        if (referredByExtRef != null) ((InternalEList.Unsettable<?>)referredByExtRef).unset();
+        if( referredByExtRef != null ) ( ( InternalEList.Unsettable< ? > ) referredByExtRef ).unset();
     }
 
     /**
@@ -983,7 +1033,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public boolean isSetReferredByExtRef() {
-        return referredByExtRef != null && ((InternalEList.Unsettable<?>)referredByExtRef).isSet();
+        return referredByExtRef != null && ( ( InternalEList.Unsettable< ? > ) referredByExtRef ).isSet();
     }
 
     /**
@@ -1002,13 +1052,14 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * @generated
      */
     @Override
-    public void setName(String newName) {
+    public void setName( String newName ) {
         String oldName = name;
         name = newName;
         boolean oldNameESet = nameESet;
         nameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME, oldName, name, !oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME, oldName,
+                    name, !oldNameESet ) );
     }
 
     /**
@@ -1022,8 +1073,9 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
         boolean oldNameESet = nameESet;
         name = NAME_EDEFAULT;
         nameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME, oldName, NAME_EDEFAULT, oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME, oldName,
+                    NAME_EDEFAULT, oldNameESet ) );
     }
 
     /**
@@ -1042,9 +1094,11 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * @generated
      */
     @Override
-    public EList<DAI> getReferredByDAI() {
-        if (referredByDAI == null) {
-            referredByDAI = new EObjectWithInverseEList.Unsettable<DAI>(DAI.class, this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI, SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE);
+    public EList< DAI > getReferredByDAI() {
+        if( referredByDAI == null ) {
+            referredByDAI = new EObjectWithInverseEList.Unsettable< DAI >( DAI.class, this,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI,
+                    SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE );
         }
         return referredByDAI;
     }
@@ -1056,7 +1110,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public void unsetReferredByDAI() {
-        if (referredByDAI != null) ((InternalEList.Unsettable<?>)referredByDAI).unset();
+        if( referredByDAI != null ) ( ( InternalEList.Unsettable< ? > ) referredByDAI ).unset();
     }
 
     /**
@@ -1066,7 +1120,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public boolean isSetReferredByDAI() {
-        return referredByDAI != null && ((InternalEList.Unsettable<?>)referredByDAI).isSet();
+        return referredByDAI != null && ( ( InternalEList.Unsettable< ? > ) referredByDAI ).isSet();
     }
 
     /**
@@ -1075,9 +1129,11 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      * @generated
      */
     @Override
-    public EList<SDI> getReferredBySDI() {
-        if (referredBySDI == null) {
-            referredBySDI = new EObjectWithInverseEList.Unsettable<SDI>(SDI.class, this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI, SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE);
+    public EList< SDI > getReferredBySDI() {
+        if( referredBySDI == null ) {
+            referredBySDI = new EObjectWithInverseEList.Unsettable< SDI >( SDI.class, this,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI,
+                    SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE );
         }
         return referredBySDI;
     }
@@ -1089,7 +1145,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public void unsetReferredBySDI() {
-        if (referredBySDI != null) ((InternalEList.Unsettable<?>)referredBySDI).unset();
+        if( referredBySDI != null ) ( ( InternalEList.Unsettable< ? > ) referredBySDI ).unset();
     }
 
     /**
@@ -1099,7 +1155,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public boolean isSetReferredBySDI() {
-        return referredBySDI != null && ((InternalEList.Unsettable<?>)referredBySDI).isSet();
+        return referredBySDI != null && ( ( InternalEList.Unsettable< ? > ) referredBySDI ).isSet();
     }
 
     /**
@@ -1110,27 +1166,33 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE:
-                if (refersToEnumType != null)
-                    msgs = ((InternalEObject)refersToEnumType).eInverseRemove(this, SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, EnumType.class, msgs);
-                return basicSetRefersToEnumType((EnumType)otherEnd, msgs);
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getVal()).basicAdd(otherEnd, msgs);
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE:
-                if (refersToDAType != null)
-                    msgs = ((InternalEObject)refersToDAType).eInverseRemove(this, SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, DAType.class, msgs);
-                return basicSetRefersToDAType((DAType)otherEnd, msgs);
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByFCDA()).basicAdd(otherEnd, msgs);
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByExtRef()).basicAdd(otherEnd, msgs);
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByDAI()).basicAdd(otherEnd, msgs);
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredBySDI()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE:
+            if( refersToEnumType != null )
+                msgs = ( ( InternalEObject ) refersToEnumType ).eInverseRemove( this,
+                        SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, EnumType.class, msgs );
+            return basicSetRefersToEnumType( ( EnumType ) otherEnd, msgs );
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getVal() ).basicAdd( otherEnd, msgs );
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE:
+            if( refersToDAType != null )
+                msgs = ( ( InternalEObject ) refersToDAType ).eInverseRemove( this,
+                        SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, DAType.class, msgs );
+            return basicSetRefersToDAType( ( DAType ) otherEnd, msgs );
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByFCDA() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByExtRef() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByDAI() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredBySDI() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1140,23 +1202,23 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE:
-                return basicUnsetRefersToEnumType(msgs);
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
-                return ((InternalEList<?>)getVal()).basicRemove(otherEnd, msgs);
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE:
-                return basicUnsetRefersToDAType(msgs);
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA:
-                return ((InternalEList<?>)getReferredByFCDA()).basicRemove(otherEnd, msgs);
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF:
-                return ((InternalEList<?>)getReferredByExtRef()).basicRemove(otherEnd, msgs);
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI:
-                return ((InternalEList<?>)getReferredByDAI()).basicRemove(otherEnd, msgs);
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI:
-                return ((InternalEList<?>)getReferredBySDI()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE:
+            return basicUnsetRefersToEnumType( msgs );
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
+            return ( ( InternalEList< ? > ) getVal() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE:
+            return basicUnsetRefersToDAType( msgs );
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA:
+            return ( ( InternalEList< ? > ) getReferredByFCDA() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF:
+            return ( ( InternalEList< ? > ) getReferredByExtRef() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI:
+            return ( ( InternalEList< ? > ) getReferredByDAI() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI:
+            return ( ( InternalEList< ? > ) getReferredBySDI() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1166,37 +1228,37 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE:
-                return getBType();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT:
-                return getCount();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR:
-                return getSAddr();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE:
-                return getType();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT:
-                return getValImport();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND:
-                return getValKind();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE:
-                return getRefersToEnumType();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
-                return getVal();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE:
-                return getRefersToDAType();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA:
-                return getReferredByFCDA();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF:
-                return getReferredByExtRef();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME:
-                return getName();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI:
-                return getReferredByDAI();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI:
-                return getReferredBySDI();
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE:
+            return getBType();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT:
+            return getCount();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR:
+            return getSAddr();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE:
+            return getType();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT:
+            return getValImport();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND:
+            return getValKind();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE:
+            return getRefersToEnumType();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
+            return getVal();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE:
+            return getRefersToDAType();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA:
+            return getReferredByFCDA();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF:
+            return getReferredByExtRef();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME:
+            return getName();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI:
+            return getReferredByDAI();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI:
+            return getReferredBySDI();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -1207,56 +1269,56 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE:
-                setBType((String)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT:
-                setCount((String)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR:
-                setSAddr((String)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT:
-                setValImport((Boolean)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND:
-                setValKind((ValKindEnum)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE:
-                setRefersToEnumType((EnumType)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
-                getVal().clear();
-                getVal().addAll((Collection<? extends Val>)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE:
-                setRefersToDAType((DAType)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA:
-                getReferredByFCDA().clear();
-                getReferredByFCDA().addAll((Collection<? extends FCDA>)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF:
-                getReferredByExtRef().clear();
-                getReferredByExtRef().addAll((Collection<? extends ExtRef>)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME:
-                setName((String)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI:
-                getReferredByDAI().clear();
-                getReferredByDAI().addAll((Collection<? extends DAI>)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI:
-                getReferredBySDI().clear();
-                getReferredBySDI().addAll((Collection<? extends SDI>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE:
+            setBType( ( String ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT:
+            setCount( ( String ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR:
+            setSAddr( ( String ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT:
+            setValImport( ( Boolean ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND:
+            setValKind( ( ValKindEnum ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE:
+            setRefersToEnumType( ( EnumType ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
+            getVal().clear();
+            getVal().addAll( ( Collection< ? extends Val > ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE:
+            setRefersToDAType( ( DAType ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA:
+            getReferredByFCDA().clear();
+            getReferredByFCDA().addAll( ( Collection< ? extends FCDA > ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF:
+            getReferredByExtRef().clear();
+            getReferredByExtRef().addAll( ( Collection< ? extends ExtRef > ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME:
+            setName( ( String ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI:
+            getReferredByDAI().clear();
+            getReferredByDAI().addAll( ( Collection< ? extends DAI > ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI:
+            getReferredBySDI().clear();
+            getReferredBySDI().addAll( ( Collection< ? extends SDI > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -1266,51 +1328,51 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE:
-                unsetBType();
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT:
-                unsetCount();
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR:
-                unsetSAddr();
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE:
-                unsetType();
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT:
-                unsetValImport();
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND:
-                unsetValKind();
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE:
-                unsetRefersToEnumType();
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
-                unsetVal();
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE:
-                unsetRefersToDAType();
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA:
-                unsetReferredByFCDA();
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF:
-                unsetReferredByExtRef();
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME:
-                unsetName();
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI:
-                unsetReferredByDAI();
-                return;
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI:
-                unsetReferredBySDI();
-                return;
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE:
+            unsetBType();
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT:
+            unsetCount();
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR:
+            unsetSAddr();
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE:
+            unsetType();
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT:
+            unsetValImport();
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND:
+            unsetValKind();
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE:
+            unsetRefersToEnumType();
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
+            unsetVal();
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE:
+            unsetRefersToDAType();
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA:
+            unsetReferredByFCDA();
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF:
+            unsetReferredByExtRef();
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME:
+            unsetName();
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI:
+            unsetReferredByDAI();
+            return;
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI:
+            unsetReferredBySDI();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -1320,37 +1382,37 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE:
-                return isSetBType();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT:
-                return isSetCount();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR:
-                return isSetSAddr();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE:
-                return isSetType();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT:
-                return isSetValImport();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND:
-                return isSetValKind();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE:
-                return isSetRefersToEnumType();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
-                return isSetVal();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE:
-                return isSetRefersToDAType();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA:
-                return isSetReferredByFCDA();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF:
-                return isSetReferredByExtRef();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME:
-                return isSetName();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI:
-                return isSetReferredByDAI();
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI:
-                return isSetReferredBySDI();
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE:
+            return isSetBType();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT:
+            return isSetCount();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR:
+            return isSetSAddr();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE:
+            return isSetType();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT:
+            return isSetValImport();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND:
+            return isSetValKind();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE:
+            return isSetRefersToEnumType();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
+            return isSetVal();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE:
+            return isSetRefersToDAType();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA:
+            return isSetReferredByFCDA();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF:
+            return isSetReferredByExtRef();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME:
+            return isSetName();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI:
+            return isSetReferredByDAI();
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI:
+            return isSetReferredBySDI();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -1360,24 +1422,45 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (bType: ");
-        if (bTypeESet) result.append(bType); else result.append("<unset>");
-        result.append(", count: ");
-        if (countESet) result.append(count); else result.append("<unset>");
-        result.append(", sAddr: ");
-        if (sAddrESet) result.append(sAddr); else result.append("<unset>");
-        result.append(", type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(", valImport: ");
-        if (valImportESet) result.append(valImport); else result.append("<unset>");
-        result.append(", valKind: ");
-        if (valKindESet) result.append(valKind); else result.append("<unset>");
-        result.append(", name: ");
-        if (nameESet) result.append(name); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (bType: " );
+        if( bTypeESet )
+            result.append( bType );
+        else
+            result.append( "<unset>" );
+        result.append( ", count: " );
+        if( countESet )
+            result.append( count );
+        else
+            result.append( "<unset>" );
+        result.append( ", sAddr: " );
+        if( sAddrESet )
+            result.append( sAddr );
+        else
+            result.append( "<unset>" );
+        result.append( ", type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ", valImport: " );
+        if( valImportESet )
+            result.append( valImport );
+        else
+            result.append( "<unset>" );
+        result.append( ", valKind: " );
+        if( valKindESet )
+            result.append( valKind );
+        else
+            result.append( "<unset>" );
+        result.append( ", name: " );
+        if( nameESet )
+            result.append( name );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -1385,7 +1468,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         // desc                 Some descriptive text for the attribute
         // name                 The attribute name; the type tAttributeEnum restricts to the attribute names from IEC 61850-7-3, plus new ones starting with lower case letters
         // fc                   The functional constraint for this attribute; fc=SE always also implies fc=SG; fc=SG means that the values are visible, but not editable
@@ -1397,12 +1480,13 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
         //                      A referenced attribute shall exist in the same type definition. The default value 0 states that the attribute is no array.
         // valKind              Determines how the value shall be interpreted if any is given
 
-        if( ! ( "Enum".equals( getBType() ) || "Struct".equals( getBType() ))) {
+        if( !( "Enum".equals( getBType() ) || "Struct".equals( getBType() ) ) ) {
             return;
         }
-        String messagePrefix = "[SCL links] while resolving link from AbstractDataAttribute on line " + getLineNumber() + ": ";
+        String messagePrefix = "[SCL links] while resolving link from AbstractDataAttribute on line " + getLineNumber()
+                + ": ";
 
-        if(( getType() == null ) || getType().isEmpty() ) {
+        if( ( getType() == null ) || getType().isEmpty() ) {
             console.warning( messagePrefix, "type is missing" );
             return;
         }
@@ -1413,15 +1497,14 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
             return;
         }
 
-        if( "Enum".equals( getBType() )) {
+        if( "Enum".equals( getBType() ) ) {
 
             // find an EnumType with
             //   EnumType.id == DA.type
-            List< EnumType > res = 
-                    dtt
+            List< EnumType > res = dtt
                     .getEnumType()
                     .stream()
-                    .filter( et -> getType().equals( et.getId() ))
+                    .filter( et -> getType().equals( et.getId() ) )
                     .collect( Collectors.toList() );
 
             String mess = "EnumType( id = " + getType() + " )";
@@ -1430,26 +1513,27 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
                 return;
             }
             setRefersToEnumType( res.get( 0 ) );
-            console.info( "[SCL links] AbstractDataAttribute on line ", getLineNumber(), " refers to ", mess, " on line ", getRefersToEnumType().getLineNumber() );
+            console.info( "[SCL links] AbstractDataAttribute on line ", getLineNumber(), " refers to ", mess,
+                    " on line ", getRefersToEnumType().getLineNumber() );
         }
-        else if( "Struct".equals( getBType() )) {
+        else if( "Struct".equals( getBType() ) ) {
 
             // find an DAType with
             //   DAType.id == DA.type
-            List< DAType > res = 
-                    dtt
+            List< DAType > res = dtt
                     .getDAType()
                     .stream()
-                    .filter( et -> getType().equals( et.getId() ))
+                    .filter( et -> getType().equals( et.getId() ) )
                     .collect( Collectors.toList() );
-                    
+
             String mess = "DAType( id = " + getType() + " )";
             if( res.size() != 1 ) {
                 SclUtilities.displayNotFoundWarning( console, messagePrefix, mess, res.size() );
                 return;
             }
             setRefersToDAType( res.get( 0 ) );
-            console.info( "[SCL links] AbstractDataAttribute on line ", getLineNumber(), " refers to ", mess, " on line ", getRefersToDAType().getLineNumber() );
+            console.info( "[SCL links] AbstractDataAttribute on line ", getLineNumber(), " refers to ", mess,
+                    " on line ", getRefersToDAType().getLineNumber() );
         }
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractDataObjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractDataObjectImpl.java
index 1283baf..ac78350 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractDataObjectImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractDataObjectImpl.java
@@ -142,7 +142,7 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      * @generated
      * @ordered
      */
-    protected EList<ExtRef> referredByExtRef;
+    protected EList< ExtRef > referredByExtRef;
 
     /**
      * <!-- begin-user-doc -->
@@ -179,13 +179,14 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      * @generated
      */
     @Override
-    public void setName(String newName) {
+    public void setName( String newName ) {
         String oldName = name;
         name = newName;
         boolean oldNameESet = nameESet;
         nameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_OBJECT__NAME, oldName, name, !oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_OBJECT__NAME, oldName,
+                    name, !oldNameESet ) );
     }
 
     /**
@@ -199,8 +200,9 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
         boolean oldNameESet = nameESet;
         name = NAME_EDEFAULT;
         nameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_OBJECT__NAME, oldName, NAME_EDEFAULT, oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_OBJECT__NAME, oldName,
+                    NAME_EDEFAULT, oldNameESet ) );
     }
 
     /**
@@ -229,13 +231,14 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      * @generated
      */
     @Override
-    public void setType(String newType) {
+    public void setType( String newType ) {
         String oldType = type;
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_OBJECT__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_OBJECT__TYPE, oldType,
+                    type, !oldTypeESet ) );
     }
 
     /**
@@ -249,8 +252,9 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_OBJECT__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_OBJECT__TYPE, oldType,
+                    TYPE_EDEFAULT, oldTypeESet ) );
     }
 
     /**
@@ -278,14 +282,19 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToDOType(DOType newRefersToDOType, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToDOType( DOType newRefersToDOType, NotificationChain msgs ) {
         DOType oldRefersToDOType = refersToDOType;
         refersToDOType = newRefersToDOType;
         boolean oldRefersToDOTypeESet = refersToDOTypeESet;
         refersToDOTypeESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE, oldRefersToDOType, newRefersToDOType, !oldRefersToDOTypeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE, oldRefersToDOType, newRefersToDOType,
+                    !oldRefersToDOTypeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -296,21 +305,25 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      * @generated
      */
     @Override
-    public void setRefersToDOType(DOType newRefersToDOType) {
-        if (newRefersToDOType != refersToDOType) {
+    public void setRefersToDOType( DOType newRefersToDOType ) {
+        if( newRefersToDOType != refersToDOType ) {
             NotificationChain msgs = null;
-            if (refersToDOType != null)
-                msgs = ((InternalEObject)refersToDOType).eInverseRemove(this, SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT, DOType.class, msgs);
-            if (newRefersToDOType != null)
-                msgs = ((InternalEObject)newRefersToDOType).eInverseAdd(this, SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT, DOType.class, msgs);
-            msgs = basicSetRefersToDOType(newRefersToDOType, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToDOType != null )
+                msgs = ( ( InternalEObject ) refersToDOType ).eInverseRemove( this,
+                        SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT, DOType.class, msgs );
+            if( newRefersToDOType != null )
+                msgs = ( ( InternalEObject ) newRefersToDOType ).eInverseAdd( this,
+                        SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT, DOType.class, msgs );
+            msgs = basicSetRefersToDOType( newRefersToDOType, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToDOTypeESet = refersToDOTypeESet;
             refersToDOTypeESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE, newRefersToDOType, newRefersToDOType, !oldRefersToDOTypeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET,
+                        SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE, newRefersToDOType, newRefersToDOType,
+                        !oldRefersToDOTypeESet ) );
         }
     }
 
@@ -319,14 +332,19 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToDOType(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToDOType( NotificationChain msgs ) {
         DOType oldRefersToDOType = refersToDOType;
         refersToDOType = null;
         boolean oldRefersToDOTypeESet = refersToDOTypeESet;
         refersToDOTypeESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE, oldRefersToDOType, null, oldRefersToDOTypeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE, oldRefersToDOType, null,
+                    oldRefersToDOTypeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -338,17 +356,19 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      */
     @Override
     public void unsetRefersToDOType() {
-        if (refersToDOType != null) {
+        if( refersToDOType != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToDOType).eInverseRemove(this, SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT, DOType.class, msgs);
-            msgs = basicUnsetRefersToDOType(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToDOType ).eInverseRemove( this,
+                    SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT, DOType.class, msgs );
+            msgs = basicUnsetRefersToDOType( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToDOTypeESet = refersToDOTypeESet;
             refersToDOTypeESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE, null, null, oldRefersToDOTypeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET,
+                        SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE, null, null, oldRefersToDOTypeESet ) );
         }
     }
 
@@ -368,9 +388,11 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      * @generated
      */
     @Override
-    public EList<ExtRef> getReferredByExtRef() {
-        if (referredByExtRef == null) {
-            referredByExtRef = new EObjectWithInverseEList.Unsettable<ExtRef>(ExtRef.class, this, SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF, SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT);
+    public EList< ExtRef > getReferredByExtRef() {
+        if( referredByExtRef == null ) {
+            referredByExtRef = new EObjectWithInverseEList.Unsettable< ExtRef >( ExtRef.class, this,
+                    SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF,
+                    SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT );
         }
         return referredByExtRef;
     }
@@ -382,7 +404,7 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      */
     @Override
     public void unsetReferredByExtRef() {
-        if (referredByExtRef != null) ((InternalEList.Unsettable<?>)referredByExtRef).unset();
+        if( referredByExtRef != null ) ( ( InternalEList.Unsettable< ? > ) referredByExtRef ).unset();
     }
 
     /**
@@ -392,7 +414,7 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      */
     @Override
     public boolean isSetReferredByExtRef() {
-        return referredByExtRef != null && ((InternalEList.Unsettable<?>)referredByExtRef).isSet();
+        return referredByExtRef != null && ( ( InternalEList.Unsettable< ? > ) referredByExtRef ).isSet();
     }
 
     /**
@@ -400,18 +422,20 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     @Override
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE:
-                if (refersToDOType != null)
-                    msgs = ((InternalEObject)refersToDOType).eInverseRemove(this, SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT, DOType.class, msgs);
-                return basicSetRefersToDOType((DOType)otherEnd, msgs);
-            case SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByExtRef()).basicAdd(otherEnd, msgs);
+    public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE:
+            if( refersToDOType != null )
+                msgs = ( ( InternalEObject ) refersToDOType ).eInverseRemove( this,
+                        SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT, DOType.class, msgs );
+            return basicSetRefersToDOType( ( DOType ) otherEnd, msgs );
+        case SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByExtRef() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -420,14 +444,14 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      * @generated
      */
     @Override
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE:
-                return basicUnsetRefersToDOType(msgs);
-            case SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF:
-                return ((InternalEList<?>)getReferredByExtRef()).basicRemove(otherEnd, msgs);
+    public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE:
+            return basicUnsetRefersToDOType( msgs );
+        case SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF:
+            return ( ( InternalEList< ? > ) getReferredByExtRef() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -436,18 +460,18 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_DATA_OBJECT__NAME:
-                return getName();
-            case SclPackage.ABSTRACT_DATA_OBJECT__TYPE:
-                return getType();
-            case SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE:
-                return getRefersToDOType();
-            case SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF:
-                return getReferredByExtRef();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_DATA_OBJECT__NAME:
+            return getName();
+        case SclPackage.ABSTRACT_DATA_OBJECT__TYPE:
+            return getType();
+        case SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE:
+            return getRefersToDOType();
+        case SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF:
+            return getReferredByExtRef();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -455,25 +479,25 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_DATA_OBJECT__NAME:
-                setName((String)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_OBJECT__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE:
-                setRefersToDOType((DOType)newValue);
-                return;
-            case SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF:
-                getReferredByExtRef().clear();
-                getReferredByExtRef().addAll((Collection<? extends ExtRef>)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_DATA_OBJECT__NAME:
+            setName( ( String ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_OBJECT__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE:
+            setRefersToDOType( ( DOType ) newValue );
+            return;
+        case SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF:
+            getReferredByExtRef().clear();
+            getReferredByExtRef().addAll( ( Collection< ? extends ExtRef > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -482,22 +506,22 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_DATA_OBJECT__NAME:
-                unsetName();
-                return;
-            case SclPackage.ABSTRACT_DATA_OBJECT__TYPE:
-                unsetType();
-                return;
-            case SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE:
-                unsetRefersToDOType();
-                return;
-            case SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF:
-                unsetReferredByExtRef();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_DATA_OBJECT__NAME:
+            unsetName();
+            return;
+        case SclPackage.ABSTRACT_DATA_OBJECT__TYPE:
+            unsetType();
+            return;
+        case SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE:
+            unsetRefersToDOType();
+            return;
+        case SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF:
+            unsetReferredByExtRef();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -506,18 +530,18 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_DATA_OBJECT__NAME:
-                return isSetName();
-            case SclPackage.ABSTRACT_DATA_OBJECT__TYPE:
-                return isSetType();
-            case SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE:
-                return isSetRefersToDOType();
-            case SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF:
-                return isSetReferredByExtRef();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_DATA_OBJECT__NAME:
+            return isSetName();
+        case SclPackage.ABSTRACT_DATA_OBJECT__TYPE:
+            return isSetType();
+        case SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE:
+            return isSetRefersToDOType();
+        case SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF:
+            return isSetReferredByExtRef();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -527,14 +551,20 @@ public abstract class AbstractDataObjectImpl extends UnNamingImpl implements Abs
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (name: ");
-        if (nameESet) result.append(name); else result.append("<unset>");
-        result.append(", type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (name: " );
+        if( nameESet )
+            result.append( name );
+        else
+            result.append( "<unset>" );
+        result.append( ", type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractEqFuncSubFuncImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractEqFuncSubFuncImpl.java
index e1d2f7e..c705426 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractEqFuncSubFuncImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AbstractEqFuncSubFuncImpl.java
@@ -93,7 +93,7 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
      * @generated
      * @ordered
      */
-    protected EList<EqSubFunction> eqSubFunction;
+    protected EList< EqSubFunction > eqSubFunction;
 
     /**
      * The cached value of the '{@link #getSubGeneralEquipment() <em>Sub General Equipment</em>}' containment reference list.
@@ -103,7 +103,7 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
      * @generated
      * @ordered
      */
-    protected EList<GeneralEquipment> subGeneralEquipment;
+    protected EList< GeneralEquipment > subGeneralEquipment;
 
     /**
      * <!-- begin-user-doc -->
@@ -145,8 +145,9 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__TYPE, oldType,
+                    type, !oldTypeESet ) );
     }
 
     /**
@@ -160,8 +161,9 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__TYPE,
+                    oldType, TYPE_EDEFAULT, oldTypeESet ) );
     }
 
     /**
@@ -180,9 +182,11 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
      * @generated
      */
     @Override
-    public EList<EqSubFunction> getEqSubFunction() {
-        if (eqSubFunction == null) {
-            eqSubFunction = new EObjectContainmentWithInverseEList.Unsettable<EqSubFunction>(EqSubFunction.class, this, SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION, SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC);
+    public EList< EqSubFunction > getEqSubFunction() {
+        if( eqSubFunction == null ) {
+            eqSubFunction = new EObjectContainmentWithInverseEList.Unsettable< EqSubFunction >( EqSubFunction.class,
+                    this, SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION,
+                    SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC );
         }
         return eqSubFunction;
     }
@@ -194,7 +198,7 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
      */
     @Override
     public void unsetEqSubFunction() {
-        if (eqSubFunction != null) ((InternalEList.Unsettable<?>)eqSubFunction).unset();
+        if( eqSubFunction != null ) ( ( InternalEList.Unsettable< ? > ) eqSubFunction ).unset();
     }
 
     /**
@@ -204,7 +208,7 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
      */
     @Override
     public boolean isSetEqSubFunction() {
-        return eqSubFunction != null && ((InternalEList.Unsettable<?>)eqSubFunction).isSet();
+        return eqSubFunction != null && ( ( InternalEList.Unsettable< ? > ) eqSubFunction ).isSet();
     }
 
     /**
@@ -213,9 +217,11 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
      * @generated
      */
     @Override
-    public EList<GeneralEquipment> getSubGeneralEquipment() {
-        if (subGeneralEquipment == null) {
-            subGeneralEquipment = new EObjectContainmentWithInverseEList.Unsettable<GeneralEquipment>(GeneralEquipment.class, this, SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT, SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC);
+    public EList< GeneralEquipment > getSubGeneralEquipment() {
+        if( subGeneralEquipment == null ) {
+            subGeneralEquipment = new EObjectContainmentWithInverseEList.Unsettable< GeneralEquipment >(
+                    GeneralEquipment.class, this, SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT,
+                    SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC );
         }
         return subGeneralEquipment;
     }
@@ -227,7 +233,7 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
      */
     @Override
     public void unsetSubGeneralEquipment() {
-        if (subGeneralEquipment != null) ((InternalEList.Unsettable<?>)subGeneralEquipment).unset();
+        if( subGeneralEquipment != null ) ( ( InternalEList.Unsettable< ? > ) subGeneralEquipment ).unset();
     }
 
     /**
@@ -237,7 +243,7 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
      */
     @Override
     public boolean isSetSubGeneralEquipment() {
-        return subGeneralEquipment != null && ((InternalEList.Unsettable<?>)subGeneralEquipment).isSet();
+        return subGeneralEquipment != null && ( ( InternalEList.Unsettable< ? > ) subGeneralEquipment ).isSet();
     }
 
     /**
@@ -248,13 +254,15 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getEqSubFunction()).basicAdd(otherEnd, msgs);
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSubGeneralEquipment()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getEqSubFunction() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSubGeneralEquipment() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -264,13 +272,13 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION:
-                return ((InternalEList<?>)getEqSubFunction()).basicRemove(otherEnd, msgs);
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT:
-                return ((InternalEList<?>)getSubGeneralEquipment()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION:
+            return ( ( InternalEList< ? > ) getEqSubFunction() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT:
+            return ( ( InternalEList< ? > ) getSubGeneralEquipment() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -280,15 +288,15 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__TYPE:
-                return getType();
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION:
-                return getEqSubFunction();
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT:
-                return getSubGeneralEquipment();
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__TYPE:
+            return getType();
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION:
+            return getEqSubFunction();
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT:
+            return getSubGeneralEquipment();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -299,20 +307,20 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION:
-                getEqSubFunction().clear();
-                getEqSubFunction().addAll((Collection<? extends EqSubFunction>)newValue);
-                return;
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT:
-                getSubGeneralEquipment().clear();
-                getSubGeneralEquipment().addAll((Collection<? extends GeneralEquipment>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION:
+            getEqSubFunction().clear();
+            getEqSubFunction().addAll( ( Collection< ? extends EqSubFunction > ) newValue );
+            return;
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT:
+            getSubGeneralEquipment().clear();
+            getSubGeneralEquipment().addAll( ( Collection< ? extends GeneralEquipment > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -322,18 +330,18 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__TYPE:
-                unsetType();
-                return;
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION:
-                unsetEqSubFunction();
-                return;
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT:
-                unsetSubGeneralEquipment();
-                return;
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__TYPE:
+            unsetType();
+            return;
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION:
+            unsetEqSubFunction();
+            return;
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT:
+            unsetSubGeneralEquipment();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -343,15 +351,15 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__TYPE:
-                return isSetType();
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION:
-                return isSetEqSubFunction();
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT:
-                return isSetSubGeneralEquipment();
+        switch( featureID ) {
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__TYPE:
+            return isSetType();
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION:
+            return isSetEqSubFunction();
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT:
+            return isSetSubGeneralEquipment();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -361,12 +369,15 @@ public class AbstractEqFuncSubFuncImpl extends PowerSystemResourceImpl implement
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AccessControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AccessControlImpl.java
index 4512ecb..4b5fc14 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AccessControlImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AccessControlImpl.java
@@ -71,8 +71,8 @@ public class AccessControlImpl extends SclObjectImpl implements AccessControl {
      */
     @Override
     public LDevice getParentLDevice() {
-        if (eContainerFeatureID() != SclPackage.ACCESS_CONTROL__PARENT_LDEVICE) return null;
-        return (LDevice)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.ACCESS_CONTROL__PARENT_LDEVICE ) return null;
+        return ( LDevice ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class AccessControlImpl extends SclObjectImpl implements AccessControl {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentLDevice(LDevice newParentLDevice, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentLDevice, SclPackage.ACCESS_CONTROL__PARENT_LDEVICE, msgs);
+    public NotificationChain basicSetParentLDevice( LDevice newParentLDevice, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentLDevice, SclPackage.ACCESS_CONTROL__PARENT_LDEVICE,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class AccessControlImpl extends SclObjectImpl implements AccessControl {
      * @generated
      */
     @Override
-    public void setParentLDevice(LDevice newParentLDevice) {
-        if (newParentLDevice != eInternalContainer() || (eContainerFeatureID() != SclPackage.ACCESS_CONTROL__PARENT_LDEVICE && newParentLDevice != null)) {
-            if (EcoreUtil.isAncestor(this, newParentLDevice))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentLDevice( LDevice newParentLDevice ) {
+        if( newParentLDevice != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.ACCESS_CONTROL__PARENT_LDEVICE
+                        && newParentLDevice != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentLDevice ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentLDevice != null)
-                msgs = ((InternalEObject)newParentLDevice).eInverseAdd(this, SclPackage.LDEVICE__ACCESS_CONTROL, LDevice.class, msgs);
-            msgs = basicSetParentLDevice(newParentLDevice, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentLDevice != null )
+                msgs = ( ( InternalEObject ) newParentLDevice ).eInverseAdd( this, SclPackage.LDEVICE__ACCESS_CONTROL,
+                        LDevice.class, msgs );
+            msgs = basicSetParentLDevice( newParentLDevice, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ACCESS_CONTROL__PARENT_LDEVICE, newParentLDevice, newParentLDevice));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ACCESS_CONTROL__PARENT_LDEVICE,
+                    newParentLDevice, newParentLDevice ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class AccessControlImpl extends SclObjectImpl implements AccessControl {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ACCESS_CONTROL__PARENT_LDEVICE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentLDevice((LDevice)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ACCESS_CONTROL__PARENT_LDEVICE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentLDevice( ( LDevice ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class AccessControlImpl extends SclObjectImpl implements AccessControl {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ACCESS_CONTROL__PARENT_LDEVICE:
-                return basicSetParentLDevice(null, msgs);
+        switch( featureID ) {
+        case SclPackage.ACCESS_CONTROL__PARENT_LDEVICE:
+            return basicSetParentLDevice( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,11 @@ public class AccessControlImpl extends SclObjectImpl implements AccessControl {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.ACCESS_CONTROL__PARENT_LDEVICE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.LDEVICE__ACCESS_CONTROL, LDevice.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.ACCESS_CONTROL__PARENT_LDEVICE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.LDEVICE__ACCESS_CONTROL, LDevice.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +163,11 @@ public class AccessControlImpl extends SclObjectImpl implements AccessControl {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.ACCESS_CONTROL__PARENT_LDEVICE:
-                return getParentLDevice();
+        switch( featureID ) {
+        case SclPackage.ACCESS_CONTROL__PARENT_LDEVICE:
+            return getParentLDevice();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +177,12 @@ public class AccessControlImpl extends SclObjectImpl implements AccessControl {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.ACCESS_CONTROL__PARENT_LDEVICE:
-                setParentLDevice((LDevice)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.ACCESS_CONTROL__PARENT_LDEVICE:
+            setParentLDevice( ( LDevice ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +192,12 @@ public class AccessControlImpl extends SclObjectImpl implements AccessControl {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ACCESS_CONTROL__PARENT_LDEVICE:
-                setParentLDevice((LDevice)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.ACCESS_CONTROL__PARENT_LDEVICE:
+            setParentLDevice( ( LDevice ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +207,11 @@ public class AccessControlImpl extends SclObjectImpl implements AccessControl {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ACCESS_CONTROL__PARENT_LDEVICE:
-                return getParentLDevice() != null;
+        switch( featureID ) {
+        case SclPackage.ACCESS_CONTROL__PARENT_LDEVICE:
+            return getParentLDevice() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //AccessControlImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AccessPointImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AccessPointImpl.java
index 8c9f2ad..ae73b82 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AccessPointImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AccessPointImpl.java
@@ -166,7 +166,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * @generated
      * @ordered
      */
-    protected EList<LN> ln;
+    protected EList< LN > ln;
 
     /**
      * The cached value of the '{@link #getSMVSecurity() <em>SMV Security</em>}' containment reference list.
@@ -176,7 +176,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * @generated
      * @ordered
      */
-    protected EList<SMVSecurity> smvSecurity;
+    protected EList< SMVSecurity > smvSecurity;
 
     /**
      * The cached value of the '{@link #getServerAt() <em>Server At</em>}' containment reference.
@@ -243,7 +243,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * @generated
      * @ordered
      */
-    protected EList<GOOSESecurity> gooseSecurity;
+    protected EList< GOOSESecurity > gooseSecurity;
 
     /**
      * The cached value of the '{@link #getReferredByServerAt() <em>Referred By Server At</em>}' reference list.
@@ -253,7 +253,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * @generated
      * @ordered
      */
-    protected EList<ServerAt> referredByServerAt;
+    protected EList< ServerAt > referredByServerAt;
 
     /**
      * The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -292,7 +292,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * @generated
      * @ordered
      */
-    protected EList<ConnectedAP> referredByConnectedAP;
+    protected EList< ConnectedAP > referredByConnectedAP;
 
     /**
      * The cached value of the '{@link #getReferredByKDC() <em>Referred By KDC</em>}' reference list.
@@ -302,7 +302,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * @generated
      * @ordered
      */
-    protected EList<KDC> referredByKDC;
+    protected EList< KDC > referredByKDC;
 
     /**
      * <!-- begin-user-doc -->
@@ -344,8 +344,9 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
         clock = newClock;
         boolean oldClockESet = clockESet;
         clockESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ACCESS_POINT__CLOCK, oldClock, clock, !oldClockESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ACCESS_POINT__CLOCK, oldClock, clock,
+                    !oldClockESet ) );
     }
 
     /**
@@ -359,8 +360,9 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
         boolean oldClockESet = clockESet;
         clock = CLOCK_EDEFAULT;
         clockESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ACCESS_POINT__CLOCK, oldClock, CLOCK_EDEFAULT, oldClockESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ACCESS_POINT__CLOCK, oldClock,
+                    CLOCK_EDEFAULT, oldClockESet ) );
     }
 
     /**
@@ -394,8 +396,9 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
         kdc = newKdc;
         boolean oldKdcESet = kdcESet;
         kdcESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ACCESS_POINT__KDC, oldKdc, kdc, !oldKdcESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ACCESS_POINT__KDC, oldKdc, kdc,
+                    !oldKdcESet ) );
     }
 
     /**
@@ -409,8 +412,9 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
         boolean oldKdcESet = kdcESet;
         kdc = KDC_EDEFAULT;
         kdcESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ACCESS_POINT__KDC, oldKdc, KDC_EDEFAULT, oldKdcESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ACCESS_POINT__KDC, oldKdc,
+                    KDC_EDEFAULT, oldKdcESet ) );
     }
 
     /**
@@ -444,8 +448,9 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
         router = newRouter;
         boolean oldRouterESet = routerESet;
         routerESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ACCESS_POINT__ROUTER, oldRouter, router, !oldRouterESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ACCESS_POINT__ROUTER, oldRouter, router,
+                    !oldRouterESet ) );
     }
 
     /**
@@ -459,8 +464,9 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
         boolean oldRouterESet = routerESet;
         router = ROUTER_EDEFAULT;
         routerESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ACCESS_POINT__ROUTER, oldRouter, ROUTER_EDEFAULT, oldRouterESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ACCESS_POINT__ROUTER, oldRouter,
+                    ROUTER_EDEFAULT, oldRouterESet ) );
     }
 
     /**
@@ -480,8 +486,8 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public IED getParentIED() {
-        if (eContainerFeatureID() != SclPackage.ACCESS_POINT__PARENT_IED) return null;
-        return (IED)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.ACCESS_POINT__PARENT_IED ) return null;
+        return ( IED ) eInternalContainer();
     }
 
     /**
@@ -489,8 +495,8 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentIED(IED newParentIED, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentIED, SclPackage.ACCESS_POINT__PARENT_IED, msgs);
+    public NotificationChain basicSetParentIED( IED newParentIED, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentIED, SclPackage.ACCESS_POINT__PARENT_IED, msgs );
         return msgs;
     }
 
@@ -500,20 +506,23 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * @generated
      */
     @Override
-    public void setParentIED(IED newParentIED) {
-        if (newParentIED != eInternalContainer() || (eContainerFeatureID() != SclPackage.ACCESS_POINT__PARENT_IED && newParentIED != null)) {
-            if (EcoreUtil.isAncestor(this, newParentIED))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentIED( IED newParentIED ) {
+        if( newParentIED != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.ACCESS_POINT__PARENT_IED && newParentIED != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentIED ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentIED != null)
-                msgs = ((InternalEObject)newParentIED).eInverseAdd(this, SclPackage.IED__ACCESS_POINT, IED.class, msgs);
-            msgs = basicSetParentIED(newParentIED, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentIED != null )
+                msgs = ( ( InternalEObject ) newParentIED ).eInverseAdd( this, SclPackage.IED__ACCESS_POINT, IED.class,
+                        msgs );
+            msgs = basicSetParentIED( newParentIED, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ACCESS_POINT__PARENT_IED, newParentIED, newParentIED));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ACCESS_POINT__PARENT_IED, newParentIED,
+                    newParentIED ) );
     }
 
     /**
@@ -522,9 +531,10 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * @generated
      */
     @Override
-    public EList<LN> getLN() {
-        if (ln == null) {
-            ln = new EObjectContainmentWithInverseEList.Unsettable<LN>(LN.class, this, SclPackage.ACCESS_POINT__LN, SclPackage.LN__PARENT_ACCESS_POINT);
+    public EList< LN > getLN() {
+        if( ln == null ) {
+            ln = new EObjectContainmentWithInverseEList.Unsettable< LN >( LN.class, this, SclPackage.ACCESS_POINT__LN,
+                    SclPackage.LN__PARENT_ACCESS_POINT );
         }
         return ln;
     }
@@ -536,7 +546,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public void unsetLN() {
-        if (ln != null) ((InternalEList.Unsettable<?>)ln).unset();
+        if( ln != null ) ( ( InternalEList.Unsettable< ? > ) ln ).unset();
     }
 
     /**
@@ -546,7 +556,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public boolean isSetLN() {
-        return ln != null && ((InternalEList.Unsettable<?>)ln).isSet();
+        return ln != null && ( ( InternalEList.Unsettable< ? > ) ln ).isSet();
     }
 
     /**
@@ -555,9 +565,10 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * @generated
      */
     @Override
-    public EList<SMVSecurity> getSMVSecurity() {
-        if (smvSecurity == null) {
-            smvSecurity = new EObjectContainmentWithInverseEList.Unsettable<SMVSecurity>(SMVSecurity.class, this, SclPackage.ACCESS_POINT__SMV_SECURITY, SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT);
+    public EList< SMVSecurity > getSMVSecurity() {
+        if( smvSecurity == null ) {
+            smvSecurity = new EObjectContainmentWithInverseEList.Unsettable< SMVSecurity >( SMVSecurity.class, this,
+                    SclPackage.ACCESS_POINT__SMV_SECURITY, SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT );
         }
         return smvSecurity;
     }
@@ -569,7 +580,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public void unsetSMVSecurity() {
-        if (smvSecurity != null) ((InternalEList.Unsettable<?>)smvSecurity).unset();
+        if( smvSecurity != null ) ( ( InternalEList.Unsettable< ? > ) smvSecurity ).unset();
     }
 
     /**
@@ -579,7 +590,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public boolean isSetSMVSecurity() {
-        return smvSecurity != null && ((InternalEList.Unsettable<?>)smvSecurity).isSet();
+        return smvSecurity != null && ( ( InternalEList.Unsettable< ? > ) smvSecurity ).isSet();
     }
 
     /**
@@ -602,9 +613,13 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
         serverAt = newServerAt;
         boolean oldServerAtESet = serverAtESet;
         serverAtESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.ACCESS_POINT__SERVER_AT, oldServerAt, newServerAt, !oldServerAtESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.ACCESS_POINT__SERVER_AT, oldServerAt, newServerAt, !oldServerAtESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -616,20 +631,23 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public void setServerAt( ServerAt newServerAt ) {
-        if (newServerAt != serverAt) {
+        if( newServerAt != serverAt ) {
             NotificationChain msgs = null;
-            if (serverAt != null)
-                msgs = ((InternalEObject)serverAt).eInverseRemove(this, SclPackage.SERVER_AT__PARENT_ACCESS_POINT, ServerAt.class, msgs);
-            if (newServerAt != null)
-                msgs = ((InternalEObject)newServerAt).eInverseAdd(this, SclPackage.SERVER_AT__PARENT_ACCESS_POINT, ServerAt.class, msgs);
-            msgs = basicSetServerAt(newServerAt, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( serverAt != null )
+                msgs = ( ( InternalEObject ) serverAt ).eInverseRemove( this, SclPackage.SERVER_AT__PARENT_ACCESS_POINT,
+                        ServerAt.class, msgs );
+            if( newServerAt != null )
+                msgs = ( ( InternalEObject ) newServerAt ).eInverseAdd( this, SclPackage.SERVER_AT__PARENT_ACCESS_POINT,
+                        ServerAt.class, msgs );
+            msgs = basicSetServerAt( newServerAt, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldServerAtESet = serverAtESet;
             serverAtESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ACCESS_POINT__SERVER_AT, newServerAt, newServerAt, !oldServerAtESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ACCESS_POINT__SERVER_AT, newServerAt,
+                        newServerAt, !oldServerAtESet ) );
         }
     }
 
@@ -643,9 +661,13 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
         serverAt = null;
         boolean oldServerAtESet = serverAtESet;
         serverAtESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.ACCESS_POINT__SERVER_AT, oldServerAt, null, oldServerAtESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.ACCESS_POINT__SERVER_AT, oldServerAt, null, oldServerAtESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -657,17 +679,19 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public void unsetServerAt() {
-        if (serverAt != null) {
+        if( serverAt != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)serverAt).eInverseRemove(this, SclPackage.SERVER_AT__PARENT_ACCESS_POINT, ServerAt.class, msgs);
-            msgs = basicUnsetServerAt(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) serverAt ).eInverseRemove( this, SclPackage.SERVER_AT__PARENT_ACCESS_POINT,
+                    ServerAt.class, msgs );
+            msgs = basicUnsetServerAt( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldServerAtESet = serverAtESet;
             serverAtESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ACCESS_POINT__SERVER_AT, null, null, oldServerAtESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ACCESS_POINT__SERVER_AT, null,
+                        null, oldServerAtESet ) );
         }
     }
 
@@ -701,9 +725,13 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
         server = newServer;
         boolean oldServerESet = serverESet;
         serverESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.ACCESS_POINT__SERVER, oldServer, newServer, !oldServerESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.ACCESS_POINT__SERVER, oldServer, newServer, !oldServerESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -715,20 +743,23 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public void setServer( Server newServer ) {
-        if (newServer != server) {
+        if( newServer != server ) {
             NotificationChain msgs = null;
-            if (server != null)
-                msgs = ((InternalEObject)server).eInverseRemove(this, SclPackage.SERVER__PARENT_ACCESS_POINT, Server.class, msgs);
-            if (newServer != null)
-                msgs = ((InternalEObject)newServer).eInverseAdd(this, SclPackage.SERVER__PARENT_ACCESS_POINT, Server.class, msgs);
-            msgs = basicSetServer(newServer, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( server != null )
+                msgs = ( ( InternalEObject ) server ).eInverseRemove( this, SclPackage.SERVER__PARENT_ACCESS_POINT,
+                        Server.class, msgs );
+            if( newServer != null )
+                msgs = ( ( InternalEObject ) newServer ).eInverseAdd( this, SclPackage.SERVER__PARENT_ACCESS_POINT,
+                        Server.class, msgs );
+            msgs = basicSetServer( newServer, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldServerESet = serverESet;
             serverESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ACCESS_POINT__SERVER, newServer, newServer, !oldServerESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ACCESS_POINT__SERVER, newServer,
+                        newServer, !oldServerESet ) );
         }
     }
 
@@ -742,9 +773,13 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
         server = null;
         boolean oldServerESet = serverESet;
         serverESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.ACCESS_POINT__SERVER, oldServer, null, oldServerESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.ACCESS_POINT__SERVER, oldServer, null, oldServerESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -756,17 +791,19 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public void unsetServer() {
-        if (server != null) {
+        if( server != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)server).eInverseRemove(this, SclPackage.SERVER__PARENT_ACCESS_POINT, Server.class, msgs);
-            msgs = basicUnsetServer(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) server ).eInverseRemove( this, SclPackage.SERVER__PARENT_ACCESS_POINT,
+                    Server.class, msgs );
+            msgs = basicUnsetServer( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldServerESet = serverESet;
             serverESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ACCESS_POINT__SERVER, null, null, oldServerESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ACCESS_POINT__SERVER, null, null,
+                        oldServerESet ) );
         }
     }
 
@@ -800,9 +837,13 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
         services = newServices;
         boolean oldServicesESet = servicesESet;
         servicesESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.ACCESS_POINT__SERVICES, oldServices, newServices, !oldServicesESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.ACCESS_POINT__SERVICES, oldServices, newServices, !oldServicesESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -814,20 +855,23 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public void setServices( Services newServices ) {
-        if (newServices != services) {
+        if( newServices != services ) {
             NotificationChain msgs = null;
-            if (services != null)
-                msgs = ((InternalEObject)services).eInverseRemove(this, SclPackage.SERVICES__PARENT_ACCESS_POINT, Services.class, msgs);
-            if (newServices != null)
-                msgs = ((InternalEObject)newServices).eInverseAdd(this, SclPackage.SERVICES__PARENT_ACCESS_POINT, Services.class, msgs);
-            msgs = basicSetServices(newServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( services != null )
+                msgs = ( ( InternalEObject ) services ).eInverseRemove( this, SclPackage.SERVICES__PARENT_ACCESS_POINT,
+                        Services.class, msgs );
+            if( newServices != null )
+                msgs = ( ( InternalEObject ) newServices ).eInverseAdd( this, SclPackage.SERVICES__PARENT_ACCESS_POINT,
+                        Services.class, msgs );
+            msgs = basicSetServices( newServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldServicesESet = servicesESet;
             servicesESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ACCESS_POINT__SERVICES, newServices, newServices, !oldServicesESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ACCESS_POINT__SERVICES, newServices,
+                        newServices, !oldServicesESet ) );
         }
     }
 
@@ -841,9 +885,13 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
         services = null;
         boolean oldServicesESet = servicesESet;
         servicesESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.ACCESS_POINT__SERVICES, oldServices, null, oldServicesESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.ACCESS_POINT__SERVICES, oldServices, null, oldServicesESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -855,17 +903,19 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public void unsetServices() {
-        if (services != null) {
+        if( services != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)services).eInverseRemove(this, SclPackage.SERVICES__PARENT_ACCESS_POINT, Services.class, msgs);
-            msgs = basicUnsetServices(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) services ).eInverseRemove( this, SclPackage.SERVICES__PARENT_ACCESS_POINT,
+                    Services.class, msgs );
+            msgs = basicUnsetServices( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldServicesESet = servicesESet;
             servicesESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ACCESS_POINT__SERVICES, null, null, oldServicesESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ACCESS_POINT__SERVICES, null, null,
+                        oldServicesESet ) );
         }
     }
 
@@ -885,9 +935,10 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * @generated
      */
     @Override
-    public EList<GOOSESecurity> getGOOSESecurity() {
-        if (gooseSecurity == null) {
-            gooseSecurity = new EObjectContainmentWithInverseEList.Unsettable<GOOSESecurity>(GOOSESecurity.class, this, SclPackage.ACCESS_POINT__GOOSE_SECURITY, SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT);
+    public EList< GOOSESecurity > getGOOSESecurity() {
+        if( gooseSecurity == null ) {
+            gooseSecurity = new EObjectContainmentWithInverseEList.Unsettable< GOOSESecurity >( GOOSESecurity.class,
+                    this, SclPackage.ACCESS_POINT__GOOSE_SECURITY, SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT );
         }
         return gooseSecurity;
     }
@@ -899,7 +950,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public void unsetGOOSESecurity() {
-        if (gooseSecurity != null) ((InternalEList.Unsettable<?>)gooseSecurity).unset();
+        if( gooseSecurity != null ) ( ( InternalEList.Unsettable< ? > ) gooseSecurity ).unset();
     }
 
     /**
@@ -909,7 +960,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public boolean isSetGOOSESecurity() {
-        return gooseSecurity != null && ((InternalEList.Unsettable<?>)gooseSecurity).isSet();
+        return gooseSecurity != null && ( ( InternalEList.Unsettable< ? > ) gooseSecurity ).isSet();
     }
 
     /**
@@ -918,9 +969,10 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * @generated
      */
     @Override
-    public EList<ServerAt> getReferredByServerAt() {
-        if (referredByServerAt == null) {
-            referredByServerAt = new EObjectWithInverseEList.Unsettable<ServerAt>(ServerAt.class, this, SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT, SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT);
+    public EList< ServerAt > getReferredByServerAt() {
+        if( referredByServerAt == null ) {
+            referredByServerAt = new EObjectWithInverseEList.Unsettable< ServerAt >( ServerAt.class, this,
+                    SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT, SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT );
         }
         return referredByServerAt;
     }
@@ -932,7 +984,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public void unsetReferredByServerAt() {
-        if (referredByServerAt != null) ((InternalEList.Unsettable<?>)referredByServerAt).unset();
+        if( referredByServerAt != null ) ( ( InternalEList.Unsettable< ? > ) referredByServerAt ).unset();
     }
 
     /**
@@ -942,7 +994,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public boolean isSetReferredByServerAt() {
-        return referredByServerAt != null && ((InternalEList.Unsettable<?>)referredByServerAt).isSet();
+        return referredByServerAt != null && ( ( InternalEList.Unsettable< ? > ) referredByServerAt ).isSet();
     }
 
     /**
@@ -961,13 +1013,14 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * @generated
      */
     @Override
-    public void setName(String newName) {
+    public void setName( String newName ) {
         String oldName = name;
         name = newName;
         boolean oldNameESet = nameESet;
         nameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ACCESS_POINT__NAME, oldName, name, !oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ACCESS_POINT__NAME, oldName, name,
+                    !oldNameESet ) );
     }
 
     /**
@@ -981,8 +1034,9 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
         boolean oldNameESet = nameESet;
         name = NAME_EDEFAULT;
         nameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ACCESS_POINT__NAME, oldName, NAME_EDEFAULT, oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ACCESS_POINT__NAME, oldName,
+                    NAME_EDEFAULT, oldNameESet ) );
     }
 
     /**
@@ -1001,9 +1055,11 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * @generated
      */
     @Override
-    public EList<ConnectedAP> getReferredByConnectedAP() {
-        if (referredByConnectedAP == null) {
-            referredByConnectedAP = new EObjectWithInverseEList.Unsettable<ConnectedAP>(ConnectedAP.class, this, SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP, SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT);
+    public EList< ConnectedAP > getReferredByConnectedAP() {
+        if( referredByConnectedAP == null ) {
+            referredByConnectedAP = new EObjectWithInverseEList.Unsettable< ConnectedAP >( ConnectedAP.class, this,
+                    SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP,
+                    SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT );
         }
         return referredByConnectedAP;
     }
@@ -1015,7 +1071,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public void unsetReferredByConnectedAP() {
-        if (referredByConnectedAP != null) ((InternalEList.Unsettable<?>)referredByConnectedAP).unset();
+        if( referredByConnectedAP != null ) ( ( InternalEList.Unsettable< ? > ) referredByConnectedAP ).unset();
     }
 
     /**
@@ -1025,7 +1081,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public boolean isSetReferredByConnectedAP() {
-        return referredByConnectedAP != null && ((InternalEList.Unsettable<?>)referredByConnectedAP).isSet();
+        return referredByConnectedAP != null && ( ( InternalEList.Unsettable< ? > ) referredByConnectedAP ).isSet();
     }
 
     /**
@@ -1034,9 +1090,10 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      * @generated
      */
     @Override
-    public EList<KDC> getReferredByKDC() {
-        if (referredByKDC == null) {
-            referredByKDC = new EObjectWithInverseEList.Unsettable<KDC>(KDC.class, this, SclPackage.ACCESS_POINT__REFERRED_BY_KDC, SclPackage.KDC__REFERS_TO_ACCESS_POINT);
+    public EList< KDC > getReferredByKDC() {
+        if( referredByKDC == null ) {
+            referredByKDC = new EObjectWithInverseEList.Unsettable< KDC >( KDC.class, this,
+                    SclPackage.ACCESS_POINT__REFERRED_BY_KDC, SclPackage.KDC__REFERS_TO_ACCESS_POINT );
         }
         return referredByKDC;
     }
@@ -1048,7 +1105,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public void unsetReferredByKDC() {
-        if (referredByKDC != null) ((InternalEList.Unsettable<?>)referredByKDC).unset();
+        if( referredByKDC != null ) ( ( InternalEList.Unsettable< ? > ) referredByKDC ).unset();
     }
 
     /**
@@ -1058,7 +1115,7 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public boolean isSetReferredByKDC() {
-        return referredByKDC != null && ((InternalEList.Unsettable<?>)referredByKDC).isSet();
+        return referredByKDC != null && ( ( InternalEList.Unsettable< ? > ) referredByKDC ).isSet();
     }
 
     /**
@@ -1069,37 +1126,45 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ACCESS_POINT__PARENT_IED:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentIED((IED)otherEnd, msgs);
-            case SclPackage.ACCESS_POINT__LN:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getLN()).basicAdd(otherEnd, msgs);
-            case SclPackage.ACCESS_POINT__SMV_SECURITY:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSMVSecurity()).basicAdd(otherEnd, msgs);
-            case SclPackage.ACCESS_POINT__SERVER_AT:
-                if (serverAt != null)
-                    msgs = ((InternalEObject)serverAt).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.ACCESS_POINT__SERVER_AT, null, msgs);
-                return basicSetServerAt((ServerAt)otherEnd, msgs);
-            case SclPackage.ACCESS_POINT__SERVER:
-                if (server != null)
-                    msgs = ((InternalEObject)server).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.ACCESS_POINT__SERVER, null, msgs);
-                return basicSetServer((Server)otherEnd, msgs);
-            case SclPackage.ACCESS_POINT__SERVICES:
-                if (services != null)
-                    msgs = ((InternalEObject)services).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.ACCESS_POINT__SERVICES, null, msgs);
-                return basicSetServices((Services)otherEnd, msgs);
-            case SclPackage.ACCESS_POINT__GOOSE_SECURITY:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getGOOSESecurity()).basicAdd(otherEnd, msgs);
-            case SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByServerAt()).basicAdd(otherEnd, msgs);
-            case SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByConnectedAP()).basicAdd(otherEnd, msgs);
-            case SclPackage.ACCESS_POINT__REFERRED_BY_KDC:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByKDC()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ACCESS_POINT__PARENT_IED:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentIED( ( IED ) otherEnd, msgs );
+        case SclPackage.ACCESS_POINT__LN:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getLN() ).basicAdd( otherEnd, msgs );
+        case SclPackage.ACCESS_POINT__SMV_SECURITY:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSMVSecurity() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.ACCESS_POINT__SERVER_AT:
+            if( serverAt != null )
+                msgs = ( ( InternalEObject ) serverAt ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.ACCESS_POINT__SERVER_AT, null, msgs );
+            return basicSetServerAt( ( ServerAt ) otherEnd, msgs );
+        case SclPackage.ACCESS_POINT__SERVER:
+            if( server != null )
+                msgs = ( ( InternalEObject ) server ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.ACCESS_POINT__SERVER, null, msgs );
+            return basicSetServer( ( Server ) otherEnd, msgs );
+        case SclPackage.ACCESS_POINT__SERVICES:
+            if( services != null )
+                msgs = ( ( InternalEObject ) services ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.ACCESS_POINT__SERVICES, null, msgs );
+            return basicSetServices( ( Services ) otherEnd, msgs );
+        case SclPackage.ACCESS_POINT__GOOSE_SECURITY:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getGOOSESecurity() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByServerAt() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByConnectedAP() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.ACCESS_POINT__REFERRED_BY_KDC:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByKDC() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1109,29 +1174,29 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ACCESS_POINT__PARENT_IED:
-                return basicSetParentIED(null, msgs);
-            case SclPackage.ACCESS_POINT__LN:
-                return ((InternalEList<?>)getLN()).basicRemove(otherEnd, msgs);
-            case SclPackage.ACCESS_POINT__SMV_SECURITY:
-                return ((InternalEList<?>)getSMVSecurity()).basicRemove(otherEnd, msgs);
-            case SclPackage.ACCESS_POINT__SERVER_AT:
-                return basicUnsetServerAt(msgs);
-            case SclPackage.ACCESS_POINT__SERVER:
-                return basicUnsetServer(msgs);
-            case SclPackage.ACCESS_POINT__SERVICES:
-                return basicUnsetServices(msgs);
-            case SclPackage.ACCESS_POINT__GOOSE_SECURITY:
-                return ((InternalEList<?>)getGOOSESecurity()).basicRemove(otherEnd, msgs);
-            case SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT:
-                return ((InternalEList<?>)getReferredByServerAt()).basicRemove(otherEnd, msgs);
-            case SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP:
-                return ((InternalEList<?>)getReferredByConnectedAP()).basicRemove(otherEnd, msgs);
-            case SclPackage.ACCESS_POINT__REFERRED_BY_KDC:
-                return ((InternalEList<?>)getReferredByKDC()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ACCESS_POINT__PARENT_IED:
+            return basicSetParentIED( null, msgs );
+        case SclPackage.ACCESS_POINT__LN:
+            return ( ( InternalEList< ? > ) getLN() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ACCESS_POINT__SMV_SECURITY:
+            return ( ( InternalEList< ? > ) getSMVSecurity() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ACCESS_POINT__SERVER_AT:
+            return basicUnsetServerAt( msgs );
+        case SclPackage.ACCESS_POINT__SERVER:
+            return basicUnsetServer( msgs );
+        case SclPackage.ACCESS_POINT__SERVICES:
+            return basicUnsetServices( msgs );
+        case SclPackage.ACCESS_POINT__GOOSE_SECURITY:
+            return ( ( InternalEList< ? > ) getGOOSESecurity() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT:
+            return ( ( InternalEList< ? > ) getReferredByServerAt() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP:
+            return ( ( InternalEList< ? > ) getReferredByConnectedAP() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ACCESS_POINT__REFERRED_BY_KDC:
+            return ( ( InternalEList< ? > ) getReferredByKDC() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1141,11 +1206,11 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.ACCESS_POINT__PARENT_IED:
-                return eInternalContainer().eInverseRemove(this, SclPackage.IED__ACCESS_POINT, IED.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.ACCESS_POINT__PARENT_IED:
+            return eInternalContainer().eInverseRemove( this, SclPackage.IED__ACCESS_POINT, IED.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -1155,37 +1220,37 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.ACCESS_POINT__CLOCK:
-                return getClock();
-            case SclPackage.ACCESS_POINT__KDC:
-                return getKdc();
-            case SclPackage.ACCESS_POINT__ROUTER:
-                return getRouter();
-            case SclPackage.ACCESS_POINT__PARENT_IED:
-                return getParentIED();
-            case SclPackage.ACCESS_POINT__LN:
-                return getLN();
-            case SclPackage.ACCESS_POINT__SMV_SECURITY:
-                return getSMVSecurity();
-            case SclPackage.ACCESS_POINT__SERVER_AT:
-                return getServerAt();
-            case SclPackage.ACCESS_POINT__SERVER:
-                return getServer();
-            case SclPackage.ACCESS_POINT__SERVICES:
-                return getServices();
-            case SclPackage.ACCESS_POINT__GOOSE_SECURITY:
-                return getGOOSESecurity();
-            case SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT:
-                return getReferredByServerAt();
-            case SclPackage.ACCESS_POINT__NAME:
-                return getName();
-            case SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP:
-                return getReferredByConnectedAP();
-            case SclPackage.ACCESS_POINT__REFERRED_BY_KDC:
-                return getReferredByKDC();
+        switch( featureID ) {
+        case SclPackage.ACCESS_POINT__CLOCK:
+            return getClock();
+        case SclPackage.ACCESS_POINT__KDC:
+            return getKdc();
+        case SclPackage.ACCESS_POINT__ROUTER:
+            return getRouter();
+        case SclPackage.ACCESS_POINT__PARENT_IED:
+            return getParentIED();
+        case SclPackage.ACCESS_POINT__LN:
+            return getLN();
+        case SclPackage.ACCESS_POINT__SMV_SECURITY:
+            return getSMVSecurity();
+        case SclPackage.ACCESS_POINT__SERVER_AT:
+            return getServerAt();
+        case SclPackage.ACCESS_POINT__SERVER:
+            return getServer();
+        case SclPackage.ACCESS_POINT__SERVICES:
+            return getServices();
+        case SclPackage.ACCESS_POINT__GOOSE_SECURITY:
+            return getGOOSESecurity();
+        case SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT:
+            return getReferredByServerAt();
+        case SclPackage.ACCESS_POINT__NAME:
+            return getName();
+        case SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP:
+            return getReferredByConnectedAP();
+        case SclPackage.ACCESS_POINT__REFERRED_BY_KDC:
+            return getReferredByKDC();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -1196,57 +1261,57 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.ACCESS_POINT__CLOCK:
-                setClock((Boolean)newValue);
-                return;
-            case SclPackage.ACCESS_POINT__KDC:
-                setKdc((Boolean)newValue);
-                return;
-            case SclPackage.ACCESS_POINT__ROUTER:
-                setRouter((Boolean)newValue);
-                return;
-            case SclPackage.ACCESS_POINT__PARENT_IED:
-                setParentIED((IED)newValue);
-                return;
-            case SclPackage.ACCESS_POINT__LN:
-                getLN().clear();
-                getLN().addAll((Collection<? extends LN>)newValue);
-                return;
-            case SclPackage.ACCESS_POINT__SMV_SECURITY:
-                getSMVSecurity().clear();
-                getSMVSecurity().addAll((Collection<? extends SMVSecurity>)newValue);
-                return;
-            case SclPackage.ACCESS_POINT__SERVER_AT:
-                setServerAt((ServerAt)newValue);
-                return;
-            case SclPackage.ACCESS_POINT__SERVER:
-                setServer((Server)newValue);
-                return;
-            case SclPackage.ACCESS_POINT__SERVICES:
-                setServices((Services)newValue);
-                return;
-            case SclPackage.ACCESS_POINT__GOOSE_SECURITY:
-                getGOOSESecurity().clear();
-                getGOOSESecurity().addAll((Collection<? extends GOOSESecurity>)newValue);
-                return;
-            case SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT:
-                getReferredByServerAt().clear();
-                getReferredByServerAt().addAll((Collection<? extends ServerAt>)newValue);
-                return;
-            case SclPackage.ACCESS_POINT__NAME:
-                setName((String)newValue);
-                return;
-            case SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP:
-                getReferredByConnectedAP().clear();
-                getReferredByConnectedAP().addAll((Collection<? extends ConnectedAP>)newValue);
-                return;
-            case SclPackage.ACCESS_POINT__REFERRED_BY_KDC:
-                getReferredByKDC().clear();
-                getReferredByKDC().addAll((Collection<? extends KDC>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.ACCESS_POINT__CLOCK:
+            setClock( ( Boolean ) newValue );
+            return;
+        case SclPackage.ACCESS_POINT__KDC:
+            setKdc( ( Boolean ) newValue );
+            return;
+        case SclPackage.ACCESS_POINT__ROUTER:
+            setRouter( ( Boolean ) newValue );
+            return;
+        case SclPackage.ACCESS_POINT__PARENT_IED:
+            setParentIED( ( IED ) newValue );
+            return;
+        case SclPackage.ACCESS_POINT__LN:
+            getLN().clear();
+            getLN().addAll( ( Collection< ? extends LN > ) newValue );
+            return;
+        case SclPackage.ACCESS_POINT__SMV_SECURITY:
+            getSMVSecurity().clear();
+            getSMVSecurity().addAll( ( Collection< ? extends SMVSecurity > ) newValue );
+            return;
+        case SclPackage.ACCESS_POINT__SERVER_AT:
+            setServerAt( ( ServerAt ) newValue );
+            return;
+        case SclPackage.ACCESS_POINT__SERVER:
+            setServer( ( Server ) newValue );
+            return;
+        case SclPackage.ACCESS_POINT__SERVICES:
+            setServices( ( Services ) newValue );
+            return;
+        case SclPackage.ACCESS_POINT__GOOSE_SECURITY:
+            getGOOSESecurity().clear();
+            getGOOSESecurity().addAll( ( Collection< ? extends GOOSESecurity > ) newValue );
+            return;
+        case SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT:
+            getReferredByServerAt().clear();
+            getReferredByServerAt().addAll( ( Collection< ? extends ServerAt > ) newValue );
+            return;
+        case SclPackage.ACCESS_POINT__NAME:
+            setName( ( String ) newValue );
+            return;
+        case SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP:
+            getReferredByConnectedAP().clear();
+            getReferredByConnectedAP().addAll( ( Collection< ? extends ConnectedAP > ) newValue );
+            return;
+        case SclPackage.ACCESS_POINT__REFERRED_BY_KDC:
+            getReferredByKDC().clear();
+            getReferredByKDC().addAll( ( Collection< ? extends KDC > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -1256,51 +1321,51 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ACCESS_POINT__CLOCK:
-                unsetClock();
-                return;
-            case SclPackage.ACCESS_POINT__KDC:
-                unsetKdc();
-                return;
-            case SclPackage.ACCESS_POINT__ROUTER:
-                unsetRouter();
-                return;
-            case SclPackage.ACCESS_POINT__PARENT_IED:
-                setParentIED((IED)null);
-                return;
-            case SclPackage.ACCESS_POINT__LN:
-                unsetLN();
-                return;
-            case SclPackage.ACCESS_POINT__SMV_SECURITY:
-                unsetSMVSecurity();
-                return;
-            case SclPackage.ACCESS_POINT__SERVER_AT:
-                unsetServerAt();
-                return;
-            case SclPackage.ACCESS_POINT__SERVER:
-                unsetServer();
-                return;
-            case SclPackage.ACCESS_POINT__SERVICES:
-                unsetServices();
-                return;
-            case SclPackage.ACCESS_POINT__GOOSE_SECURITY:
-                unsetGOOSESecurity();
-                return;
-            case SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT:
-                unsetReferredByServerAt();
-                return;
-            case SclPackage.ACCESS_POINT__NAME:
-                unsetName();
-                return;
-            case SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP:
-                unsetReferredByConnectedAP();
-                return;
-            case SclPackage.ACCESS_POINT__REFERRED_BY_KDC:
-                unsetReferredByKDC();
-                return;
+        switch( featureID ) {
+        case SclPackage.ACCESS_POINT__CLOCK:
+            unsetClock();
+            return;
+        case SclPackage.ACCESS_POINT__KDC:
+            unsetKdc();
+            return;
+        case SclPackage.ACCESS_POINT__ROUTER:
+            unsetRouter();
+            return;
+        case SclPackage.ACCESS_POINT__PARENT_IED:
+            setParentIED( ( IED ) null );
+            return;
+        case SclPackage.ACCESS_POINT__LN:
+            unsetLN();
+            return;
+        case SclPackage.ACCESS_POINT__SMV_SECURITY:
+            unsetSMVSecurity();
+            return;
+        case SclPackage.ACCESS_POINT__SERVER_AT:
+            unsetServerAt();
+            return;
+        case SclPackage.ACCESS_POINT__SERVER:
+            unsetServer();
+            return;
+        case SclPackage.ACCESS_POINT__SERVICES:
+            unsetServices();
+            return;
+        case SclPackage.ACCESS_POINT__GOOSE_SECURITY:
+            unsetGOOSESecurity();
+            return;
+        case SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT:
+            unsetReferredByServerAt();
+            return;
+        case SclPackage.ACCESS_POINT__NAME:
+            unsetName();
+            return;
+        case SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP:
+            unsetReferredByConnectedAP();
+            return;
+        case SclPackage.ACCESS_POINT__REFERRED_BY_KDC:
+            unsetReferredByKDC();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -1310,37 +1375,37 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ACCESS_POINT__CLOCK:
-                return isSetClock();
-            case SclPackage.ACCESS_POINT__KDC:
-                return isSetKdc();
-            case SclPackage.ACCESS_POINT__ROUTER:
-                return isSetRouter();
-            case SclPackage.ACCESS_POINT__PARENT_IED:
-                return getParentIED() != null;
-            case SclPackage.ACCESS_POINT__LN:
-                return isSetLN();
-            case SclPackage.ACCESS_POINT__SMV_SECURITY:
-                return isSetSMVSecurity();
-            case SclPackage.ACCESS_POINT__SERVER_AT:
-                return isSetServerAt();
-            case SclPackage.ACCESS_POINT__SERVER:
-                return isSetServer();
-            case SclPackage.ACCESS_POINT__SERVICES:
-                return isSetServices();
-            case SclPackage.ACCESS_POINT__GOOSE_SECURITY:
-                return isSetGOOSESecurity();
-            case SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT:
-                return isSetReferredByServerAt();
-            case SclPackage.ACCESS_POINT__NAME:
-                return isSetName();
-            case SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP:
-                return isSetReferredByConnectedAP();
-            case SclPackage.ACCESS_POINT__REFERRED_BY_KDC:
-                return isSetReferredByKDC();
+        switch( featureID ) {
+        case SclPackage.ACCESS_POINT__CLOCK:
+            return isSetClock();
+        case SclPackage.ACCESS_POINT__KDC:
+            return isSetKdc();
+        case SclPackage.ACCESS_POINT__ROUTER:
+            return isSetRouter();
+        case SclPackage.ACCESS_POINT__PARENT_IED:
+            return getParentIED() != null;
+        case SclPackage.ACCESS_POINT__LN:
+            return isSetLN();
+        case SclPackage.ACCESS_POINT__SMV_SECURITY:
+            return isSetSMVSecurity();
+        case SclPackage.ACCESS_POINT__SERVER_AT:
+            return isSetServerAt();
+        case SclPackage.ACCESS_POINT__SERVER:
+            return isSetServer();
+        case SclPackage.ACCESS_POINT__SERVICES:
+            return isSetServices();
+        case SclPackage.ACCESS_POINT__GOOSE_SECURITY:
+            return isSetGOOSESecurity();
+        case SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT:
+            return isSetReferredByServerAt();
+        case SclPackage.ACCESS_POINT__NAME:
+            return isSetName();
+        case SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP:
+            return isSetReferredByConnectedAP();
+        case SclPackage.ACCESS_POINT__REFERRED_BY_KDC:
+            return isSetReferredByKDC();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -1350,18 +1415,30 @@ public class AccessPointImpl extends UnNamingImpl implements AccessPoint {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (clock: ");
-        if (clockESet) result.append(clock); else result.append("<unset>");
-        result.append(", kdc: ");
-        if (kdcESet) result.append(kdc); else result.append("<unset>");
-        result.append(", router: ");
-        if (routerESet) result.append(router); else result.append("<unset>");
-        result.append(", name: ");
-        if (nameESet) result.append(name); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (clock: " );
+        if( clockESet )
+            result.append( clock );
+        else
+            result.append( "<unset>" );
+        result.append( ", kdc: " );
+        if( kdcESet )
+            result.append( kdc );
+        else
+            result.append( "<unset>" );
+        result.append( ", router: " );
+        if( routerESet )
+            result.append( router );
+        else
+            result.append( "<unset>" );
+        result.append( ", name: " );
+        if( nameESet )
+            result.append( name );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AddressImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AddressImpl.java
index 1fa2272..7d67ce2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AddressImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AddressImpl.java
@@ -61,7 +61,7 @@ public class AddressImpl extends SclObjectImpl implements Address {
      * @generated
      * @ordered
      */
-    protected EList<P> p;
+    protected EList< P > p;
 
     /**
      * <!-- begin-user-doc -->
@@ -89,8 +89,8 @@ public class AddressImpl extends SclObjectImpl implements Address {
      */
     @Override
     public ConnectedAP getParentConnectedAP() {
-        if (eContainerFeatureID() != SclPackage.ADDRESS__PARENT_CONNECTED_AP) return null;
-        return (ConnectedAP)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.ADDRESS__PARENT_CONNECTED_AP ) return null;
+        return ( ConnectedAP ) eInternalContainer();
     }
 
     /**
@@ -98,8 +98,9 @@ public class AddressImpl extends SclObjectImpl implements Address {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentConnectedAP(ConnectedAP newParentConnectedAP, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentConnectedAP, SclPackage.ADDRESS__PARENT_CONNECTED_AP, msgs);
+    public NotificationChain basicSetParentConnectedAP( ConnectedAP newParentConnectedAP, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentConnectedAP, SclPackage.ADDRESS__PARENT_CONNECTED_AP,
+                msgs );
         return msgs;
     }
 
@@ -109,20 +110,24 @@ public class AddressImpl extends SclObjectImpl implements Address {
      * @generated
      */
     @Override
-    public void setParentConnectedAP(ConnectedAP newParentConnectedAP) {
-        if (newParentConnectedAP != eInternalContainer() || (eContainerFeatureID() != SclPackage.ADDRESS__PARENT_CONNECTED_AP && newParentConnectedAP != null)) {
-            if (EcoreUtil.isAncestor(this, newParentConnectedAP))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentConnectedAP( ConnectedAP newParentConnectedAP ) {
+        if( newParentConnectedAP != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.ADDRESS__PARENT_CONNECTED_AP
+                        && newParentConnectedAP != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentConnectedAP ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentConnectedAP != null)
-                msgs = ((InternalEObject)newParentConnectedAP).eInverseAdd(this, SclPackage.CONNECTED_AP__ADDRESS, ConnectedAP.class, msgs);
-            msgs = basicSetParentConnectedAP(newParentConnectedAP, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentConnectedAP != null )
+                msgs = ( ( InternalEObject ) newParentConnectedAP ).eInverseAdd( this, SclPackage.CONNECTED_AP__ADDRESS,
+                        ConnectedAP.class, msgs );
+            msgs = basicSetParentConnectedAP( newParentConnectedAP, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ADDRESS__PARENT_CONNECTED_AP, newParentConnectedAP, newParentConnectedAP));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ADDRESS__PARENT_CONNECTED_AP,
+                    newParentConnectedAP, newParentConnectedAP ) );
     }
 
     /**
@@ -132,8 +137,8 @@ public class AddressImpl extends SclObjectImpl implements Address {
      */
     @Override
     public ControlBlock getParentControlBlock() {
-        if (eContainerFeatureID() != SclPackage.ADDRESS__PARENT_CONTROL_BLOCK) return null;
-        return (ControlBlock)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.ADDRESS__PARENT_CONTROL_BLOCK ) return null;
+        return ( ControlBlock ) eInternalContainer();
     }
 
     /**
@@ -141,8 +146,9 @@ public class AddressImpl extends SclObjectImpl implements Address {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentControlBlock(ControlBlock newParentControlBlock, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentControlBlock, SclPackage.ADDRESS__PARENT_CONTROL_BLOCK, msgs);
+    public NotificationChain basicSetParentControlBlock( ControlBlock newParentControlBlock, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentControlBlock, SclPackage.ADDRESS__PARENT_CONTROL_BLOCK,
+                msgs );
         return msgs;
     }
 
@@ -152,20 +158,24 @@ public class AddressImpl extends SclObjectImpl implements Address {
      * @generated
      */
     @Override
-    public void setParentControlBlock(ControlBlock newParentControlBlock) {
-        if (newParentControlBlock != eInternalContainer() || (eContainerFeatureID() != SclPackage.ADDRESS__PARENT_CONTROL_BLOCK && newParentControlBlock != null)) {
-            if (EcoreUtil.isAncestor(this, newParentControlBlock))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentControlBlock( ControlBlock newParentControlBlock ) {
+        if( newParentControlBlock != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.ADDRESS__PARENT_CONTROL_BLOCK
+                        && newParentControlBlock != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentControlBlock ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentControlBlock != null)
-                msgs = ((InternalEObject)newParentControlBlock).eInverseAdd(this, SclPackage.CONTROL_BLOCK__ADDRESS, ControlBlock.class, msgs);
-            msgs = basicSetParentControlBlock(newParentControlBlock, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentControlBlock != null )
+                msgs = ( ( InternalEObject ) newParentControlBlock ).eInverseAdd( this,
+                        SclPackage.CONTROL_BLOCK__ADDRESS, ControlBlock.class, msgs );
+            msgs = basicSetParentControlBlock( newParentControlBlock, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ADDRESS__PARENT_CONTROL_BLOCK, newParentControlBlock, newParentControlBlock));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ADDRESS__PARENT_CONTROL_BLOCK,
+                    newParentControlBlock, newParentControlBlock ) );
     }
 
     /**
@@ -174,9 +184,10 @@ public class AddressImpl extends SclObjectImpl implements Address {
      * @generated
      */
     @Override
-    public EList<P> getP() {
-        if (p == null) {
-            p = new EObjectContainmentWithInverseEList.Unsettable<P>(P.class, this, SclPackage.ADDRESS__P, SclPackage.P__PARENT_ADDRESS);
+    public EList< P > getP() {
+        if( p == null ) {
+            p = new EObjectContainmentWithInverseEList.Unsettable< P >( P.class, this, SclPackage.ADDRESS__P,
+                    SclPackage.P__PARENT_ADDRESS );
         }
         return p;
     }
@@ -188,7 +199,7 @@ public class AddressImpl extends SclObjectImpl implements Address {
      */
     @Override
     public void unsetP() {
-        if (p != null) ((InternalEList.Unsettable<?>)p).unset();
+        if( p != null ) ( ( InternalEList.Unsettable< ? > ) p ).unset();
     }
 
     /**
@@ -198,7 +209,7 @@ public class AddressImpl extends SclObjectImpl implements Address {
      */
     @Override
     public boolean isSetP() {
-        return p != null && ((InternalEList.Unsettable<?>)p).isSet();
+        return p != null && ( ( InternalEList.Unsettable< ? > ) p ).isSet();
     }
 
     /**
@@ -209,19 +220,19 @@ public class AddressImpl extends SclObjectImpl implements Address {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ADDRESS__PARENT_CONNECTED_AP:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentConnectedAP((ConnectedAP)otherEnd, msgs);
-            case SclPackage.ADDRESS__PARENT_CONTROL_BLOCK:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentControlBlock((ControlBlock)otherEnd, msgs);
-            case SclPackage.ADDRESS__P:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getP()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ADDRESS__PARENT_CONNECTED_AP:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentConnectedAP( ( ConnectedAP ) otherEnd, msgs );
+        case SclPackage.ADDRESS__PARENT_CONTROL_BLOCK:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentControlBlock( ( ControlBlock ) otherEnd, msgs );
+        case SclPackage.ADDRESS__P:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getP() ).basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -231,15 +242,15 @@ public class AddressImpl extends SclObjectImpl implements Address {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ADDRESS__PARENT_CONNECTED_AP:
-                return basicSetParentConnectedAP(null, msgs);
-            case SclPackage.ADDRESS__PARENT_CONTROL_BLOCK:
-                return basicSetParentControlBlock(null, msgs);
-            case SclPackage.ADDRESS__P:
-                return ((InternalEList<?>)getP()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ADDRESS__PARENT_CONNECTED_AP:
+            return basicSetParentConnectedAP( null, msgs );
+        case SclPackage.ADDRESS__PARENT_CONTROL_BLOCK:
+            return basicSetParentControlBlock( null, msgs );
+        case SclPackage.ADDRESS__P:
+            return ( ( InternalEList< ? > ) getP() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -249,13 +260,15 @@ public class AddressImpl extends SclObjectImpl implements Address {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.ADDRESS__PARENT_CONNECTED_AP:
-                return eInternalContainer().eInverseRemove(this, SclPackage.CONNECTED_AP__ADDRESS, ConnectedAP.class, msgs);
-            case SclPackage.ADDRESS__PARENT_CONTROL_BLOCK:
-                return eInternalContainer().eInverseRemove(this, SclPackage.CONTROL_BLOCK__ADDRESS, ControlBlock.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.ADDRESS__PARENT_CONNECTED_AP:
+            return eInternalContainer().eInverseRemove( this, SclPackage.CONNECTED_AP__ADDRESS, ConnectedAP.class,
+                    msgs );
+        case SclPackage.ADDRESS__PARENT_CONTROL_BLOCK:
+            return eInternalContainer().eInverseRemove( this, SclPackage.CONTROL_BLOCK__ADDRESS, ControlBlock.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -265,15 +278,15 @@ public class AddressImpl extends SclObjectImpl implements Address {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.ADDRESS__PARENT_CONNECTED_AP:
-                return getParentConnectedAP();
-            case SclPackage.ADDRESS__PARENT_CONTROL_BLOCK:
-                return getParentControlBlock();
-            case SclPackage.ADDRESS__P:
-                return getP();
+        switch( featureID ) {
+        case SclPackage.ADDRESS__PARENT_CONNECTED_AP:
+            return getParentConnectedAP();
+        case SclPackage.ADDRESS__PARENT_CONTROL_BLOCK:
+            return getParentControlBlock();
+        case SclPackage.ADDRESS__P:
+            return getP();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -284,19 +297,19 @@ public class AddressImpl extends SclObjectImpl implements Address {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.ADDRESS__PARENT_CONNECTED_AP:
-                setParentConnectedAP((ConnectedAP)newValue);
-                return;
-            case SclPackage.ADDRESS__PARENT_CONTROL_BLOCK:
-                setParentControlBlock((ControlBlock)newValue);
-                return;
-            case SclPackage.ADDRESS__P:
-                getP().clear();
-                getP().addAll((Collection<? extends P>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.ADDRESS__PARENT_CONNECTED_AP:
+            setParentConnectedAP( ( ConnectedAP ) newValue );
+            return;
+        case SclPackage.ADDRESS__PARENT_CONTROL_BLOCK:
+            setParentControlBlock( ( ControlBlock ) newValue );
+            return;
+        case SclPackage.ADDRESS__P:
+            getP().clear();
+            getP().addAll( ( Collection< ? extends P > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -306,18 +319,18 @@ public class AddressImpl extends SclObjectImpl implements Address {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ADDRESS__PARENT_CONNECTED_AP:
-                setParentConnectedAP((ConnectedAP)null);
-                return;
-            case SclPackage.ADDRESS__PARENT_CONTROL_BLOCK:
-                setParentControlBlock((ControlBlock)null);
-                return;
-            case SclPackage.ADDRESS__P:
-                unsetP();
-                return;
+        switch( featureID ) {
+        case SclPackage.ADDRESS__PARENT_CONNECTED_AP:
+            setParentConnectedAP( ( ConnectedAP ) null );
+            return;
+        case SclPackage.ADDRESS__PARENT_CONTROL_BLOCK:
+            setParentControlBlock( ( ControlBlock ) null );
+            return;
+        case SclPackage.ADDRESS__P:
+            unsetP();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -327,15 +340,15 @@ public class AddressImpl extends SclObjectImpl implements Address {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ADDRESS__PARENT_CONNECTED_AP:
-                return getParentConnectedAP() != null;
-            case SclPackage.ADDRESS__PARENT_CONTROL_BLOCK:
-                return getParentControlBlock() != null;
-            case SclPackage.ADDRESS__P:
-                return isSetP();
+        switch( featureID ) {
+        case SclPackage.ADDRESS__PARENT_CONNECTED_AP:
+            return getParentConnectedAP() != null;
+        case SclPackage.ADDRESS__PARENT_CONTROL_BLOCK:
+            return getParentControlBlock() != null;
+        case SclPackage.ADDRESS__P:
+            return isSetP();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //AddressImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgAuthenticationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgAuthenticationImpl.java
index dbcb9f6..db679e4 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgAuthenticationImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgAuthenticationImpl.java
@@ -228,13 +228,14 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public void setCertificate(Boolean newCertificate) {
+    public void setCertificate( Boolean newCertificate ) {
         Boolean oldCertificate = certificate;
         certificate = newCertificate;
         boolean oldCertificateESet = certificateESet;
         certificateESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_AUTHENTICATION__CERTIFICATE, oldCertificate, certificate, !oldCertificateESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_AUTHENTICATION__CERTIFICATE,
+                    oldCertificate, certificate, !oldCertificateESet ) );
     }
 
     /**
@@ -248,8 +249,9 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
         boolean oldCertificateESet = certificateESet;
         certificate = CERTIFICATE_EDEFAULT;
         certificateESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_AUTHENTICATION__CERTIFICATE, oldCertificate, CERTIFICATE_EDEFAULT, oldCertificateESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_AUTHENTICATION__CERTIFICATE,
+                    oldCertificate, CERTIFICATE_EDEFAULT, oldCertificateESet ) );
     }
 
     /**
@@ -278,13 +280,14 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public void setNone(Boolean newNone) {
+    public void setNone( Boolean newNone ) {
         Boolean oldNone = none;
         none = newNone;
         boolean oldNoneESet = noneESet;
         noneESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_AUTHENTICATION__NONE, oldNone, none, !oldNoneESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_AUTHENTICATION__NONE, oldNone, none,
+                    !oldNoneESet ) );
     }
 
     /**
@@ -298,8 +301,9 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
         boolean oldNoneESet = noneESet;
         none = NONE_EDEFAULT;
         noneESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_AUTHENTICATION__NONE, oldNone, NONE_EDEFAULT, oldNoneESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_AUTHENTICATION__NONE, oldNone,
+                    NONE_EDEFAULT, oldNoneESet ) );
     }
 
     /**
@@ -328,13 +332,14 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public void setPassword(Boolean newPassword) {
+    public void setPassword( Boolean newPassword ) {
         Boolean oldPassword = password;
         password = newPassword;
         boolean oldPasswordESet = passwordESet;
         passwordESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_AUTHENTICATION__PASSWORD, oldPassword, password, !oldPasswordESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_AUTHENTICATION__PASSWORD, oldPassword,
+                    password, !oldPasswordESet ) );
     }
 
     /**
@@ -348,8 +353,9 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
         boolean oldPasswordESet = passwordESet;
         password = PASSWORD_EDEFAULT;
         passwordESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_AUTHENTICATION__PASSWORD, oldPassword, PASSWORD_EDEFAULT, oldPasswordESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_AUTHENTICATION__PASSWORD,
+                    oldPassword, PASSWORD_EDEFAULT, oldPasswordESet ) );
     }
 
     /**
@@ -378,13 +384,14 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public void setStrong(Boolean newStrong) {
+    public void setStrong( Boolean newStrong ) {
         Boolean oldStrong = strong;
         strong = newStrong;
         boolean oldStrongESet = strongESet;
         strongESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_AUTHENTICATION__STRONG, oldStrong, strong, !oldStrongESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_AUTHENTICATION__STRONG, oldStrong,
+                    strong, !oldStrongESet ) );
     }
 
     /**
@@ -398,8 +405,9 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
         boolean oldStrongESet = strongESet;
         strong = STRONG_EDEFAULT;
         strongESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_AUTHENTICATION__STRONG, oldStrong, STRONG_EDEFAULT, oldStrongESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_AUTHENTICATION__STRONG, oldStrong,
+                    STRONG_EDEFAULT, oldStrongESet ) );
     }
 
     /**
@@ -428,13 +436,14 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public void setWeak(Boolean newWeak) {
+    public void setWeak( Boolean newWeak ) {
         Boolean oldWeak = weak;
         weak = newWeak;
         boolean oldWeakESet = weakESet;
         weakESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_AUTHENTICATION__WEAK, oldWeak, weak, !oldWeakESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_AUTHENTICATION__WEAK, oldWeak, weak,
+                    !oldWeakESet ) );
     }
 
     /**
@@ -448,8 +457,9 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
         boolean oldWeakESet = weakESet;
         weak = WEAK_EDEFAULT;
         weakESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_AUTHENTICATION__WEAK, oldWeak, WEAK_EDEFAULT, oldWeakESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_AUTHENTICATION__WEAK, oldWeak,
+                    WEAK_EDEFAULT, oldWeakESet ) );
     }
 
     /**
@@ -468,20 +478,20 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.AG_AUTHENTICATION__CERTIFICATE:
-                return getCertificate();
-            case SclPackage.AG_AUTHENTICATION__NONE:
-                return getNone();
-            case SclPackage.AG_AUTHENTICATION__PASSWORD:
-                return getPassword();
-            case SclPackage.AG_AUTHENTICATION__STRONG:
-                return getStrong();
-            case SclPackage.AG_AUTHENTICATION__WEAK:
-                return getWeak();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.AG_AUTHENTICATION__CERTIFICATE:
+            return getCertificate();
+        case SclPackage.AG_AUTHENTICATION__NONE:
+            return getNone();
+        case SclPackage.AG_AUTHENTICATION__PASSWORD:
+            return getPassword();
+        case SclPackage.AG_AUTHENTICATION__STRONG:
+            return getStrong();
+        case SclPackage.AG_AUTHENTICATION__WEAK:
+            return getWeak();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -490,25 +500,25 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.AG_AUTHENTICATION__CERTIFICATE:
-                setCertificate((Boolean)newValue);
-                return;
-            case SclPackage.AG_AUTHENTICATION__NONE:
-                setNone((Boolean)newValue);
-                return;
-            case SclPackage.AG_AUTHENTICATION__PASSWORD:
-                setPassword((Boolean)newValue);
-                return;
-            case SclPackage.AG_AUTHENTICATION__STRONG:
-                setStrong((Boolean)newValue);
-                return;
-            case SclPackage.AG_AUTHENTICATION__WEAK:
-                setWeak((Boolean)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.AG_AUTHENTICATION__CERTIFICATE:
+            setCertificate( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_AUTHENTICATION__NONE:
+            setNone( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_AUTHENTICATION__PASSWORD:
+            setPassword( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_AUTHENTICATION__STRONG:
+            setStrong( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_AUTHENTICATION__WEAK:
+            setWeak( ( Boolean ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -517,25 +527,25 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_AUTHENTICATION__CERTIFICATE:
-                unsetCertificate();
-                return;
-            case SclPackage.AG_AUTHENTICATION__NONE:
-                unsetNone();
-                return;
-            case SclPackage.AG_AUTHENTICATION__PASSWORD:
-                unsetPassword();
-                return;
-            case SclPackage.AG_AUTHENTICATION__STRONG:
-                unsetStrong();
-                return;
-            case SclPackage.AG_AUTHENTICATION__WEAK:
-                unsetWeak();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_AUTHENTICATION__CERTIFICATE:
+            unsetCertificate();
+            return;
+        case SclPackage.AG_AUTHENTICATION__NONE:
+            unsetNone();
+            return;
+        case SclPackage.AG_AUTHENTICATION__PASSWORD:
+            unsetPassword();
+            return;
+        case SclPackage.AG_AUTHENTICATION__STRONG:
+            unsetStrong();
+            return;
+        case SclPackage.AG_AUTHENTICATION__WEAK:
+            unsetWeak();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -544,20 +554,20 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_AUTHENTICATION__CERTIFICATE:
-                return isSetCertificate();
-            case SclPackage.AG_AUTHENTICATION__NONE:
-                return isSetNone();
-            case SclPackage.AG_AUTHENTICATION__PASSWORD:
-                return isSetPassword();
-            case SclPackage.AG_AUTHENTICATION__STRONG:
-                return isSetStrong();
-            case SclPackage.AG_AUTHENTICATION__WEAK:
-                return isSetWeak();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_AUTHENTICATION__CERTIFICATE:
+            return isSetCertificate();
+        case SclPackage.AG_AUTHENTICATION__NONE:
+            return isSetNone();
+        case SclPackage.AG_AUTHENTICATION__PASSWORD:
+            return isSetPassword();
+        case SclPackage.AG_AUTHENTICATION__STRONG:
+            return isSetStrong();
+        case SclPackage.AG_AUTHENTICATION__WEAK:
+            return isSetWeak();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -567,20 +577,35 @@ public class AgAuthenticationImpl extends MinimalEObjectImpl.Container implement
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (certificate: ");
-        if (certificateESet) result.append(certificate); else result.append("<unset>");
-        result.append(", none: ");
-        if (noneESet) result.append(none); else result.append("<unset>");
-        result.append(", password: ");
-        if (passwordESet) result.append(password); else result.append("<unset>");
-        result.append(", strong: ");
-        if (strongESet) result.append(strong); else result.append("<unset>");
-        result.append(", weak: ");
-        if (weakESet) result.append(weak); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (certificate: " );
+        if( certificateESet )
+            result.append( certificate );
+        else
+            result.append( "<unset>" );
+        result.append( ", none: " );
+        if( noneESet )
+            result.append( none );
+        else
+            result.append( "<unset>" );
+        result.append( ", password: " );
+        if( passwordESet )
+            result.append( password );
+        else
+            result.append( "<unset>" );
+        result.append( ", strong: " );
+        if( strongESet )
+            result.append( strong );
+        else
+            result.append( "<unset>" );
+        result.append( ", weak: " );
+        if( weakESet )
+            result.append( weak );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgDATrgOpImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgDATrgOpImpl.java
index f9aa588..44ad45c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgDATrgOpImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgDATrgOpImpl.java
@@ -168,13 +168,14 @@ public abstract class AgDATrgOpImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void setDchg(Boolean newDchg) {
+    public void setDchg( Boolean newDchg ) {
         Boolean oldDchg = dchg;
         dchg = newDchg;
         boolean oldDchgESet = dchgESet;
         dchgESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_DA_TRG_OP__DCHG, oldDchg, dchg, !oldDchgESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_DA_TRG_OP__DCHG, oldDchg, dchg,
+                    !oldDchgESet ) );
     }
 
     /**
@@ -188,8 +189,9 @@ public abstract class AgDATrgOpImpl extends MinimalEObjectImpl.Container impleme
         boolean oldDchgESet = dchgESet;
         dchg = DCHG_EDEFAULT;
         dchgESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_DA_TRG_OP__DCHG, oldDchg, DCHG_EDEFAULT, oldDchgESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_DA_TRG_OP__DCHG, oldDchg,
+                    DCHG_EDEFAULT, oldDchgESet ) );
     }
 
     /**
@@ -218,13 +220,14 @@ public abstract class AgDATrgOpImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void setDupd(Boolean newDupd) {
+    public void setDupd( Boolean newDupd ) {
         Boolean oldDupd = dupd;
         dupd = newDupd;
         boolean oldDupdESet = dupdESet;
         dupdESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_DA_TRG_OP__DUPD, oldDupd, dupd, !oldDupdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_DA_TRG_OP__DUPD, oldDupd, dupd,
+                    !oldDupdESet ) );
     }
 
     /**
@@ -238,8 +241,9 @@ public abstract class AgDATrgOpImpl extends MinimalEObjectImpl.Container impleme
         boolean oldDupdESet = dupdESet;
         dupd = DUPD_EDEFAULT;
         dupdESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_DA_TRG_OP__DUPD, oldDupd, DUPD_EDEFAULT, oldDupdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_DA_TRG_OP__DUPD, oldDupd,
+                    DUPD_EDEFAULT, oldDupdESet ) );
     }
 
     /**
@@ -268,13 +272,14 @@ public abstract class AgDATrgOpImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void setQchg(Boolean newQchg) {
+    public void setQchg( Boolean newQchg ) {
         Boolean oldQchg = qchg;
         qchg = newQchg;
         boolean oldQchgESet = qchgESet;
         qchgESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_DA_TRG_OP__QCHG, oldQchg, qchg, !oldQchgESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_DA_TRG_OP__QCHG, oldQchg, qchg,
+                    !oldQchgESet ) );
     }
 
     /**
@@ -288,8 +293,9 @@ public abstract class AgDATrgOpImpl extends MinimalEObjectImpl.Container impleme
         boolean oldQchgESet = qchgESet;
         qchg = QCHG_EDEFAULT;
         qchgESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_DA_TRG_OP__QCHG, oldQchg, QCHG_EDEFAULT, oldQchgESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_DA_TRG_OP__QCHG, oldQchg,
+                    QCHG_EDEFAULT, oldQchgESet ) );
     }
 
     /**
@@ -308,16 +314,16 @@ public abstract class AgDATrgOpImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.AG_DA_TRG_OP__DCHG:
-                return getDchg();
-            case SclPackage.AG_DA_TRG_OP__DUPD:
-                return getDupd();
-            case SclPackage.AG_DA_TRG_OP__QCHG:
-                return getQchg();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.AG_DA_TRG_OP__DCHG:
+            return getDchg();
+        case SclPackage.AG_DA_TRG_OP__DUPD:
+            return getDupd();
+        case SclPackage.AG_DA_TRG_OP__QCHG:
+            return getQchg();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -326,19 +332,19 @@ public abstract class AgDATrgOpImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.AG_DA_TRG_OP__DCHG:
-                setDchg((Boolean)newValue);
-                return;
-            case SclPackage.AG_DA_TRG_OP__DUPD:
-                setDupd((Boolean)newValue);
-                return;
-            case SclPackage.AG_DA_TRG_OP__QCHG:
-                setQchg((Boolean)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.AG_DA_TRG_OP__DCHG:
+            setDchg( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_DA_TRG_OP__DUPD:
+            setDupd( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_DA_TRG_OP__QCHG:
+            setQchg( ( Boolean ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -347,19 +353,19 @@ public abstract class AgDATrgOpImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_DA_TRG_OP__DCHG:
-                unsetDchg();
-                return;
-            case SclPackage.AG_DA_TRG_OP__DUPD:
-                unsetDupd();
-                return;
-            case SclPackage.AG_DA_TRG_OP__QCHG:
-                unsetQchg();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_DA_TRG_OP__DCHG:
+            unsetDchg();
+            return;
+        case SclPackage.AG_DA_TRG_OP__DUPD:
+            unsetDupd();
+            return;
+        case SclPackage.AG_DA_TRG_OP__QCHG:
+            unsetQchg();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -368,16 +374,16 @@ public abstract class AgDATrgOpImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_DA_TRG_OP__DCHG:
-                return isSetDchg();
-            case SclPackage.AG_DA_TRG_OP__DUPD:
-                return isSetDupd();
-            case SclPackage.AG_DA_TRG_OP__QCHG:
-                return isSetQchg();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_DA_TRG_OP__DCHG:
+            return isSetDchg();
+        case SclPackage.AG_DA_TRG_OP__DUPD:
+            return isSetDupd();
+        case SclPackage.AG_DA_TRG_OP__QCHG:
+            return isSetQchg();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -387,16 +393,25 @@ public abstract class AgDATrgOpImpl extends MinimalEObjectImpl.Container impleme
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (dchg: ");
-        if (dchgESet) result.append(dchg); else result.append("<unset>");
-        result.append(", dupd: ");
-        if (dupdESet) result.append(dupd); else result.append("<unset>");
-        result.append(", qchg: ");
-        if (qchgESet) result.append(qchg); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (dchg: " );
+        if( dchgESet )
+            result.append( dchg );
+        else
+            result.append( "<unset>" );
+        result.append( ", dupd: " );
+        if( dupdESet )
+            result.append( dupd );
+        else
+            result.append( "<unset>" );
+        result.append( ", qchg: " );
+        if( qchgESet )
+            result.append( qchg );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgDescImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgDescImpl.java
index fded10d..3bd88a9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgDescImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgDescImpl.java
@@ -108,13 +108,14 @@ public abstract class AgDescImpl extends MinimalEObjectImpl.Container implements
      * @generated
      */
     @Override
-    public void setDesc(String newDesc) {
+    public void setDesc( String newDesc ) {
         String oldDesc = desc;
         desc = newDesc;
         boolean oldDescESet = descESet;
         descESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_DESC__DESC, oldDesc, desc, !oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_DESC__DESC, oldDesc, desc,
+                    !oldDescESet ) );
     }
 
     /**
@@ -128,8 +129,9 @@ public abstract class AgDescImpl extends MinimalEObjectImpl.Container implements
         boolean oldDescESet = descESet;
         desc = DESC_EDEFAULT;
         descESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_DESC__DESC, oldDesc, DESC_EDEFAULT, oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_DESC__DESC, oldDesc, DESC_EDEFAULT,
+                    oldDescESet ) );
     }
 
     /**
@@ -148,12 +150,12 @@ public abstract class AgDescImpl extends MinimalEObjectImpl.Container implements
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.AG_DESC__DESC:
-                return getDesc();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.AG_DESC__DESC:
+            return getDesc();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -162,13 +164,13 @@ public abstract class AgDescImpl extends MinimalEObjectImpl.Container implements
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.AG_DESC__DESC:
-                setDesc((String)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.AG_DESC__DESC:
+            setDesc( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -177,13 +179,13 @@ public abstract class AgDescImpl extends MinimalEObjectImpl.Container implements
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_DESC__DESC:
-                unsetDesc();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_DESC__DESC:
+            unsetDesc();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -192,12 +194,12 @@ public abstract class AgDescImpl extends MinimalEObjectImpl.Container implements
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_DESC__DESC:
-                return isSetDesc();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_DESC__DESC:
+            return isSetDesc();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -207,12 +209,15 @@ public abstract class AgDescImpl extends MinimalEObjectImpl.Container implements
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (desc: ");
-        if (descESet) result.append(desc); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (desc: " );
+        if( descESet )
+            result.append( desc );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgLDRefImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgLDRefImpl.java
index 5d6be23..ac9c382 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgLDRefImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgLDRefImpl.java
@@ -137,13 +137,14 @@ public abstract class AgLDRefImpl extends AgDescImpl implements AgLDRef {
      * @generated
      */
     @Override
-    public void setIedName(String newIedName) {
+    public void setIedName( String newIedName ) {
         String oldIedName = iedName;
         iedName = newIedName;
         boolean oldIedNameESet = iedNameESet;
         iedNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_LD_REF__IED_NAME, oldIedName, iedName, !oldIedNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_LD_REF__IED_NAME, oldIedName, iedName,
+                    !oldIedNameESet ) );
     }
 
     /**
@@ -157,8 +158,9 @@ public abstract class AgLDRefImpl extends AgDescImpl implements AgLDRef {
         boolean oldIedNameESet = iedNameESet;
         iedName = IED_NAME_EDEFAULT;
         iedNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_LD_REF__IED_NAME, oldIedName, IED_NAME_EDEFAULT, oldIedNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_LD_REF__IED_NAME, oldIedName,
+                    IED_NAME_EDEFAULT, oldIedNameESet ) );
     }
 
     /**
@@ -187,13 +189,14 @@ public abstract class AgLDRefImpl extends AgDescImpl implements AgLDRef {
      * @generated
      */
     @Override
-    public void setLdInst(String newLdInst) {
+    public void setLdInst( String newLdInst ) {
         String oldLdInst = ldInst;
         ldInst = newLdInst;
         boolean oldLdInstESet = ldInstESet;
         ldInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_LD_REF__LD_INST, oldLdInst, ldInst, !oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_LD_REF__LD_INST, oldLdInst, ldInst,
+                    !oldLdInstESet ) );
     }
 
     /**
@@ -207,8 +210,9 @@ public abstract class AgLDRefImpl extends AgDescImpl implements AgLDRef {
         boolean oldLdInstESet = ldInstESet;
         ldInst = LD_INST_EDEFAULT;
         ldInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_LD_REF__LD_INST, oldLdInst, LD_INST_EDEFAULT, oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_LD_REF__LD_INST, oldLdInst,
+                    LD_INST_EDEFAULT, oldLdInstESet ) );
     }
 
     /**
@@ -227,14 +231,14 @@ public abstract class AgLDRefImpl extends AgDescImpl implements AgLDRef {
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.AG_LD_REF__IED_NAME:
-                return getIedName();
-            case SclPackage.AG_LD_REF__LD_INST:
-                return getLdInst();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.AG_LD_REF__IED_NAME:
+            return getIedName();
+        case SclPackage.AG_LD_REF__LD_INST:
+            return getLdInst();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -243,16 +247,16 @@ public abstract class AgLDRefImpl extends AgDescImpl implements AgLDRef {
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.AG_LD_REF__IED_NAME:
-                setIedName((String)newValue);
-                return;
-            case SclPackage.AG_LD_REF__LD_INST:
-                setLdInst((String)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.AG_LD_REF__IED_NAME:
+            setIedName( ( String ) newValue );
+            return;
+        case SclPackage.AG_LD_REF__LD_INST:
+            setLdInst( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -261,16 +265,16 @@ public abstract class AgLDRefImpl extends AgDescImpl implements AgLDRef {
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_LD_REF__IED_NAME:
-                unsetIedName();
-                return;
-            case SclPackage.AG_LD_REF__LD_INST:
-                unsetLdInst();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_LD_REF__IED_NAME:
+            unsetIedName();
+            return;
+        case SclPackage.AG_LD_REF__LD_INST:
+            unsetLdInst();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -279,14 +283,14 @@ public abstract class AgLDRefImpl extends AgDescImpl implements AgLDRef {
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_LD_REF__IED_NAME:
-                return isSetIedName();
-            case SclPackage.AG_LD_REF__LD_INST:
-                return isSetLdInst();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_LD_REF__IED_NAME:
+            return isSetIedName();
+        case SclPackage.AG_LD_REF__LD_INST:
+            return isSetLdInst();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -296,14 +300,20 @@ public abstract class AgLDRefImpl extends AgDescImpl implements AgLDRef {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (iedName: ");
-        if (iedNameESet) result.append(iedName); else result.append("<unset>");
-        result.append(", ldInst: ");
-        if (ldInstESet) result.append(ldInst); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (iedName: " );
+        if( iedNameESet )
+            result.append( iedName );
+        else
+            result.append( "<unset>" );
+        result.append( ", ldInst: " );
+        if( ldInstESet )
+            result.append( ldInst );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgLNRefImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgLNRefImpl.java
index 48bbdc4..a369316 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgLNRefImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgLNRefImpl.java
@@ -167,13 +167,14 @@ public class AgLNRefImpl extends AgLDRefImpl implements AgLNRef {
      * @generated
      */
     @Override
-    public void setLnClass(String newLnClass) {
+    public void setLnClass( String newLnClass ) {
         String oldLnClass = lnClass;
         lnClass = newLnClass;
         boolean oldLnClassESet = lnClassESet;
         lnClassESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_LN_REF__LN_CLASS, oldLnClass, lnClass, !oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_LN_REF__LN_CLASS, oldLnClass, lnClass,
+                    !oldLnClassESet ) );
     }
 
     /**
@@ -187,8 +188,9 @@ public class AgLNRefImpl extends AgLDRefImpl implements AgLNRef {
         boolean oldLnClassESet = lnClassESet;
         lnClass = LN_CLASS_EDEFAULT;
         lnClassESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_LN_REF__LN_CLASS, oldLnClass, LN_CLASS_EDEFAULT, oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_LN_REF__LN_CLASS, oldLnClass,
+                    LN_CLASS_EDEFAULT, oldLnClassESet ) );
     }
 
     /**
@@ -217,13 +219,14 @@ public class AgLNRefImpl extends AgLDRefImpl implements AgLNRef {
      * @generated
      */
     @Override
-    public void setLnInst(String newLnInst) {
+    public void setLnInst( String newLnInst ) {
         String oldLnInst = lnInst;
         lnInst = newLnInst;
         boolean oldLnInstESet = lnInstESet;
         lnInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_LN_REF__LN_INST, oldLnInst, lnInst, !oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_LN_REF__LN_INST, oldLnInst, lnInst,
+                    !oldLnInstESet ) );
     }
 
     /**
@@ -237,8 +240,9 @@ public class AgLNRefImpl extends AgLDRefImpl implements AgLNRef {
         boolean oldLnInstESet = lnInstESet;
         lnInst = LN_INST_EDEFAULT;
         lnInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_LN_REF__LN_INST, oldLnInst, LN_INST_EDEFAULT, oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_LN_REF__LN_INST, oldLnInst,
+                    LN_INST_EDEFAULT, oldLnInstESet ) );
     }
 
     /**
@@ -267,13 +271,14 @@ public class AgLNRefImpl extends AgLDRefImpl implements AgLNRef {
      * @generated
      */
     @Override
-    public void setPrefix(String newPrefix) {
+    public void setPrefix( String newPrefix ) {
         String oldPrefix = prefix;
         prefix = newPrefix;
         boolean oldPrefixESet = prefixESet;
         prefixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_LN_REF__PREFIX, oldPrefix, prefix, !oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_LN_REF__PREFIX, oldPrefix, prefix,
+                    !oldPrefixESet ) );
     }
 
     /**
@@ -287,8 +292,9 @@ public class AgLNRefImpl extends AgLDRefImpl implements AgLNRef {
         boolean oldPrefixESet = prefixESet;
         prefix = PREFIX_EDEFAULT;
         prefixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_LN_REF__PREFIX, oldPrefix, PREFIX_EDEFAULT, oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_LN_REF__PREFIX, oldPrefix,
+                    PREFIX_EDEFAULT, oldPrefixESet ) );
     }
 
     /**
@@ -307,16 +313,16 @@ public class AgLNRefImpl extends AgLDRefImpl implements AgLNRef {
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.AG_LN_REF__LN_CLASS:
-                return getLnClass();
-            case SclPackage.AG_LN_REF__LN_INST:
-                return getLnInst();
-            case SclPackage.AG_LN_REF__PREFIX:
-                return getPrefix();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.AG_LN_REF__LN_CLASS:
+            return getLnClass();
+        case SclPackage.AG_LN_REF__LN_INST:
+            return getLnInst();
+        case SclPackage.AG_LN_REF__PREFIX:
+            return getPrefix();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -325,19 +331,19 @@ public class AgLNRefImpl extends AgLDRefImpl implements AgLNRef {
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.AG_LN_REF__LN_CLASS:
-                setLnClass((String)newValue);
-                return;
-            case SclPackage.AG_LN_REF__LN_INST:
-                setLnInst((String)newValue);
-                return;
-            case SclPackage.AG_LN_REF__PREFIX:
-                setPrefix((String)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.AG_LN_REF__LN_CLASS:
+            setLnClass( ( String ) newValue );
+            return;
+        case SclPackage.AG_LN_REF__LN_INST:
+            setLnInst( ( String ) newValue );
+            return;
+        case SclPackage.AG_LN_REF__PREFIX:
+            setPrefix( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -346,19 +352,19 @@ public class AgLNRefImpl extends AgLDRefImpl implements AgLNRef {
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_LN_REF__LN_CLASS:
-                unsetLnClass();
-                return;
-            case SclPackage.AG_LN_REF__LN_INST:
-                unsetLnInst();
-                return;
-            case SclPackage.AG_LN_REF__PREFIX:
-                unsetPrefix();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_LN_REF__LN_CLASS:
+            unsetLnClass();
+            return;
+        case SclPackage.AG_LN_REF__LN_INST:
+            unsetLnInst();
+            return;
+        case SclPackage.AG_LN_REF__PREFIX:
+            unsetPrefix();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -367,16 +373,16 @@ public class AgLNRefImpl extends AgLDRefImpl implements AgLNRef {
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_LN_REF__LN_CLASS:
-                return isSetLnClass();
-            case SclPackage.AG_LN_REF__LN_INST:
-                return isSetLnInst();
-            case SclPackage.AG_LN_REF__PREFIX:
-                return isSetPrefix();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_LN_REF__LN_CLASS:
+            return isSetLnClass();
+        case SclPackage.AG_LN_REF__LN_INST:
+            return isSetLnInst();
+        case SclPackage.AG_LN_REF__PREFIX:
+            return isSetPrefix();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -386,16 +392,25 @@ public class AgLNRefImpl extends AgLDRefImpl implements AgLNRef {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (lnClass: ");
-        if (lnClassESet) result.append(lnClass); else result.append("<unset>");
-        result.append(", lnInst: ");
-        if (lnInstESet) result.append(lnInst); else result.append("<unset>");
-        result.append(", prefix: ");
-        if (prefixESet) result.append(prefix); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (lnClass: " );
+        if( lnClassESet )
+            result.append( lnClass );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnInst: " );
+        if( lnInstESet )
+            result.append( lnInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", prefix: " );
+        if( prefixESet )
+            result.append( prefix );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgOptFieldsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgOptFieldsImpl.java
index 0bd9648..6d92560 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgOptFieldsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgOptFieldsImpl.java
@@ -348,13 +348,14 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
      * @generated
      */
     @Override
-    public void setBufOvfl(Boolean newBufOvfl) {
+    public void setBufOvfl( Boolean newBufOvfl ) {
         Boolean oldBufOvfl = bufOvfl;
         bufOvfl = newBufOvfl;
         boolean oldBufOvflESet = bufOvflESet;
         bufOvflESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_OPT_FIELDS__BUF_OVFL, oldBufOvfl, bufOvfl, !oldBufOvflESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_OPT_FIELDS__BUF_OVFL, oldBufOvfl,
+                    bufOvfl, !oldBufOvflESet ) );
     }
 
     /**
@@ -368,8 +369,9 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
         boolean oldBufOvflESet = bufOvflESet;
         bufOvfl = BUF_OVFL_EDEFAULT;
         bufOvflESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__BUF_OVFL, oldBufOvfl, BUF_OVFL_EDEFAULT, oldBufOvflESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__BUF_OVFL, oldBufOvfl,
+                    BUF_OVFL_EDEFAULT, oldBufOvflESet ) );
     }
 
     /**
@@ -398,13 +400,14 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
      * @generated
      */
     @Override
-    public void setConfigRef(Boolean newConfigRef) {
+    public void setConfigRef( Boolean newConfigRef ) {
         Boolean oldConfigRef = configRef;
         configRef = newConfigRef;
         boolean oldConfigRefESet = configRefESet;
         configRefESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_OPT_FIELDS__CONFIG_REF, oldConfigRef, configRef, !oldConfigRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_OPT_FIELDS__CONFIG_REF, oldConfigRef,
+                    configRef, !oldConfigRefESet ) );
     }
 
     /**
@@ -418,8 +421,9 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
         boolean oldConfigRefESet = configRefESet;
         configRef = CONFIG_REF_EDEFAULT;
         configRefESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__CONFIG_REF, oldConfigRef, CONFIG_REF_EDEFAULT, oldConfigRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__CONFIG_REF,
+                    oldConfigRef, CONFIG_REF_EDEFAULT, oldConfigRefESet ) );
     }
 
     /**
@@ -448,13 +452,14 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
      * @generated
      */
     @Override
-    public void setDataRef(Boolean newDataRef) {
+    public void setDataRef( Boolean newDataRef ) {
         Boolean oldDataRef = dataRef;
         dataRef = newDataRef;
         boolean oldDataRefESet = dataRefESet;
         dataRefESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_OPT_FIELDS__DATA_REF, oldDataRef, dataRef, !oldDataRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_OPT_FIELDS__DATA_REF, oldDataRef,
+                    dataRef, !oldDataRefESet ) );
     }
 
     /**
@@ -468,8 +473,9 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
         boolean oldDataRefESet = dataRefESet;
         dataRef = DATA_REF_EDEFAULT;
         dataRefESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__DATA_REF, oldDataRef, DATA_REF_EDEFAULT, oldDataRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__DATA_REF, oldDataRef,
+                    DATA_REF_EDEFAULT, oldDataRefESet ) );
     }
 
     /**
@@ -498,13 +504,14 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
      * @generated
      */
     @Override
-    public void setDataSet(Boolean newDataSet) {
+    public void setDataSet( Boolean newDataSet ) {
         Boolean oldDataSet = dataSet;
         dataSet = newDataSet;
         boolean oldDataSetESet = dataSetESet;
         dataSetESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_OPT_FIELDS__DATA_SET, oldDataSet, dataSet, !oldDataSetESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_OPT_FIELDS__DATA_SET, oldDataSet,
+                    dataSet, !oldDataSetESet ) );
     }
 
     /**
@@ -518,8 +525,9 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
         boolean oldDataSetESet = dataSetESet;
         dataSet = DATA_SET_EDEFAULT;
         dataSetESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__DATA_SET, oldDataSet, DATA_SET_EDEFAULT, oldDataSetESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__DATA_SET, oldDataSet,
+                    DATA_SET_EDEFAULT, oldDataSetESet ) );
     }
 
     /**
@@ -548,13 +556,14 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
      * @generated
      */
     @Override
-    public void setEntryID(Boolean newEntryID) {
+    public void setEntryID( Boolean newEntryID ) {
         Boolean oldEntryID = entryID;
         entryID = newEntryID;
         boolean oldEntryIDESet = entryIDESet;
         entryIDESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_OPT_FIELDS__ENTRY_ID, oldEntryID, entryID, !oldEntryIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_OPT_FIELDS__ENTRY_ID, oldEntryID,
+                    entryID, !oldEntryIDESet ) );
     }
 
     /**
@@ -568,8 +577,9 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
         boolean oldEntryIDESet = entryIDESet;
         entryID = ENTRY_ID_EDEFAULT;
         entryIDESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__ENTRY_ID, oldEntryID, ENTRY_ID_EDEFAULT, oldEntryIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__ENTRY_ID, oldEntryID,
+                    ENTRY_ID_EDEFAULT, oldEntryIDESet ) );
     }
 
     /**
@@ -598,13 +608,14 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
      * @generated
      */
     @Override
-    public void setReasonCode(Boolean newReasonCode) {
+    public void setReasonCode( Boolean newReasonCode ) {
         Boolean oldReasonCode = reasonCode;
         reasonCode = newReasonCode;
         boolean oldReasonCodeESet = reasonCodeESet;
         reasonCodeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_OPT_FIELDS__REASON_CODE, oldReasonCode, reasonCode, !oldReasonCodeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_OPT_FIELDS__REASON_CODE,
+                    oldReasonCode, reasonCode, !oldReasonCodeESet ) );
     }
 
     /**
@@ -618,8 +629,9 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
         boolean oldReasonCodeESet = reasonCodeESet;
         reasonCode = REASON_CODE_EDEFAULT;
         reasonCodeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__REASON_CODE, oldReasonCode, REASON_CODE_EDEFAULT, oldReasonCodeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__REASON_CODE,
+                    oldReasonCode, REASON_CODE_EDEFAULT, oldReasonCodeESet ) );
     }
 
     /**
@@ -648,13 +660,14 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
      * @generated
      */
     @Override
-    public void setSeqNum(Boolean newSeqNum) {
+    public void setSeqNum( Boolean newSeqNum ) {
         Boolean oldSeqNum = seqNum;
         seqNum = newSeqNum;
         boolean oldSeqNumESet = seqNumESet;
         seqNumESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_OPT_FIELDS__SEQ_NUM, oldSeqNum, seqNum, !oldSeqNumESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_OPT_FIELDS__SEQ_NUM, oldSeqNum,
+                    seqNum, !oldSeqNumESet ) );
     }
 
     /**
@@ -668,8 +681,9 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
         boolean oldSeqNumESet = seqNumESet;
         seqNum = SEQ_NUM_EDEFAULT;
         seqNumESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__SEQ_NUM, oldSeqNum, SEQ_NUM_EDEFAULT, oldSeqNumESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__SEQ_NUM, oldSeqNum,
+                    SEQ_NUM_EDEFAULT, oldSeqNumESet ) );
     }
 
     /**
@@ -698,13 +712,14 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
      * @generated
      */
     @Override
-    public void setTimeStamp(Boolean newTimeStamp) {
+    public void setTimeStamp( Boolean newTimeStamp ) {
         Boolean oldTimeStamp = timeStamp;
         timeStamp = newTimeStamp;
         boolean oldTimeStampESet = timeStampESet;
         timeStampESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_OPT_FIELDS__TIME_STAMP, oldTimeStamp, timeStamp, !oldTimeStampESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_OPT_FIELDS__TIME_STAMP, oldTimeStamp,
+                    timeStamp, !oldTimeStampESet ) );
     }
 
     /**
@@ -718,8 +733,9 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
         boolean oldTimeStampESet = timeStampESet;
         timeStamp = TIME_STAMP_EDEFAULT;
         timeStampESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__TIME_STAMP, oldTimeStamp, TIME_STAMP_EDEFAULT, oldTimeStampESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__TIME_STAMP,
+                    oldTimeStamp, TIME_STAMP_EDEFAULT, oldTimeStampESet ) );
     }
 
     /**
@@ -748,13 +764,14 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
      * @generated
      */
     @Override
-    public void setSegmentation(Boolean newSegmentation) {
+    public void setSegmentation( Boolean newSegmentation ) {
         Boolean oldSegmentation = segmentation;
         segmentation = newSegmentation;
         boolean oldSegmentationESet = segmentationESet;
         segmentationESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_OPT_FIELDS__SEGMENTATION, oldSegmentation, segmentation, !oldSegmentationESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_OPT_FIELDS__SEGMENTATION,
+                    oldSegmentation, segmentation, !oldSegmentationESet ) );
     }
 
     /**
@@ -768,8 +785,9 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
         boolean oldSegmentationESet = segmentationESet;
         segmentation = SEGMENTATION_EDEFAULT;
         segmentationESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__SEGMENTATION, oldSegmentation, SEGMENTATION_EDEFAULT, oldSegmentationESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_OPT_FIELDS__SEGMENTATION,
+                    oldSegmentation, SEGMENTATION_EDEFAULT, oldSegmentationESet ) );
     }
 
     /**
@@ -788,106 +806,106 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.AG_OPT_FIELDS__BUF_OVFL:
-                return getBufOvfl();
-            case SclPackage.AG_OPT_FIELDS__CONFIG_REF:
-                return getConfigRef();
-            case SclPackage.AG_OPT_FIELDS__DATA_REF:
-                return getDataRef();
-            case SclPackage.AG_OPT_FIELDS__DATA_SET:
-                return getDataSet();
-            case SclPackage.AG_OPT_FIELDS__ENTRY_ID:
-                return getEntryID();
-            case SclPackage.AG_OPT_FIELDS__REASON_CODE:
-                return getReasonCode();
-            case SclPackage.AG_OPT_FIELDS__SEQ_NUM:
-                return getSeqNum();
-            case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
-                return getTimeStamp();
-            case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
-                return getSegmentation();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.AG_OPT_FIELDS__BUF_OVFL:
+            return getBufOvfl();
+        case SclPackage.AG_OPT_FIELDS__CONFIG_REF:
+            return getConfigRef();
+        case SclPackage.AG_OPT_FIELDS__DATA_REF:
+            return getDataRef();
+        case SclPackage.AG_OPT_FIELDS__DATA_SET:
+            return getDataSet();
+        case SclPackage.AG_OPT_FIELDS__ENTRY_ID:
+            return getEntryID();
+        case SclPackage.AG_OPT_FIELDS__REASON_CODE:
+            return getReasonCode();
+        case SclPackage.AG_OPT_FIELDS__SEQ_NUM:
+            return getSeqNum();
+        case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
+            return getTimeStamp();
+        case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
+            return getSegmentation();
         }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.AG_OPT_FIELDS__BUF_OVFL:
-                setBufOvfl((Boolean)newValue);
-                return;
-            case SclPackage.AG_OPT_FIELDS__CONFIG_REF:
-                setConfigRef((Boolean)newValue);
-                return;
-            case SclPackage.AG_OPT_FIELDS__DATA_REF:
-                setDataRef((Boolean)newValue);
-                return;
-            case SclPackage.AG_OPT_FIELDS__DATA_SET:
-                setDataSet((Boolean)newValue);
-                return;
-            case SclPackage.AG_OPT_FIELDS__ENTRY_ID:
-                setEntryID((Boolean)newValue);
-                return;
-            case SclPackage.AG_OPT_FIELDS__REASON_CODE:
-                setReasonCode((Boolean)newValue);
-                return;
-            case SclPackage.AG_OPT_FIELDS__SEQ_NUM:
-                setSeqNum((Boolean)newValue);
-                return;
-            case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
-                setTimeStamp((Boolean)newValue);
-                return;
-            case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
-                setSegmentation((Boolean)newValue);
-                return;
+        return super.eGet( featureID, resolve, coreType );
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.AG_OPT_FIELDS__BUF_OVFL:
+            setBufOvfl( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_OPT_FIELDS__CONFIG_REF:
+            setConfigRef( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_OPT_FIELDS__DATA_REF:
+            setDataRef( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_OPT_FIELDS__DATA_SET:
+            setDataSet( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_OPT_FIELDS__ENTRY_ID:
+            setEntryID( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_OPT_FIELDS__REASON_CODE:
+            setReasonCode( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_OPT_FIELDS__SEQ_NUM:
+            setSeqNum( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
+            setTimeStamp( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
+            setSegmentation( ( Boolean ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_OPT_FIELDS__BUF_OVFL:
-                unsetBufOvfl();
-                return;
-            case SclPackage.AG_OPT_FIELDS__CONFIG_REF:
-                unsetConfigRef();
-                return;
-            case SclPackage.AG_OPT_FIELDS__DATA_REF:
-                unsetDataRef();
-                return;
-            case SclPackage.AG_OPT_FIELDS__DATA_SET:
-                unsetDataSet();
-                return;
-            case SclPackage.AG_OPT_FIELDS__ENTRY_ID:
-                unsetEntryID();
-                return;
-            case SclPackage.AG_OPT_FIELDS__REASON_CODE:
-                unsetReasonCode();
-                return;
-            case SclPackage.AG_OPT_FIELDS__SEQ_NUM:
-                unsetSeqNum();
-                return;
-            case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
-                unsetTimeStamp();
-                return;
-            case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
-                unsetSegmentation();
-                return;
+        super.eSet( featureID, newValue );
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_OPT_FIELDS__BUF_OVFL:
+            unsetBufOvfl();
+            return;
+        case SclPackage.AG_OPT_FIELDS__CONFIG_REF:
+            unsetConfigRef();
+            return;
+        case SclPackage.AG_OPT_FIELDS__DATA_REF:
+            unsetDataRef();
+            return;
+        case SclPackage.AG_OPT_FIELDS__DATA_SET:
+            unsetDataSet();
+            return;
+        case SclPackage.AG_OPT_FIELDS__ENTRY_ID:
+            unsetEntryID();
+            return;
+        case SclPackage.AG_OPT_FIELDS__REASON_CODE:
+            unsetReasonCode();
+            return;
+        case SclPackage.AG_OPT_FIELDS__SEQ_NUM:
+            unsetSeqNum();
+            return;
+        case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
+            unsetTimeStamp();
+            return;
+        case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
+            unsetSegmentation();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -896,28 +914,28 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_OPT_FIELDS__BUF_OVFL:
-                return isSetBufOvfl();
-            case SclPackage.AG_OPT_FIELDS__CONFIG_REF:
-                return isSetConfigRef();
-            case SclPackage.AG_OPT_FIELDS__DATA_REF:
-                return isSetDataRef();
-            case SclPackage.AG_OPT_FIELDS__DATA_SET:
-                return isSetDataSet();
-            case SclPackage.AG_OPT_FIELDS__ENTRY_ID:
-                return isSetEntryID();
-            case SclPackage.AG_OPT_FIELDS__REASON_CODE:
-                return isSetReasonCode();
-            case SclPackage.AG_OPT_FIELDS__SEQ_NUM:
-                return isSetSeqNum();
-            case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
-                return isSetTimeStamp();
-            case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
-                return isSetSegmentation();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_OPT_FIELDS__BUF_OVFL:
+            return isSetBufOvfl();
+        case SclPackage.AG_OPT_FIELDS__CONFIG_REF:
+            return isSetConfigRef();
+        case SclPackage.AG_OPT_FIELDS__DATA_REF:
+            return isSetDataRef();
+        case SclPackage.AG_OPT_FIELDS__DATA_SET:
+            return isSetDataSet();
+        case SclPackage.AG_OPT_FIELDS__ENTRY_ID:
+            return isSetEntryID();
+        case SclPackage.AG_OPT_FIELDS__REASON_CODE:
+            return isSetReasonCode();
+        case SclPackage.AG_OPT_FIELDS__SEQ_NUM:
+            return isSetSeqNum();
+        case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
+            return isSetTimeStamp();
+        case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
+            return isSetSegmentation();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -927,28 +945,55 @@ public abstract class AgOptFieldsImpl extends MinimalEObjectImpl.Container imple
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (bufOvfl: ");
-        if (bufOvflESet) result.append(bufOvfl); else result.append("<unset>");
-        result.append(", configRef: ");
-        if (configRefESet) result.append(configRef); else result.append("<unset>");
-        result.append(", dataRef: ");
-        if (dataRefESet) result.append(dataRef); else result.append("<unset>");
-        result.append(", dataSet: ");
-        if (dataSetESet) result.append(dataSet); else result.append("<unset>");
-        result.append(", entryID: ");
-        if (entryIDESet) result.append(entryID); else result.append("<unset>");
-        result.append(", reasonCode: ");
-        if (reasonCodeESet) result.append(reasonCode); else result.append("<unset>");
-        result.append(", seqNum: ");
-        if (seqNumESet) result.append(seqNum); else result.append("<unset>");
-        result.append(", timeStamp: ");
-        if (timeStampESet) result.append(timeStamp); else result.append("<unset>");
-        result.append(", segmentation: ");
-        if (segmentationESet) result.append(segmentation); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (bufOvfl: " );
+        if( bufOvflESet )
+            result.append( bufOvfl );
+        else
+            result.append( "<unset>" );
+        result.append( ", configRef: " );
+        if( configRefESet )
+            result.append( configRef );
+        else
+            result.append( "<unset>" );
+        result.append( ", dataRef: " );
+        if( dataRefESet )
+            result.append( dataRef );
+        else
+            result.append( "<unset>" );
+        result.append( ", dataSet: " );
+        if( dataSetESet )
+            result.append( dataSet );
+        else
+            result.append( "<unset>" );
+        result.append( ", entryID: " );
+        if( entryIDESet )
+            result.append( entryID );
+        else
+            result.append( "<unset>" );
+        result.append( ", reasonCode: " );
+        if( reasonCodeESet )
+            result.append( reasonCode );
+        else
+            result.append( "<unset>" );
+        result.append( ", seqNum: " );
+        if( seqNumESet )
+            result.append( seqNum );
+        else
+            result.append( "<unset>" );
+        result.append( ", timeStamp: " );
+        if( timeStampESet )
+            result.append( timeStamp );
+        else
+            result.append( "<unset>" );
+        result.append( ", segmentation: " );
+        if( segmentationESet )
+            result.append( segmentation );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgSmvOptsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgSmvOptsImpl.java
index fb25380..57038c0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgSmvOptsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgSmvOptsImpl.java
@@ -318,13 +318,14 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void setDataSet(Boolean newDataSet) {
+    public void setDataSet( Boolean newDataSet ) {
         Boolean oldDataSet = dataSet;
         dataSet = newDataSet;
         boolean oldDataSetESet = dataSetESet;
         dataSetESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_SMV_OPTS__DATA_SET, oldDataSet, dataSet, !oldDataSetESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_SMV_OPTS__DATA_SET, oldDataSet,
+                    dataSet, !oldDataSetESet ) );
     }
 
     /**
@@ -338,8 +339,9 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
         boolean oldDataSetESet = dataSetESet;
         dataSet = DATA_SET_EDEFAULT;
         dataSetESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_SMV_OPTS__DATA_SET, oldDataSet, DATA_SET_EDEFAULT, oldDataSetESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_SMV_OPTS__DATA_SET, oldDataSet,
+                    DATA_SET_EDEFAULT, oldDataSetESet ) );
     }
 
     /**
@@ -368,13 +370,14 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void setRefreshTime(Boolean newRefreshTime) {
+    public void setRefreshTime( Boolean newRefreshTime ) {
         Boolean oldRefreshTime = refreshTime;
         refreshTime = newRefreshTime;
         boolean oldRefreshTimeESet = refreshTimeESet;
         refreshTimeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_SMV_OPTS__REFRESH_TIME, oldRefreshTime, refreshTime, !oldRefreshTimeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_SMV_OPTS__REFRESH_TIME,
+                    oldRefreshTime, refreshTime, !oldRefreshTimeESet ) );
     }
 
     /**
@@ -388,8 +391,9 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
         boolean oldRefreshTimeESet = refreshTimeESet;
         refreshTime = REFRESH_TIME_EDEFAULT;
         refreshTimeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_SMV_OPTS__REFRESH_TIME, oldRefreshTime, REFRESH_TIME_EDEFAULT, oldRefreshTimeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_SMV_OPTS__REFRESH_TIME,
+                    oldRefreshTime, REFRESH_TIME_EDEFAULT, oldRefreshTimeESet ) );
     }
 
     /**
@@ -418,13 +422,14 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void setSampleRate(Boolean newSampleRate) {
+    public void setSampleRate( Boolean newSampleRate ) {
         Boolean oldSampleRate = sampleRate;
         sampleRate = newSampleRate;
         boolean oldSampleRateESet = sampleRateESet;
         sampleRateESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_SMV_OPTS__SAMPLE_RATE, oldSampleRate, sampleRate, !oldSampleRateESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_SMV_OPTS__SAMPLE_RATE, oldSampleRate,
+                    sampleRate, !oldSampleRateESet ) );
     }
 
     /**
@@ -438,8 +443,9 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
         boolean oldSampleRateESet = sampleRateESet;
         sampleRate = SAMPLE_RATE_EDEFAULT;
         sampleRateESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_SMV_OPTS__SAMPLE_RATE, oldSampleRate, SAMPLE_RATE_EDEFAULT, oldSampleRateESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_SMV_OPTS__SAMPLE_RATE,
+                    oldSampleRate, SAMPLE_RATE_EDEFAULT, oldSampleRateESet ) );
     }
 
     /**
@@ -468,13 +474,14 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void setSampleSynchronized(Boolean newSampleSynchronized) {
+    public void setSampleSynchronized( Boolean newSampleSynchronized ) {
         Boolean oldSampleSynchronized = sampleSynchronized;
         sampleSynchronized = newSampleSynchronized;
         boolean oldSampleSynchronizedESet = sampleSynchronizedESet;
         sampleSynchronizedESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED, oldSampleSynchronized, sampleSynchronized, !oldSampleSynchronizedESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED,
+                    oldSampleSynchronized, sampleSynchronized, !oldSampleSynchronizedESet ) );
     }
 
     /**
@@ -488,8 +495,9 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
         boolean oldSampleSynchronizedESet = sampleSynchronizedESet;
         sampleSynchronized = SAMPLE_SYNCHRONIZED_EDEFAULT;
         sampleSynchronizedESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED, oldSampleSynchronized, SAMPLE_SYNCHRONIZED_EDEFAULT, oldSampleSynchronizedESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED,
+                    oldSampleSynchronized, SAMPLE_SYNCHRONIZED_EDEFAULT, oldSampleSynchronizedESet ) );
     }
 
     /**
@@ -518,13 +526,14 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void setSecurity(Boolean newSecurity) {
+    public void setSecurity( Boolean newSecurity ) {
         Boolean oldSecurity = security;
         security = newSecurity;
         boolean oldSecurityESet = securityESet;
         securityESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_SMV_OPTS__SECURITY, oldSecurity, security, !oldSecurityESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_SMV_OPTS__SECURITY, oldSecurity,
+                    security, !oldSecurityESet ) );
     }
 
     /**
@@ -538,8 +547,9 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
         boolean oldSecurityESet = securityESet;
         security = SECURITY_EDEFAULT;
         securityESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_SMV_OPTS__SECURITY, oldSecurity, SECURITY_EDEFAULT, oldSecurityESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_SMV_OPTS__SECURITY, oldSecurity,
+                    SECURITY_EDEFAULT, oldSecurityESet ) );
     }
 
     /**
@@ -568,13 +578,14 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void setTimestamp(Boolean newTimestamp) {
+    public void setTimestamp( Boolean newTimestamp ) {
         Boolean oldTimestamp = timestamp;
         timestamp = newTimestamp;
         boolean oldTimestampESet = timestampESet;
         timestampESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_SMV_OPTS__TIMESTAMP, oldTimestamp, timestamp, !oldTimestampESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_SMV_OPTS__TIMESTAMP, oldTimestamp,
+                    timestamp, !oldTimestampESet ) );
     }
 
     /**
@@ -588,8 +599,9 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
         boolean oldTimestampESet = timestampESet;
         timestamp = TIMESTAMP_EDEFAULT;
         timestampESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_SMV_OPTS__TIMESTAMP, oldTimestamp, TIMESTAMP_EDEFAULT, oldTimestampESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_SMV_OPTS__TIMESTAMP, oldTimestamp,
+                    TIMESTAMP_EDEFAULT, oldTimestampESet ) );
     }
 
     /**
@@ -618,13 +630,14 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void setSynchSourceId(Boolean newSynchSourceId) {
+    public void setSynchSourceId( Boolean newSynchSourceId ) {
         Boolean oldSynchSourceId = synchSourceId;
         synchSourceId = newSynchSourceId;
         boolean oldSynchSourceIdESet = synchSourceIdESet;
         synchSourceIdESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID, oldSynchSourceId, synchSourceId, !oldSynchSourceIdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID,
+                    oldSynchSourceId, synchSourceId, !oldSynchSourceIdESet ) );
     }
 
     /**
@@ -638,8 +651,9 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
         boolean oldSynchSourceIdESet = synchSourceIdESet;
         synchSourceId = SYNCH_SOURCE_ID_EDEFAULT;
         synchSourceIdESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID, oldSynchSourceId, SYNCH_SOURCE_ID_EDEFAULT, oldSynchSourceIdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID,
+                    oldSynchSourceId, SYNCH_SOURCE_ID_EDEFAULT, oldSynchSourceIdESet ) );
     }
 
     /**
@@ -668,13 +682,14 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void setDataRef(Boolean newDataRef) {
+    public void setDataRef( Boolean newDataRef ) {
         Boolean oldDataRef = dataRef;
         dataRef = newDataRef;
         boolean oldDataRefESet = dataRefESet;
         dataRefESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_SMV_OPTS__DATA_REF, oldDataRef, dataRef, !oldDataRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_SMV_OPTS__DATA_REF, oldDataRef,
+                    dataRef, !oldDataRefESet ) );
     }
 
     /**
@@ -688,8 +703,9 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
         boolean oldDataRefESet = dataRefESet;
         dataRef = DATA_REF_EDEFAULT;
         dataRefESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_SMV_OPTS__DATA_REF, oldDataRef, DATA_REF_EDEFAULT, oldDataRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_SMV_OPTS__DATA_REF, oldDataRef,
+                    DATA_REF_EDEFAULT, oldDataRefESet ) );
     }
 
     /**
@@ -708,26 +724,26 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.AG_SMV_OPTS__DATA_SET:
-                return getDataSet();
-            case SclPackage.AG_SMV_OPTS__REFRESH_TIME:
-                return getRefreshTime();
-            case SclPackage.AG_SMV_OPTS__SAMPLE_RATE:
-                return getSampleRate();
-            case SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED:
-                return getSampleSynchronized();
-            case SclPackage.AG_SMV_OPTS__SECURITY:
-                return getSecurity();
-            case SclPackage.AG_SMV_OPTS__TIMESTAMP:
-                return getTimestamp();
-            case SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID:
-                return getSynchSourceId();
-            case SclPackage.AG_SMV_OPTS__DATA_REF:
-                return getDataRef();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.AG_SMV_OPTS__DATA_SET:
+            return getDataSet();
+        case SclPackage.AG_SMV_OPTS__REFRESH_TIME:
+            return getRefreshTime();
+        case SclPackage.AG_SMV_OPTS__SAMPLE_RATE:
+            return getSampleRate();
+        case SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED:
+            return getSampleSynchronized();
+        case SclPackage.AG_SMV_OPTS__SECURITY:
+            return getSecurity();
+        case SclPackage.AG_SMV_OPTS__TIMESTAMP:
+            return getTimestamp();
+        case SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID:
+            return getSynchSourceId();
+        case SclPackage.AG_SMV_OPTS__DATA_REF:
+            return getDataRef();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -736,34 +752,34 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.AG_SMV_OPTS__DATA_SET:
-                setDataSet((Boolean)newValue);
-                return;
-            case SclPackage.AG_SMV_OPTS__REFRESH_TIME:
-                setRefreshTime((Boolean)newValue);
-                return;
-            case SclPackage.AG_SMV_OPTS__SAMPLE_RATE:
-                setSampleRate((Boolean)newValue);
-                return;
-            case SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED:
-                setSampleSynchronized((Boolean)newValue);
-                return;
-            case SclPackage.AG_SMV_OPTS__SECURITY:
-                setSecurity((Boolean)newValue);
-                return;
-            case SclPackage.AG_SMV_OPTS__TIMESTAMP:
-                setTimestamp((Boolean)newValue);
-                return;
-            case SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID:
-                setSynchSourceId((Boolean)newValue);
-                return;
-            case SclPackage.AG_SMV_OPTS__DATA_REF:
-                setDataRef((Boolean)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.AG_SMV_OPTS__DATA_SET:
+            setDataSet( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_SMV_OPTS__REFRESH_TIME:
+            setRefreshTime( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_SMV_OPTS__SAMPLE_RATE:
+            setSampleRate( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED:
+            setSampleSynchronized( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_SMV_OPTS__SECURITY:
+            setSecurity( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_SMV_OPTS__TIMESTAMP:
+            setTimestamp( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID:
+            setSynchSourceId( ( Boolean ) newValue );
+            return;
+        case SclPackage.AG_SMV_OPTS__DATA_REF:
+            setDataRef( ( Boolean ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -772,34 +788,34 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_SMV_OPTS__DATA_SET:
-                unsetDataSet();
-                return;
-            case SclPackage.AG_SMV_OPTS__REFRESH_TIME:
-                unsetRefreshTime();
-                return;
-            case SclPackage.AG_SMV_OPTS__SAMPLE_RATE:
-                unsetSampleRate();
-                return;
-            case SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED:
-                unsetSampleSynchronized();
-                return;
-            case SclPackage.AG_SMV_OPTS__SECURITY:
-                unsetSecurity();
-                return;
-            case SclPackage.AG_SMV_OPTS__TIMESTAMP:
-                unsetTimestamp();
-                return;
-            case SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID:
-                unsetSynchSourceId();
-                return;
-            case SclPackage.AG_SMV_OPTS__DATA_REF:
-                unsetDataRef();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_SMV_OPTS__DATA_SET:
+            unsetDataSet();
+            return;
+        case SclPackage.AG_SMV_OPTS__REFRESH_TIME:
+            unsetRefreshTime();
+            return;
+        case SclPackage.AG_SMV_OPTS__SAMPLE_RATE:
+            unsetSampleRate();
+            return;
+        case SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED:
+            unsetSampleSynchronized();
+            return;
+        case SclPackage.AG_SMV_OPTS__SECURITY:
+            unsetSecurity();
+            return;
+        case SclPackage.AG_SMV_OPTS__TIMESTAMP:
+            unsetTimestamp();
+            return;
+        case SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID:
+            unsetSynchSourceId();
+            return;
+        case SclPackage.AG_SMV_OPTS__DATA_REF:
+            unsetDataRef();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -808,26 +824,26 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_SMV_OPTS__DATA_SET:
-                return isSetDataSet();
-            case SclPackage.AG_SMV_OPTS__REFRESH_TIME:
-                return isSetRefreshTime();
-            case SclPackage.AG_SMV_OPTS__SAMPLE_RATE:
-                return isSetSampleRate();
-            case SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED:
-                return isSetSampleSynchronized();
-            case SclPackage.AG_SMV_OPTS__SECURITY:
-                return isSetSecurity();
-            case SclPackage.AG_SMV_OPTS__TIMESTAMP:
-                return isSetTimestamp();
-            case SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID:
-                return isSetSynchSourceId();
-            case SclPackage.AG_SMV_OPTS__DATA_REF:
-                return isSetDataRef();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_SMV_OPTS__DATA_SET:
+            return isSetDataSet();
+        case SclPackage.AG_SMV_OPTS__REFRESH_TIME:
+            return isSetRefreshTime();
+        case SclPackage.AG_SMV_OPTS__SAMPLE_RATE:
+            return isSetSampleRate();
+        case SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED:
+            return isSetSampleSynchronized();
+        case SclPackage.AG_SMV_OPTS__SECURITY:
+            return isSetSecurity();
+        case SclPackage.AG_SMV_OPTS__TIMESTAMP:
+            return isSetTimestamp();
+        case SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID:
+            return isSetSynchSourceId();
+        case SclPackage.AG_SMV_OPTS__DATA_REF:
+            return isSetDataRef();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -837,26 +853,50 @@ public abstract class AgSmvOptsImpl extends MinimalEObjectImpl.Container impleme
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (dataSet: ");
-        if (dataSetESet) result.append(dataSet); else result.append("<unset>");
-        result.append(", refreshTime: ");
-        if (refreshTimeESet) result.append(refreshTime); else result.append("<unset>");
-        result.append(", sampleRate: ");
-        if (sampleRateESet) result.append(sampleRate); else result.append("<unset>");
-        result.append(", sampleSynchronized: ");
-        if (sampleSynchronizedESet) result.append(sampleSynchronized); else result.append("<unset>");
-        result.append(", security: ");
-        if (securityESet) result.append(security); else result.append("<unset>");
-        result.append(", timestamp: ");
-        if (timestampESet) result.append(timestamp); else result.append("<unset>");
-        result.append(", synchSourceId: ");
-        if (synchSourceIdESet) result.append(synchSourceId); else result.append("<unset>");
-        result.append(", dataRef: ");
-        if (dataRefESet) result.append(dataRef); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (dataSet: " );
+        if( dataSetESet )
+            result.append( dataSet );
+        else
+            result.append( "<unset>" );
+        result.append( ", refreshTime: " );
+        if( refreshTimeESet )
+            result.append( refreshTime );
+        else
+            result.append( "<unset>" );
+        result.append( ", sampleRate: " );
+        if( sampleRateESet )
+            result.append( sampleRate );
+        else
+            result.append( "<unset>" );
+        result.append( ", sampleSynchronized: " );
+        if( sampleSynchronizedESet )
+            result.append( sampleSynchronized );
+        else
+            result.append( "<unset>" );
+        result.append( ", security: " );
+        if( securityESet )
+            result.append( security );
+        else
+            result.append( "<unset>" );
+        result.append( ", timestamp: " );
+        if( timestampESet )
+            result.append( timestamp );
+        else
+            result.append( "<unset>" );
+        result.append( ", synchSourceId: " );
+        if( synchSourceIdESet )
+            result.append( synchSourceId );
+        else
+            result.append( "<unset>" );
+        result.append( ", dataRef: " );
+        if( dataRefESet )
+            result.append( dataRef );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgVirtualImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgVirtualImpl.java
index 65c7ec6..fec6a6b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgVirtualImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AgVirtualImpl.java
@@ -108,13 +108,14 @@ public abstract class AgVirtualImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void setVirtual(Boolean newVirtual) {
+    public void setVirtual( Boolean newVirtual ) {
         Boolean oldVirtual = virtual;
         virtual = newVirtual;
         boolean oldVirtualESet = virtualESet;
         virtualESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AG_VIRTUAL__VIRTUAL, oldVirtual, virtual, !oldVirtualESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AG_VIRTUAL__VIRTUAL, oldVirtual, virtual,
+                    !oldVirtualESet ) );
     }
 
     /**
@@ -128,8 +129,9 @@ public abstract class AgVirtualImpl extends MinimalEObjectImpl.Container impleme
         boolean oldVirtualESet = virtualESet;
         virtual = VIRTUAL_EDEFAULT;
         virtualESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AG_VIRTUAL__VIRTUAL, oldVirtual, VIRTUAL_EDEFAULT, oldVirtualESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AG_VIRTUAL__VIRTUAL, oldVirtual,
+                    VIRTUAL_EDEFAULT, oldVirtualESet ) );
     }
 
     /**
@@ -148,12 +150,12 @@ public abstract class AgVirtualImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.AG_VIRTUAL__VIRTUAL:
-                return getVirtual();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.AG_VIRTUAL__VIRTUAL:
+            return getVirtual();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -162,13 +164,13 @@ public abstract class AgVirtualImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.AG_VIRTUAL__VIRTUAL:
-                setVirtual((Boolean)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.AG_VIRTUAL__VIRTUAL:
+            setVirtual( ( Boolean ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -177,13 +179,13 @@ public abstract class AgVirtualImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_VIRTUAL__VIRTUAL:
-                unsetVirtual();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_VIRTUAL__VIRTUAL:
+            unsetVirtual();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -192,12 +194,12 @@ public abstract class AgVirtualImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.AG_VIRTUAL__VIRTUAL:
-                return isSetVirtual();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.AG_VIRTUAL__VIRTUAL:
+            return isSetVirtual();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -207,12 +209,15 @@ public abstract class AgVirtualImpl extends MinimalEObjectImpl.Container impleme
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (virtual: ");
-        if (virtualESet) result.append(virtual); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (virtual: " );
+        if( virtualESet )
+            result.append( virtual );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyContentFromOtherNamespaceImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyContentFromOtherNamespaceImpl.java
index 6600262..93157ca 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyContentFromOtherNamespaceImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyContentFromOtherNamespaceImpl.java
@@ -93,8 +93,8 @@ public abstract class AnyContentFromOtherNamespaceImpl extends SclObjectImpl imp
      */
     @Override
     public FeatureMap getMixed() {
-        if (mixed == null) {
-            mixed = new BasicFeatureMap(this, SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__MIXED);
+        if( mixed == null ) {
+            mixed = new BasicFeatureMap( this, SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__MIXED );
         }
         return mixed;
     }
@@ -106,7 +106,8 @@ public abstract class AnyContentFromOtherNamespaceImpl extends SclObjectImpl imp
      */
     @Override
     public FeatureMap getGroup() {
-        return (FeatureMap)getMixed().<FeatureMap.Entry>list(SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_Group());
+        return ( FeatureMap ) getMixed().< FeatureMap.Entry > list(
+                SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_Group() );
     }
 
     /**
@@ -116,7 +117,8 @@ public abstract class AnyContentFromOtherNamespaceImpl extends SclObjectImpl imp
      */
     @Override
     public FeatureMap getAny() {
-        return (FeatureMap)getGroup().<FeatureMap.Entry>list(SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_Any());
+        return ( FeatureMap ) getGroup().< FeatureMap.Entry > list(
+                SclPackage.eINSTANCE.getAnyContentFromOtherNamespace_Any() );
     }
 
     /**
@@ -126,8 +128,8 @@ public abstract class AnyContentFromOtherNamespaceImpl extends SclObjectImpl imp
      */
     @Override
     public FeatureMap getAnyAttribute() {
-        if (anyAttribute == null) {
-            anyAttribute = new BasicFeatureMap(this, SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY_ATTRIBUTE);
+        if( anyAttribute == null ) {
+            anyAttribute = new BasicFeatureMap( this, SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY_ATTRIBUTE );
         }
         return anyAttribute;
     }
@@ -139,17 +141,17 @@ public abstract class AnyContentFromOtherNamespaceImpl extends SclObjectImpl imp
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__MIXED:
-                return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__GROUP:
-                return ((InternalEList<?>)getGroup()).basicRemove(otherEnd, msgs);
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY:
-                return ((InternalEList<?>)getAny()).basicRemove(otherEnd, msgs);
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY_ATTRIBUTE:
-                return ((InternalEList<?>)getAnyAttribute()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__MIXED:
+            return ( ( InternalEList< ? > ) getMixed() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__GROUP:
+            return ( ( InternalEList< ? > ) getGroup() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY:
+            return ( ( InternalEList< ? > ) getAny() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY_ATTRIBUTE:
+            return ( ( InternalEList< ? > ) getAnyAttribute() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -159,21 +161,21 @@ public abstract class AnyContentFromOtherNamespaceImpl extends SclObjectImpl imp
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__MIXED:
-                if (coreType) return getMixed();
-                return ((FeatureMap.Internal)getMixed()).getWrapper();
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__GROUP:
-                if (coreType) return getGroup();
-                return ((FeatureMap.Internal)getGroup()).getWrapper();
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY:
-                if (coreType) return getAny();
-                return ((FeatureMap.Internal)getAny()).getWrapper();
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY_ATTRIBUTE:
-                if (coreType) return getAnyAttribute();
-                return ((FeatureMap.Internal)getAnyAttribute()).getWrapper();
+        switch( featureID ) {
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__MIXED:
+            if( coreType ) return getMixed();
+            return ( ( FeatureMap.Internal ) getMixed() ).getWrapper();
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__GROUP:
+            if( coreType ) return getGroup();
+            return ( ( FeatureMap.Internal ) getGroup() ).getWrapper();
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY:
+            if( coreType ) return getAny();
+            return ( ( FeatureMap.Internal ) getAny() ).getWrapper();
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY_ATTRIBUTE:
+            if( coreType ) return getAnyAttribute();
+            return ( ( FeatureMap.Internal ) getAnyAttribute() ).getWrapper();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -183,21 +185,21 @@ public abstract class AnyContentFromOtherNamespaceImpl extends SclObjectImpl imp
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__MIXED:
-                ((FeatureMap.Internal)getMixed()).set(newValue);
-                return;
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__GROUP:
-                ((FeatureMap.Internal)getGroup()).set(newValue);
-                return;
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY:
-                ((FeatureMap.Internal)getAny()).set(newValue);
-                return;
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY_ATTRIBUTE:
-                ((FeatureMap.Internal)getAnyAttribute()).set(newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__MIXED:
+            ( ( FeatureMap.Internal ) getMixed() ).set( newValue );
+            return;
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__GROUP:
+            ( ( FeatureMap.Internal ) getGroup() ).set( newValue );
+            return;
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY:
+            ( ( FeatureMap.Internal ) getAny() ).set( newValue );
+            return;
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY_ATTRIBUTE:
+            ( ( FeatureMap.Internal ) getAnyAttribute() ).set( newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -207,21 +209,21 @@ public abstract class AnyContentFromOtherNamespaceImpl extends SclObjectImpl imp
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__MIXED:
-                getMixed().clear();
-                return;
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__GROUP:
-                getGroup().clear();
-                return;
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY:
-                getAny().clear();
-                return;
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY_ATTRIBUTE:
-                getAnyAttribute().clear();
-                return;
+        switch( featureID ) {
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__MIXED:
+            getMixed().clear();
+            return;
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__GROUP:
+            getGroup().clear();
+            return;
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY:
+            getAny().clear();
+            return;
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY_ATTRIBUTE:
+            getAnyAttribute().clear();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -231,17 +233,17 @@ public abstract class AnyContentFromOtherNamespaceImpl extends SclObjectImpl imp
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__MIXED:
-                return mixed != null && !mixed.isEmpty();
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__GROUP:
-                return !getGroup().isEmpty();
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY:
-                return !getAny().isEmpty();
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY_ATTRIBUTE:
-                return anyAttribute != null && !anyAttribute.isEmpty();
+        switch( featureID ) {
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__MIXED:
+            return mixed != null && !mixed.isEmpty();
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__GROUP:
+            return !getGroup().isEmpty();
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY:
+            return !getAny().isEmpty();
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE__ANY_ATTRIBUTE:
+            return anyAttribute != null && !anyAttribute.isEmpty();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -251,14 +253,14 @@ public abstract class AnyContentFromOtherNamespaceImpl extends SclObjectImpl imp
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (mixed: ");
-        result.append(mixed);
-        result.append(", anyAttribute: ");
-        result.append(anyAttribute);
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (mixed: " );
+        result.append( mixed );
+        result.append( ", anyAttribute: " );
+        result.append( anyAttribute );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java
index a68f114..f917e8e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java
@@ -23,9 +23,6 @@ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.Association;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.ClientLN;
-import fr.centralesupelec.edf.riseclipse.iec61850.scl.DA;
-import fr.centralesupelec.edf.riseclipse.iec61850.scl.DAI;
-import fr.centralesupelec.edf.riseclipse.iec61850.scl.DO;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.DOI;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataSet;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataTypeTemplates;
@@ -222,7 +219,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      * @ordered
      */
-    protected EList<Log> log;
+    protected EList< Log > log;
 
     /**
      * The cached value of the '{@link #getDOI() <em>DOI</em>}' containment reference list.
@@ -232,7 +229,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      * @ordered
      */
-    protected EList<DOI> doi;
+    protected EList< DOI > doi;
 
     /**
      * The cached value of the '{@link #getDataSet() <em>Data Set</em>}' containment reference list.
@@ -242,7 +239,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      * @ordered
      */
-    protected EList<DataSet> dataSet;
+    protected EList< DataSet > dataSet;
 
     /**
      * The cached value of the '{@link #getReferredByClientLN() <em>Referred By Client LN</em>}' reference list.
@@ -252,7 +249,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      * @ordered
      */
-    protected EList<ClientLN> referredByClientLN;
+    protected EList< ClientLN > referredByClientLN;
 
     /**
      * The cached value of the '{@link #getReferredByLogControl() <em>Referred By Log Control</em>}' reference list.
@@ -262,7 +259,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      * @ordered
      */
-    protected EList<LogControl> referredByLogControl;
+    protected EList< LogControl > referredByLogControl;
 
     /**
      * The cached value of the '{@link #getReferredByAssociation() <em>Referred By Association</em>}' reference list.
@@ -272,7 +269,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      * @ordered
      */
-    protected EList<Association> referredByAssociation;
+    protected EList< Association > referredByAssociation;
 
     /**
      * The cached value of the '{@link #getReferredByIEDName() <em>Referred By IED Name</em>}' reference list.
@@ -282,7 +279,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      * @ordered
      */
-    protected EList<IEDName> referredByIEDName;
+    protected EList< IEDName > referredByIEDName;
 
     /**
      * The cached value of the '{@link #getReferredByLNode() <em>Referred By LNode</em>}' reference list.
@@ -292,7 +289,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      * @ordered
      */
-    protected EList<LNode> referredByLNode;
+    protected EList< LNode > referredByLNode;
 
     /**
      * The cached value of the '{@link #getControl() <em>Control</em>}' attribute list.
@@ -344,8 +341,9 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
         inst = newInst;
         boolean oldInstESet = instESet;
         instESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ANY_LN__INST, oldInst, inst, !oldInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ANY_LN__INST, oldInst, inst,
+                    !oldInstESet ) );
     }
 
     /**
@@ -359,8 +357,9 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
         boolean oldInstESet = instESet;
         inst = INST_EDEFAULT;
         instESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ANY_LN__INST, oldInst, INST_EDEFAULT, oldInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ANY_LN__INST, oldInst, INST_EDEFAULT,
+                    oldInstESet ) );
     }
 
     /**
@@ -394,8 +393,9 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
         lnClass = newLnClass;
         boolean oldLnClassESet = lnClassESet;
         lnClassESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ANY_LN__LN_CLASS, oldLnClass, lnClass, !oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ANY_LN__LN_CLASS, oldLnClass, lnClass,
+                    !oldLnClassESet ) );
     }
 
     /**
@@ -409,8 +409,9 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
         boolean oldLnClassESet = lnClassESet;
         lnClass = LN_CLASS_EDEFAULT;
         lnClassESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ANY_LN__LN_CLASS, oldLnClass, LN_CLASS_EDEFAULT, oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ANY_LN__LN_CLASS, oldLnClass,
+                    LN_CLASS_EDEFAULT, oldLnClassESet ) );
     }
 
     /**
@@ -444,8 +445,9 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
         lnType = newLnType;
         boolean oldLnTypeESet = lnTypeESet;
         lnTypeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ANY_LN__LN_TYPE, oldLnType, lnType, !oldLnTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ANY_LN__LN_TYPE, oldLnType, lnType,
+                    !oldLnTypeESet ) );
     }
 
     /**
@@ -459,8 +461,9 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
         boolean oldLnTypeESet = lnTypeESet;
         lnType = LN_TYPE_EDEFAULT;
         lnTypeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ANY_LN__LN_TYPE, oldLnType, LN_TYPE_EDEFAULT, oldLnTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ANY_LN__LN_TYPE, oldLnType,
+                    LN_TYPE_EDEFAULT, oldLnTypeESet ) );
     }
 
     /**
@@ -488,14 +491,19 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToLNodeType(LNodeType newRefersToLNodeType, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToLNodeType( LNodeType newRefersToLNodeType, NotificationChain msgs ) {
         LNodeType oldRefersToLNodeType = refersToLNodeType;
         refersToLNodeType = newRefersToLNodeType;
         boolean oldRefersToLNodeTypeESet = refersToLNodeTypeESet;
         refersToLNodeTypeESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE, oldRefersToLNodeType, newRefersToLNodeType, !oldRefersToLNodeTypeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE, oldRefersToLNodeType, newRefersToLNodeType,
+                    !oldRefersToLNodeTypeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -506,21 +514,24 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      */
     @Override
-    public void setRefersToLNodeType(LNodeType newRefersToLNodeType) {
-        if (newRefersToLNodeType != refersToLNodeType) {
+    public void setRefersToLNodeType( LNodeType newRefersToLNodeType ) {
+        if( newRefersToLNodeType != refersToLNodeType ) {
             NotificationChain msgs = null;
-            if (refersToLNodeType != null)
-                msgs = ((InternalEObject)refersToLNodeType).eInverseRemove(this, SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN, LNodeType.class, msgs);
-            if (newRefersToLNodeType != null)
-                msgs = ((InternalEObject)newRefersToLNodeType).eInverseAdd(this, SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN, LNodeType.class, msgs);
-            msgs = basicSetRefersToLNodeType(newRefersToLNodeType, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToLNodeType != null )
+                msgs = ( ( InternalEObject ) refersToLNodeType ).eInverseRemove( this,
+                        SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN, LNodeType.class, msgs );
+            if( newRefersToLNodeType != null )
+                msgs = ( ( InternalEObject ) newRefersToLNodeType ).eInverseAdd( this,
+                        SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN, LNodeType.class, msgs );
+            msgs = basicSetRefersToLNodeType( newRefersToLNodeType, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToLNodeTypeESet = refersToLNodeTypeESet;
             refersToLNodeTypeESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE, newRefersToLNodeType, newRefersToLNodeType, !oldRefersToLNodeTypeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE,
+                        newRefersToLNodeType, newRefersToLNodeType, !oldRefersToLNodeTypeESet ) );
         }
     }
 
@@ -529,14 +540,18 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToLNodeType(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToLNodeType( NotificationChain msgs ) {
         LNodeType oldRefersToLNodeType = refersToLNodeType;
         refersToLNodeType = null;
         boolean oldRefersToLNodeTypeESet = refersToLNodeTypeESet;
         refersToLNodeTypeESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE, oldRefersToLNodeType, null, oldRefersToLNodeTypeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE, oldRefersToLNodeType, null, oldRefersToLNodeTypeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -548,17 +563,19 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void unsetRefersToLNodeType() {
-        if (refersToLNodeType != null) {
+        if( refersToLNodeType != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToLNodeType).eInverseRemove(this, SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN, LNodeType.class, msgs);
-            msgs = basicUnsetRefersToLNodeType(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToLNodeType ).eInverseRemove( this,
+                    SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN, LNodeType.class, msgs );
+            msgs = basicUnsetRefersToLNodeType( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToLNodeTypeESet = refersToLNodeTypeESet;
             refersToLNodeTypeESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE, null, null, oldRefersToLNodeTypeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE, null,
+                        null, oldRefersToLNodeTypeESet ) );
         }
     }
 
@@ -592,9 +609,13 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
         inputs = newInputs;
         boolean oldInputsESet = inputsESet;
         inputsESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.ANY_LN__INPUTS, oldInputs, newInputs, !oldInputsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.ANY_LN__INPUTS,
+                    oldInputs, newInputs, !oldInputsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -606,20 +627,23 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void setInputs( Inputs newInputs ) {
-        if (newInputs != inputs) {
+        if( newInputs != inputs ) {
             NotificationChain msgs = null;
-            if (inputs != null)
-                msgs = ((InternalEObject)inputs).eInverseRemove(this, SclPackage.INPUTS__PARENT_ANY_LN, Inputs.class, msgs);
-            if (newInputs != null)
-                msgs = ((InternalEObject)newInputs).eInverseAdd(this, SclPackage.INPUTS__PARENT_ANY_LN, Inputs.class, msgs);
-            msgs = basicSetInputs(newInputs, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( inputs != null )
+                msgs = ( ( InternalEObject ) inputs ).eInverseRemove( this, SclPackage.INPUTS__PARENT_ANY_LN,
+                        Inputs.class, msgs );
+            if( newInputs != null )
+                msgs = ( ( InternalEObject ) newInputs ).eInverseAdd( this, SclPackage.INPUTS__PARENT_ANY_LN,
+                        Inputs.class, msgs );
+            msgs = basicSetInputs( newInputs, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldInputsESet = inputsESet;
             inputsESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ANY_LN__INPUTS, newInputs, newInputs, !oldInputsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ANY_LN__INPUTS, newInputs, newInputs,
+                        !oldInputsESet ) );
         }
     }
 
@@ -633,9 +657,13 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
         inputs = null;
         boolean oldInputsESet = inputsESet;
         inputsESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.ANY_LN__INPUTS, oldInputs, null, oldInputsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.ANY_LN__INPUTS,
+                    oldInputs, null, oldInputsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -647,17 +675,19 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void unsetInputs() {
-        if (inputs != null) {
+        if( inputs != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)inputs).eInverseRemove(this, SclPackage.INPUTS__PARENT_ANY_LN, Inputs.class, msgs);
-            msgs = basicUnsetInputs(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) inputs ).eInverseRemove( this, SclPackage.INPUTS__PARENT_ANY_LN, Inputs.class,
+                    msgs );
+            msgs = basicUnsetInputs( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldInputsESet = inputsESet;
             inputsESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ANY_LN__INPUTS, null, null, oldInputsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ANY_LN__INPUTS, null, null,
+                        oldInputsESet ) );
         }
     }
 
@@ -677,9 +707,10 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      */
     @Override
-    public EList<Log> getLog() {
-        if (log == null) {
-            log = new EObjectContainmentWithInverseEList.Unsettable<Log>(Log.class, this, SclPackage.ANY_LN__LOG, SclPackage.LOG__PARENT_ANY_LN);
+    public EList< Log > getLog() {
+        if( log == null ) {
+            log = new EObjectContainmentWithInverseEList.Unsettable< Log >( Log.class, this, SclPackage.ANY_LN__LOG,
+                    SclPackage.LOG__PARENT_ANY_LN );
         }
         return log;
     }
@@ -691,7 +722,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void unsetLog() {
-        if (log != null) ((InternalEList.Unsettable<?>)log).unset();
+        if( log != null ) ( ( InternalEList.Unsettable< ? > ) log ).unset();
     }
 
     /**
@@ -701,7 +732,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public boolean isSetLog() {
-        return log != null && ((InternalEList.Unsettable<?>)log).isSet();
+        return log != null && ( ( InternalEList.Unsettable< ? > ) log ).isSet();
     }
 
     /**
@@ -710,9 +741,10 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      */
     @Override
-    public EList<DOI> getDOI() {
-        if (doi == null) {
-            doi = new EObjectContainmentWithInverseEList.Unsettable<DOI>(DOI.class, this, SclPackage.ANY_LN__DOI, SclPackage.DOI__PARENT_ANY_LN);
+    public EList< DOI > getDOI() {
+        if( doi == null ) {
+            doi = new EObjectContainmentWithInverseEList.Unsettable< DOI >( DOI.class, this, SclPackage.ANY_LN__DOI,
+                    SclPackage.DOI__PARENT_ANY_LN );
         }
         return doi;
     }
@@ -724,7 +756,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void unsetDOI() {
-        if (doi != null) ((InternalEList.Unsettable<?>)doi).unset();
+        if( doi != null ) ( ( InternalEList.Unsettable< ? > ) doi ).unset();
     }
 
     /**
@@ -734,7 +766,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public boolean isSetDOI() {
-        return doi != null && ((InternalEList.Unsettable<?>)doi).isSet();
+        return doi != null && ( ( InternalEList.Unsettable< ? > ) doi ).isSet();
     }
 
     /**
@@ -743,8 +775,8 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      */
     @Override
-    public EList<ReportControl> getReportControl() {
-        return getControlWithTriggerOpt().list(SclPackage.eINSTANCE.getAnyLN_ReportControl());
+    public EList< ReportControl > getReportControl() {
+        return getControlWithTriggerOpt().list( SclPackage.eINSTANCE.getAnyLN_ReportControl() );
     }
 
     /**
@@ -754,7 +786,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void unsetReportControl() {
-        ((FeatureMap.Internal)getControlWithTriggerOpt()).clear(SclPackage.eINSTANCE.getAnyLN_ReportControl());
+        ( ( FeatureMap.Internal ) getControlWithTriggerOpt() ).clear( SclPackage.eINSTANCE.getAnyLN_ReportControl() );
     }
 
     /**
@@ -764,7 +796,8 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public boolean isSetReportControl() {
-        return !((FeatureMap.Internal)getControlWithTriggerOpt()).isEmpty(SclPackage.eINSTANCE.getAnyLN_ReportControl());
+        return !( ( FeatureMap.Internal ) getControlWithTriggerOpt() )
+                .isEmpty( SclPackage.eINSTANCE.getAnyLN_ReportControl() );
     }
 
     /**
@@ -773,8 +806,8 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      */
     @Override
-    public EList<LogControl> getLogControl() {
-        return getControlWithTriggerOpt().list(SclPackage.eINSTANCE.getAnyLN_LogControl());
+    public EList< LogControl > getLogControl() {
+        return getControlWithTriggerOpt().list( SclPackage.eINSTANCE.getAnyLN_LogControl() );
     }
 
     /**
@@ -784,7 +817,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void unsetLogControl() {
-        ((FeatureMap.Internal)getControlWithTriggerOpt()).clear(SclPackage.eINSTANCE.getAnyLN_LogControl());
+        ( ( FeatureMap.Internal ) getControlWithTriggerOpt() ).clear( SclPackage.eINSTANCE.getAnyLN_LogControl() );
     }
 
     /**
@@ -794,7 +827,8 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public boolean isSetLogControl() {
-        return !((FeatureMap.Internal)getControlWithTriggerOpt()).isEmpty(SclPackage.eINSTANCE.getAnyLN_LogControl());
+        return !( ( FeatureMap.Internal ) getControlWithTriggerOpt() )
+                .isEmpty( SclPackage.eINSTANCE.getAnyLN_LogControl() );
     }
 
     /**
@@ -803,9 +837,10 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      */
     @Override
-    public EList<DataSet> getDataSet() {
-        if (dataSet == null) {
-            dataSet = new EObjectContainmentWithInverseEList.Unsettable<DataSet>(DataSet.class, this, SclPackage.ANY_LN__DATA_SET, SclPackage.DATA_SET__PARENT_ANY_LN);
+    public EList< DataSet > getDataSet() {
+        if( dataSet == null ) {
+            dataSet = new EObjectContainmentWithInverseEList.Unsettable< DataSet >( DataSet.class, this,
+                    SclPackage.ANY_LN__DATA_SET, SclPackage.DATA_SET__PARENT_ANY_LN );
         }
         return dataSet;
     }
@@ -817,7 +852,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void unsetDataSet() {
-        if (dataSet != null) ((InternalEList.Unsettable<?>)dataSet).unset();
+        if( dataSet != null ) ( ( InternalEList.Unsettable< ? > ) dataSet ).unset();
     }
 
     /**
@@ -827,7 +862,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public boolean isSetDataSet() {
-        return dataSet != null && ((InternalEList.Unsettable<?>)dataSet).isSet();
+        return dataSet != null && ( ( InternalEList.Unsettable< ? > ) dataSet ).isSet();
     }
 
     /**
@@ -836,9 +871,10 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      */
     @Override
-    public EList<ClientLN> getReferredByClientLN() {
-        if (referredByClientLN == null) {
-            referredByClientLN = new EObjectWithInverseEList.Unsettable<ClientLN>(ClientLN.class, this, SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN, SclPackage.CLIENT_LN__REFERS_TO_ANY_LN);
+    public EList< ClientLN > getReferredByClientLN() {
+        if( referredByClientLN == null ) {
+            referredByClientLN = new EObjectWithInverseEList.Unsettable< ClientLN >( ClientLN.class, this,
+                    SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN, SclPackage.CLIENT_LN__REFERS_TO_ANY_LN );
         }
         return referredByClientLN;
     }
@@ -850,7 +886,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void unsetReferredByClientLN() {
-        if (referredByClientLN != null) ((InternalEList.Unsettable<?>)referredByClientLN).unset();
+        if( referredByClientLN != null ) ( ( InternalEList.Unsettable< ? > ) referredByClientLN ).unset();
     }
 
     /**
@@ -860,7 +896,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public boolean isSetReferredByClientLN() {
-        return referredByClientLN != null && ((InternalEList.Unsettable<?>)referredByClientLN).isSet();
+        return referredByClientLN != null && ( ( InternalEList.Unsettable< ? > ) referredByClientLN ).isSet();
     }
 
     /**
@@ -869,9 +905,10 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      */
     @Override
-    public EList<LogControl> getReferredByLogControl() {
-        if (referredByLogControl == null) {
-            referredByLogControl = new EObjectWithInverseEList.Unsettable<LogControl>(LogControl.class, this, SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL, SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN);
+    public EList< LogControl > getReferredByLogControl() {
+        if( referredByLogControl == null ) {
+            referredByLogControl = new EObjectWithInverseEList.Unsettable< LogControl >( LogControl.class, this,
+                    SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL, SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN );
         }
         return referredByLogControl;
     }
@@ -883,7 +920,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void unsetReferredByLogControl() {
-        if (referredByLogControl != null) ((InternalEList.Unsettable<?>)referredByLogControl).unset();
+        if( referredByLogControl != null ) ( ( InternalEList.Unsettable< ? > ) referredByLogControl ).unset();
     }
 
     /**
@@ -893,7 +930,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public boolean isSetReferredByLogControl() {
-        return referredByLogControl != null && ((InternalEList.Unsettable<?>)referredByLogControl).isSet();
+        return referredByLogControl != null && ( ( InternalEList.Unsettable< ? > ) referredByLogControl ).isSet();
     }
 
     /**
@@ -902,9 +939,10 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      */
     @Override
-    public EList<Association> getReferredByAssociation() {
-        if (referredByAssociation == null) {
-            referredByAssociation = new EObjectWithInverseEList.Unsettable<Association>(Association.class, this, SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION, SclPackage.ASSOCIATION__REFERS_TO_ANY_LN);
+    public EList< Association > getReferredByAssociation() {
+        if( referredByAssociation == null ) {
+            referredByAssociation = new EObjectWithInverseEList.Unsettable< Association >( Association.class, this,
+                    SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION, SclPackage.ASSOCIATION__REFERS_TO_ANY_LN );
         }
         return referredByAssociation;
     }
@@ -916,7 +954,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void unsetReferredByAssociation() {
-        if (referredByAssociation != null) ((InternalEList.Unsettable<?>)referredByAssociation).unset();
+        if( referredByAssociation != null ) ( ( InternalEList.Unsettable< ? > ) referredByAssociation ).unset();
     }
 
     /**
@@ -926,7 +964,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public boolean isSetReferredByAssociation() {
-        return referredByAssociation != null && ((InternalEList.Unsettable<?>)referredByAssociation).isSet();
+        return referredByAssociation != null && ( ( InternalEList.Unsettable< ? > ) referredByAssociation ).isSet();
     }
 
     /**
@@ -935,9 +973,10 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      */
     @Override
-    public EList<IEDName> getReferredByIEDName() {
-        if (referredByIEDName == null) {
-            referredByIEDName = new EObjectWithInverseEList.Unsettable<IEDName>(IEDName.class, this, SclPackage.ANY_LN__REFERRED_BY_IED_NAME, SclPackage.IED_NAME__REFERS_TO_ANY_LN);
+    public EList< IEDName > getReferredByIEDName() {
+        if( referredByIEDName == null ) {
+            referredByIEDName = new EObjectWithInverseEList.Unsettable< IEDName >( IEDName.class, this,
+                    SclPackage.ANY_LN__REFERRED_BY_IED_NAME, SclPackage.IED_NAME__REFERS_TO_ANY_LN );
         }
         return referredByIEDName;
     }
@@ -949,7 +988,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void unsetReferredByIEDName() {
-        if (referredByIEDName != null) ((InternalEList.Unsettable<?>)referredByIEDName).unset();
+        if( referredByIEDName != null ) ( ( InternalEList.Unsettable< ? > ) referredByIEDName ).unset();
     }
 
     /**
@@ -959,7 +998,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public boolean isSetReferredByIEDName() {
-        return referredByIEDName != null && ((InternalEList.Unsettable<?>)referredByIEDName).isSet();
+        return referredByIEDName != null && ( ( InternalEList.Unsettable< ? > ) referredByIEDName ).isSet();
     }
 
     /**
@@ -968,9 +1007,10 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      */
     @Override
-    public EList<LNode> getReferredByLNode() {
-        if (referredByLNode == null) {
-            referredByLNode = new EObjectWithInverseEList.Unsettable<LNode>(LNode.class, this, SclPackage.ANY_LN__REFERRED_BY_LNODE, SclPackage.LNODE__REFERS_TO_ANY_LN);
+    public EList< LNode > getReferredByLNode() {
+        if( referredByLNode == null ) {
+            referredByLNode = new EObjectWithInverseEList.Unsettable< LNode >( LNode.class, this,
+                    SclPackage.ANY_LN__REFERRED_BY_LNODE, SclPackage.LNODE__REFERS_TO_ANY_LN );
         }
         return referredByLNode;
     }
@@ -982,7 +1022,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void unsetReferredByLNode() {
-        if (referredByLNode != null) ((InternalEList.Unsettable<?>)referredByLNode).unset();
+        if( referredByLNode != null ) ( ( InternalEList.Unsettable< ? > ) referredByLNode ).unset();
     }
 
     /**
@@ -992,7 +1032,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public boolean isSetReferredByLNode() {
-        return referredByLNode != null && ((InternalEList.Unsettable<?>)referredByLNode).isSet();
+        return referredByLNode != null && ( ( InternalEList.Unsettable< ? > ) referredByLNode ).isSet();
     }
 
     /**
@@ -1002,7 +1042,8 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public FeatureMap getControlWithTriggerOpt() {
-        return (FeatureMap)getControl().<FeatureMap.Entry>list(SclPackage.eINSTANCE.getAnyLN_ControlWithTriggerOpt());
+        return ( FeatureMap ) getControl().< FeatureMap.Entry > list(
+                SclPackage.eINSTANCE.getAnyLN_ControlWithTriggerOpt() );
     }
 
     /**
@@ -1012,7 +1053,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void unsetControlWithTriggerOpt() {
-        ((FeatureMap.Internal)getControl()).clear(SclPackage.eINSTANCE.getAnyLN_ControlWithTriggerOpt());
+        ( ( FeatureMap.Internal ) getControl() ).clear( SclPackage.eINSTANCE.getAnyLN_ControlWithTriggerOpt() );
     }
 
     /**
@@ -1022,7 +1063,8 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public boolean isSetControlWithTriggerOpt() {
-        return !((FeatureMap.Internal)getControl()).isEmpty(SclPackage.eINSTANCE.getAnyLN_ControlWithTriggerOpt());
+        return !( ( FeatureMap.Internal ) getControl() )
+                .isEmpty( SclPackage.eINSTANCE.getAnyLN_ControlWithTriggerOpt() );
     }
 
     /**
@@ -1032,8 +1074,8 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public FeatureMap getControl() {
-        if (control == null) {
-            control = new BasicFeatureMap(this, SclPackage.ANY_LN__CONTROL);
+        if( control == null ) {
+            control = new BasicFeatureMap( this, SclPackage.ANY_LN__CONTROL );
         }
         return control;
     }
@@ -1045,7 +1087,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void unsetControl() {
-        if (control != null) ((InternalEList.Unsettable<?>)control).unset();
+        if( control != null ) ( ( InternalEList.Unsettable< ? > ) control ).unset();
     }
 
     /**
@@ -1055,7 +1097,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public boolean isSetControl() {
-        return control != null && ((InternalEList.Unsettable<?>)control).isSet();
+        return control != null && ( ( InternalEList.Unsettable< ? > ) control ).isSet();
     }
 
     /**
@@ -1075,82 +1117,9 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public String getNamespace() {
-        List< DOI > namPltDoi =
-                getDOI()
-                .stream()
-                .filter( doi -> "NamPlt".equals( doi.getName() ))
-                .collect( Collectors.toList() );
-        if( namPltDoi.size() == 1 ) {
-            List< DAI > lnNsDai =
-                    namPltDoi
-                    .get( 0 )
-                    .getDAI()
-                    .stream()
-                    .filter( dai -> "lnNs".equals(  dai.getName() ))
-                    .collect( Collectors.toList() );
-            if( lnNsDai.size() == 1 ) {
-                if((         lnNsDai.get( 0 ).getVal().size() == 1 )
-                        && ( lnNsDai.get( 0 ).getVal().get( 0 ).getValue() != null )
-                        && ( lnNsDai.get( 0 ).getVal().get( 0 ).getValue().length() != 0 )) {
-                    return lnNsDai.get( 0 ).getVal().get( 0 ).getValue();
-                }
-                if((         lnNsDai.get( 0 ).getRefersToAbstractDataAttribute() != null )
-                        && ( lnNsDai.get( 0 ).getRefersToAbstractDataAttribute().getVal().size() == 1 )
-                        && ( lnNsDai.get( 0 ).getRefersToAbstractDataAttribute().getVal().get( 0 ).getValue() != null )
-                        && ( lnNsDai.get( 0 ).getRefersToAbstractDataAttribute().getVal().get( 0 ).getValue().length() != 0 )) {
-                    return lnNsDai.get( 0 ).getRefersToAbstractDataAttribute().getVal().get( 0 ).getValue();
-                }
-            }
-            if( namPltDoi.get( 0 ).getRefersToDO() != null ) {
-                List< DA > lnNsDa =
-                        namPltDoi
-                        .get( 0 )
-                        .getRefersToDO()
-                        .getRefersToDOType()
-                        .getDA()
-                        .stream()
-                        .filter( da -> "lnNs".equals(  da.getName() ))
-                        .collect( Collectors.toList() );
-                if( lnNsDa.size() == 1 ) {
-                    if((         lnNsDa.get( 0 ).getVal().size() == 1 )
-                            && ( lnNsDa.get( 0 ).getVal().get( 0 ).getValue() != null )
-                            && ( lnNsDa.get( 0 ).getVal().get( 0 ).getValue().length() != 0 )) {
-                        return lnNsDa.get( 0 ).getVal().get( 0 ).getValue();
-                    }
-                }
-            }
-        }
-
-        if( getRefersToLNodeType() != null ) {
-            List< DO > namPltDo =
-                    getRefersToLNodeType()
-                    .getDO()
-                    .stream()
-                    .filter( doi -> "NamPlt".equals( doi.getName() ))
-                    .collect( Collectors.toList() );
-            if( namPltDo.size() == 1 ) {
-                if( namPltDo.get( 0 ).getRefersToDOType() != null ) {
-                    List< DA > lnNsDa =
-                            namPltDo
-                            .get( 0 )
-                            .getRefersToDOType()
-                            .getDA()
-                            .stream()
-                            .filter( da -> "lnNs".equals(  da.getName() ))
-                            .collect( Collectors.toList() );
-                    if( lnNsDa.size() == 1 ) {
-                        if((         lnNsDa.get( 0 ).getVal().size() == 1 )
-                                && ( lnNsDa.get( 0 ).getVal().get( 0 ).getValue() != null )
-                                && ( lnNsDa.get( 0 ).getVal().get( 0 ).getValue().length() != 0 )) {
-                            return lnNsDa.get( 0 ).getVal().get( 0 ).getValue();
-                        }
-                    }
-                }
-            }
-        }
-
-        if( getParentLDevice() == null ) return null;
-        return getParentLDevice().getNamespace();
+        // TODO: implement this method
+        // Ensure that you remove @generated or mark it @generated NOT
+        throw new UnsupportedOperationException();
     }
 
     /**
@@ -1161,37 +1130,47 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE:
-                if (refersToLNodeType != null)
-                    msgs = ((InternalEObject)refersToLNodeType).eInverseRemove(this, SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN, LNodeType.class, msgs);
-                return basicSetRefersToLNodeType((LNodeType)otherEnd, msgs);
-            case SclPackage.ANY_LN__INPUTS:
-                if (inputs != null)
-                    msgs = ((InternalEObject)inputs).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.ANY_LN__INPUTS, null, msgs);
-                return basicSetInputs((Inputs)otherEnd, msgs);
-            case SclPackage.ANY_LN__LOG:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getLog()).basicAdd(otherEnd, msgs);
-            case SclPackage.ANY_LN__DOI:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getDOI()).basicAdd(otherEnd, msgs);
-            case SclPackage.ANY_LN__REPORT_CONTROL:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReportControl()).basicAdd(otherEnd, msgs);
-            case SclPackage.ANY_LN__LOG_CONTROL:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getLogControl()).basicAdd(otherEnd, msgs);
-            case SclPackage.ANY_LN__DATA_SET:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getDataSet()).basicAdd(otherEnd, msgs);
-            case SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByClientLN()).basicAdd(otherEnd, msgs);
-            case SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByLogControl()).basicAdd(otherEnd, msgs);
-            case SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByAssociation()).basicAdd(otherEnd, msgs);
-            case SclPackage.ANY_LN__REFERRED_BY_IED_NAME:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByIEDName()).basicAdd(otherEnd, msgs);
-            case SclPackage.ANY_LN__REFERRED_BY_LNODE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByLNode()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE:
+            if( refersToLNodeType != null )
+                msgs = ( ( InternalEObject ) refersToLNodeType ).eInverseRemove( this,
+                        SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN, LNodeType.class, msgs );
+            return basicSetRefersToLNodeType( ( LNodeType ) otherEnd, msgs );
+        case SclPackage.ANY_LN__INPUTS:
+            if( inputs != null )
+                msgs = ( ( InternalEObject ) inputs ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.ANY_LN__INPUTS, null, msgs );
+            return basicSetInputs( ( Inputs ) otherEnd, msgs );
+        case SclPackage.ANY_LN__LOG:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getLog() ).basicAdd( otherEnd, msgs );
+        case SclPackage.ANY_LN__DOI:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getDOI() ).basicAdd( otherEnd, msgs );
+        case SclPackage.ANY_LN__REPORT_CONTROL:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReportControl() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.ANY_LN__LOG_CONTROL:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getLogControl() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.ANY_LN__DATA_SET:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getDataSet() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByClientLN() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByLogControl() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByAssociation() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.ANY_LN__REFERRED_BY_IED_NAME:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByIEDName() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.ANY_LN__REFERRED_BY_LNODE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByLNode() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1201,37 +1180,37 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE:
-                return basicUnsetRefersToLNodeType(msgs);
-            case SclPackage.ANY_LN__INPUTS:
-                return basicUnsetInputs(msgs);
-            case SclPackage.ANY_LN__LOG:
-                return ((InternalEList<?>)getLog()).basicRemove(otherEnd, msgs);
-            case SclPackage.ANY_LN__DOI:
-                return ((InternalEList<?>)getDOI()).basicRemove(otherEnd, msgs);
-            case SclPackage.ANY_LN__REPORT_CONTROL:
-                return ((InternalEList<?>)getReportControl()).basicRemove(otherEnd, msgs);
-            case SclPackage.ANY_LN__LOG_CONTROL:
-                return ((InternalEList<?>)getLogControl()).basicRemove(otherEnd, msgs);
-            case SclPackage.ANY_LN__DATA_SET:
-                return ((InternalEList<?>)getDataSet()).basicRemove(otherEnd, msgs);
-            case SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN:
-                return ((InternalEList<?>)getReferredByClientLN()).basicRemove(otherEnd, msgs);
-            case SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL:
-                return ((InternalEList<?>)getReferredByLogControl()).basicRemove(otherEnd, msgs);
-            case SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION:
-                return ((InternalEList<?>)getReferredByAssociation()).basicRemove(otherEnd, msgs);
-            case SclPackage.ANY_LN__REFERRED_BY_IED_NAME:
-                return ((InternalEList<?>)getReferredByIEDName()).basicRemove(otherEnd, msgs);
-            case SclPackage.ANY_LN__REFERRED_BY_LNODE:
-                return ((InternalEList<?>)getReferredByLNode()).basicRemove(otherEnd, msgs);
-            case SclPackage.ANY_LN__CONTROL_WITH_TRIGGER_OPT:
-                return ((InternalEList<?>)getControlWithTriggerOpt()).basicRemove(otherEnd, msgs);
-            case SclPackage.ANY_LN__CONTROL:
-                return ((InternalEList<?>)getControl()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE:
+            return basicUnsetRefersToLNodeType( msgs );
+        case SclPackage.ANY_LN__INPUTS:
+            return basicUnsetInputs( msgs );
+        case SclPackage.ANY_LN__LOG:
+            return ( ( InternalEList< ? > ) getLog() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ANY_LN__DOI:
+            return ( ( InternalEList< ? > ) getDOI() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ANY_LN__REPORT_CONTROL:
+            return ( ( InternalEList< ? > ) getReportControl() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ANY_LN__LOG_CONTROL:
+            return ( ( InternalEList< ? > ) getLogControl() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ANY_LN__DATA_SET:
+            return ( ( InternalEList< ? > ) getDataSet() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN:
+            return ( ( InternalEList< ? > ) getReferredByClientLN() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL:
+            return ( ( InternalEList< ? > ) getReferredByLogControl() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION:
+            return ( ( InternalEList< ? > ) getReferredByAssociation() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ANY_LN__REFERRED_BY_IED_NAME:
+            return ( ( InternalEList< ? > ) getReferredByIEDName() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ANY_LN__REFERRED_BY_LNODE:
+            return ( ( InternalEList< ? > ) getReferredByLNode() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ANY_LN__CONTROL_WITH_TRIGGER_OPT:
+            return ( ( InternalEList< ? > ) getControlWithTriggerOpt() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ANY_LN__CONTROL:
+            return ( ( InternalEList< ? > ) getControl() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1241,45 +1220,45 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.ANY_LN__INST:
-                return getInst();
-            case SclPackage.ANY_LN__LN_CLASS:
-                return getLnClass();
-            case SclPackage.ANY_LN__LN_TYPE:
-                return getLnType();
-            case SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE:
-                return getRefersToLNodeType();
-            case SclPackage.ANY_LN__INPUTS:
-                return getInputs();
-            case SclPackage.ANY_LN__LOG:
-                return getLog();
-            case SclPackage.ANY_LN__DOI:
-                return getDOI();
-            case SclPackage.ANY_LN__REPORT_CONTROL:
-                return getReportControl();
-            case SclPackage.ANY_LN__LOG_CONTROL:
-                return getLogControl();
-            case SclPackage.ANY_LN__DATA_SET:
-                return getDataSet();
-            case SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN:
-                return getReferredByClientLN();
-            case SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL:
-                return getReferredByLogControl();
-            case SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION:
-                return getReferredByAssociation();
-            case SclPackage.ANY_LN__REFERRED_BY_IED_NAME:
-                return getReferredByIEDName();
-            case SclPackage.ANY_LN__REFERRED_BY_LNODE:
-                return getReferredByLNode();
-            case SclPackage.ANY_LN__CONTROL_WITH_TRIGGER_OPT:
-                if (coreType) return getControlWithTriggerOpt();
-                return ((FeatureMap.Internal)getControlWithTriggerOpt()).getWrapper();
-            case SclPackage.ANY_LN__CONTROL:
-                if (coreType) return getControl();
-                return ((FeatureMap.Internal)getControl()).getWrapper();
+        switch( featureID ) {
+        case SclPackage.ANY_LN__INST:
+            return getInst();
+        case SclPackage.ANY_LN__LN_CLASS:
+            return getLnClass();
+        case SclPackage.ANY_LN__LN_TYPE:
+            return getLnType();
+        case SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE:
+            return getRefersToLNodeType();
+        case SclPackage.ANY_LN__INPUTS:
+            return getInputs();
+        case SclPackage.ANY_LN__LOG:
+            return getLog();
+        case SclPackage.ANY_LN__DOI:
+            return getDOI();
+        case SclPackage.ANY_LN__REPORT_CONTROL:
+            return getReportControl();
+        case SclPackage.ANY_LN__LOG_CONTROL:
+            return getLogControl();
+        case SclPackage.ANY_LN__DATA_SET:
+            return getDataSet();
+        case SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN:
+            return getReferredByClientLN();
+        case SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL:
+            return getReferredByLogControl();
+        case SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION:
+            return getReferredByAssociation();
+        case SclPackage.ANY_LN__REFERRED_BY_IED_NAME:
+            return getReferredByIEDName();
+        case SclPackage.ANY_LN__REFERRED_BY_LNODE:
+            return getReferredByLNode();
+        case SclPackage.ANY_LN__CONTROL_WITH_TRIGGER_OPT:
+            if( coreType ) return getControlWithTriggerOpt();
+            return ( ( FeatureMap.Internal ) getControlWithTriggerOpt() ).getWrapper();
+        case SclPackage.ANY_LN__CONTROL:
+            if( coreType ) return getControl();
+            return ( ( FeatureMap.Internal ) getControl() ).getWrapper();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -1290,70 +1269,70 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.ANY_LN__INST:
-                setInst((String)newValue);
-                return;
-            case SclPackage.ANY_LN__LN_CLASS:
-                setLnClass((String)newValue);
-                return;
-            case SclPackage.ANY_LN__LN_TYPE:
-                setLnType((String)newValue);
-                return;
-            case SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE:
-                setRefersToLNodeType((LNodeType)newValue);
-                return;
-            case SclPackage.ANY_LN__INPUTS:
-                setInputs((Inputs)newValue);
-                return;
-            case SclPackage.ANY_LN__LOG:
-                getLog().clear();
-                getLog().addAll((Collection<? extends Log>)newValue);
-                return;
-            case SclPackage.ANY_LN__DOI:
-                getDOI().clear();
-                getDOI().addAll((Collection<? extends DOI>)newValue);
-                return;
-            case SclPackage.ANY_LN__REPORT_CONTROL:
-                getReportControl().clear();
-                getReportControl().addAll((Collection<? extends ReportControl>)newValue);
-                return;
-            case SclPackage.ANY_LN__LOG_CONTROL:
-                getLogControl().clear();
-                getLogControl().addAll((Collection<? extends LogControl>)newValue);
-                return;
-            case SclPackage.ANY_LN__DATA_SET:
-                getDataSet().clear();
-                getDataSet().addAll((Collection<? extends DataSet>)newValue);
-                return;
-            case SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN:
-                getReferredByClientLN().clear();
-                getReferredByClientLN().addAll((Collection<? extends ClientLN>)newValue);
-                return;
-            case SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL:
-                getReferredByLogControl().clear();
-                getReferredByLogControl().addAll((Collection<? extends LogControl>)newValue);
-                return;
-            case SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION:
-                getReferredByAssociation().clear();
-                getReferredByAssociation().addAll((Collection<? extends Association>)newValue);
-                return;
-            case SclPackage.ANY_LN__REFERRED_BY_IED_NAME:
-                getReferredByIEDName().clear();
-                getReferredByIEDName().addAll((Collection<? extends IEDName>)newValue);
-                return;
-            case SclPackage.ANY_LN__REFERRED_BY_LNODE:
-                getReferredByLNode().clear();
-                getReferredByLNode().addAll((Collection<? extends LNode>)newValue);
-                return;
-            case SclPackage.ANY_LN__CONTROL_WITH_TRIGGER_OPT:
-                ((FeatureMap.Internal)getControlWithTriggerOpt()).set(newValue);
-                return;
-            case SclPackage.ANY_LN__CONTROL:
-                ((FeatureMap.Internal)getControl()).set(newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.ANY_LN__INST:
+            setInst( ( String ) newValue );
+            return;
+        case SclPackage.ANY_LN__LN_CLASS:
+            setLnClass( ( String ) newValue );
+            return;
+        case SclPackage.ANY_LN__LN_TYPE:
+            setLnType( ( String ) newValue );
+            return;
+        case SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE:
+            setRefersToLNodeType( ( LNodeType ) newValue );
+            return;
+        case SclPackage.ANY_LN__INPUTS:
+            setInputs( ( Inputs ) newValue );
+            return;
+        case SclPackage.ANY_LN__LOG:
+            getLog().clear();
+            getLog().addAll( ( Collection< ? extends Log > ) newValue );
+            return;
+        case SclPackage.ANY_LN__DOI:
+            getDOI().clear();
+            getDOI().addAll( ( Collection< ? extends DOI > ) newValue );
+            return;
+        case SclPackage.ANY_LN__REPORT_CONTROL:
+            getReportControl().clear();
+            getReportControl().addAll( ( Collection< ? extends ReportControl > ) newValue );
+            return;
+        case SclPackage.ANY_LN__LOG_CONTROL:
+            getLogControl().clear();
+            getLogControl().addAll( ( Collection< ? extends LogControl > ) newValue );
+            return;
+        case SclPackage.ANY_LN__DATA_SET:
+            getDataSet().clear();
+            getDataSet().addAll( ( Collection< ? extends DataSet > ) newValue );
+            return;
+        case SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN:
+            getReferredByClientLN().clear();
+            getReferredByClientLN().addAll( ( Collection< ? extends ClientLN > ) newValue );
+            return;
+        case SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL:
+            getReferredByLogControl().clear();
+            getReferredByLogControl().addAll( ( Collection< ? extends LogControl > ) newValue );
+            return;
+        case SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION:
+            getReferredByAssociation().clear();
+            getReferredByAssociation().addAll( ( Collection< ? extends Association > ) newValue );
+            return;
+        case SclPackage.ANY_LN__REFERRED_BY_IED_NAME:
+            getReferredByIEDName().clear();
+            getReferredByIEDName().addAll( ( Collection< ? extends IEDName > ) newValue );
+            return;
+        case SclPackage.ANY_LN__REFERRED_BY_LNODE:
+            getReferredByLNode().clear();
+            getReferredByLNode().addAll( ( Collection< ? extends LNode > ) newValue );
+            return;
+        case SclPackage.ANY_LN__CONTROL_WITH_TRIGGER_OPT:
+            ( ( FeatureMap.Internal ) getControlWithTriggerOpt() ).set( newValue );
+            return;
+        case SclPackage.ANY_LN__CONTROL:
+            ( ( FeatureMap.Internal ) getControl() ).set( newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -1363,60 +1342,60 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ANY_LN__INST:
-                unsetInst();
-                return;
-            case SclPackage.ANY_LN__LN_CLASS:
-                unsetLnClass();
-                return;
-            case SclPackage.ANY_LN__LN_TYPE:
-                unsetLnType();
-                return;
-            case SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE:
-                unsetRefersToLNodeType();
-                return;
-            case SclPackage.ANY_LN__INPUTS:
-                unsetInputs();
-                return;
-            case SclPackage.ANY_LN__LOG:
-                unsetLog();
-                return;
-            case SclPackage.ANY_LN__DOI:
-                unsetDOI();
-                return;
-            case SclPackage.ANY_LN__REPORT_CONTROL:
-                unsetReportControl();
-                return;
-            case SclPackage.ANY_LN__LOG_CONTROL:
-                unsetLogControl();
-                return;
-            case SclPackage.ANY_LN__DATA_SET:
-                unsetDataSet();
-                return;
-            case SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN:
-                unsetReferredByClientLN();
-                return;
-            case SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL:
-                unsetReferredByLogControl();
-                return;
-            case SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION:
-                unsetReferredByAssociation();
-                return;
-            case SclPackage.ANY_LN__REFERRED_BY_IED_NAME:
-                unsetReferredByIEDName();
-                return;
-            case SclPackage.ANY_LN__REFERRED_BY_LNODE:
-                unsetReferredByLNode();
-                return;
-            case SclPackage.ANY_LN__CONTROL_WITH_TRIGGER_OPT:
-                unsetControlWithTriggerOpt();
-                return;
-            case SclPackage.ANY_LN__CONTROL:
-                unsetControl();
-                return;
+        switch( featureID ) {
+        case SclPackage.ANY_LN__INST:
+            unsetInst();
+            return;
+        case SclPackage.ANY_LN__LN_CLASS:
+            unsetLnClass();
+            return;
+        case SclPackage.ANY_LN__LN_TYPE:
+            unsetLnType();
+            return;
+        case SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE:
+            unsetRefersToLNodeType();
+            return;
+        case SclPackage.ANY_LN__INPUTS:
+            unsetInputs();
+            return;
+        case SclPackage.ANY_LN__LOG:
+            unsetLog();
+            return;
+        case SclPackage.ANY_LN__DOI:
+            unsetDOI();
+            return;
+        case SclPackage.ANY_LN__REPORT_CONTROL:
+            unsetReportControl();
+            return;
+        case SclPackage.ANY_LN__LOG_CONTROL:
+            unsetLogControl();
+            return;
+        case SclPackage.ANY_LN__DATA_SET:
+            unsetDataSet();
+            return;
+        case SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN:
+            unsetReferredByClientLN();
+            return;
+        case SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL:
+            unsetReferredByLogControl();
+            return;
+        case SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION:
+            unsetReferredByAssociation();
+            return;
+        case SclPackage.ANY_LN__REFERRED_BY_IED_NAME:
+            unsetReferredByIEDName();
+            return;
+        case SclPackage.ANY_LN__REFERRED_BY_LNODE:
+            unsetReferredByLNode();
+            return;
+        case SclPackage.ANY_LN__CONTROL_WITH_TRIGGER_OPT:
+            unsetControlWithTriggerOpt();
+            return;
+        case SclPackage.ANY_LN__CONTROL:
+            unsetControl();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -1426,43 +1405,43 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ANY_LN__INST:
-                return isSetInst();
-            case SclPackage.ANY_LN__LN_CLASS:
-                return isSetLnClass();
-            case SclPackage.ANY_LN__LN_TYPE:
-                return isSetLnType();
-            case SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE:
-                return isSetRefersToLNodeType();
-            case SclPackage.ANY_LN__INPUTS:
-                return isSetInputs();
-            case SclPackage.ANY_LN__LOG:
-                return isSetLog();
-            case SclPackage.ANY_LN__DOI:
-                return isSetDOI();
-            case SclPackage.ANY_LN__REPORT_CONTROL:
-                return isSetReportControl();
-            case SclPackage.ANY_LN__LOG_CONTROL:
-                return isSetLogControl();
-            case SclPackage.ANY_LN__DATA_SET:
-                return isSetDataSet();
-            case SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN:
-                return isSetReferredByClientLN();
-            case SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL:
-                return isSetReferredByLogControl();
-            case SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION:
-                return isSetReferredByAssociation();
-            case SclPackage.ANY_LN__REFERRED_BY_IED_NAME:
-                return isSetReferredByIEDName();
-            case SclPackage.ANY_LN__REFERRED_BY_LNODE:
-                return isSetReferredByLNode();
-            case SclPackage.ANY_LN__CONTROL_WITH_TRIGGER_OPT:
-                return isSetControlWithTriggerOpt();
-            case SclPackage.ANY_LN__CONTROL:
-                return isSetControl();
+        switch( featureID ) {
+        case SclPackage.ANY_LN__INST:
+            return isSetInst();
+        case SclPackage.ANY_LN__LN_CLASS:
+            return isSetLnClass();
+        case SclPackage.ANY_LN__LN_TYPE:
+            return isSetLnType();
+        case SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE:
+            return isSetRefersToLNodeType();
+        case SclPackage.ANY_LN__INPUTS:
+            return isSetInputs();
+        case SclPackage.ANY_LN__LOG:
+            return isSetLog();
+        case SclPackage.ANY_LN__DOI:
+            return isSetDOI();
+        case SclPackage.ANY_LN__REPORT_CONTROL:
+            return isSetReportControl();
+        case SclPackage.ANY_LN__LOG_CONTROL:
+            return isSetLogControl();
+        case SclPackage.ANY_LN__DATA_SET:
+            return isSetDataSet();
+        case SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN:
+            return isSetReferredByClientLN();
+        case SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL:
+            return isSetReferredByLogControl();
+        case SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION:
+            return isSetReferredByAssociation();
+        case SclPackage.ANY_LN__REFERRED_BY_IED_NAME:
+            return isSetReferredByIEDName();
+        case SclPackage.ANY_LN__REFERRED_BY_LNODE:
+            return isSetReferredByLNode();
+        case SclPackage.ANY_LN__CONTROL_WITH_TRIGGER_OPT:
+            return isSetControlWithTriggerOpt();
+        case SclPackage.ANY_LN__CONTROL:
+            return isSetControl();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -1471,14 +1450,14 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      * @generated
      */
     @Override
-    public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-        switch (operationID) {
-            case SclPackage.ANY_LN___GET_PARENT_LDEVICE:
-                return getParentLDevice();
-            case SclPackage.ANY_LN___GET_NAMESPACE:
-                return getNamespace();
+    public Object eInvoke( int operationID, EList< ? > arguments ) throws InvocationTargetException {
+        switch( operationID ) {
+        case SclPackage.ANY_LN___GET_PARENT_LDEVICE:
+            return getParentLDevice();
+        case SclPackage.ANY_LN___GET_NAMESPACE:
+            return getNamespace();
         }
-        return super.eInvoke(operationID, arguments);
+        return super.eInvoke( operationID, arguments );
     }
 
     /**
@@ -1488,18 +1467,27 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (inst: ");
-        if (instESet) result.append(inst); else result.append("<unset>");
-        result.append(", lnClass: ");
-        if (lnClassESet) result.append(lnClass); else result.append("<unset>");
-        result.append(", lnType: ");
-        if (lnTypeESet) result.append(lnType); else result.append("<unset>");
-        result.append(", Control: ");
-        result.append(control);
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (inst: " );
+        if( instESet )
+            result.append( inst );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnClass: " );
+        if( lnClassESet )
+            result.append( lnClass );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnType: " );
+        if( lnTypeESet )
+            result.append( lnType );
+        else
+            result.append( "<unset>" );
+        result.append( ", Control: " );
+        result.append( control );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -1507,14 +1495,14 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         // lnType  The instantiable type definition of this logical node, reference to a LNodeType definition
         // lnClass The LN class according to IEC 61850-7-x
         // inst    The LN instance number identifying this LN – an unsigned integer
 
         String messagePrefix = "[SCL links] while resolving link from AnyLN on line " + getLineNumber() + ": ";
 
-        if(( getLnType() == null ) || getLnType().isEmpty() ) {
+        if( ( getLnType() == null ) || getLnType().isEmpty() ) {
             console.warning( messagePrefix, "lnType is missing" );
             return;
         }
@@ -1524,23 +1512,24 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
             return;
         }
 
-        List< LNodeType > res =
-                dtt
+        List< LNodeType > res = dtt
                 .getLNodeType()
                 .stream()
-                .filter( lnt -> getLnType().equals( lnt.getId() ))
+                .filter( lnt -> getLnType().equals( lnt.getId() ) )
                 .collect( Collectors.toList() );
-        
+
         String mess = "LNodeType( id = " + getLnType() + " )";
         if( res.size() != 1 ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess, res.size() );
             return;
         }
         setRefersToLNodeType( res.get( 0 ) );
-        console.info( "[SCL links] AnyLN on line ", getLineNumber(), " refers to ", mess, " on line ", getRefersToLNodeType().getLineNumber() );
-        
-        if(( getLnClass() != null ) && ! getLnClass().equals( getRefersToLNodeType().getLnClass() )) {
-            console.warning( messagePrefix, "lnClass in ", mess, "(", getRefersToLNodeType().getLnClass(), ") is not ", getLnClass() );
+        console.info( "[SCL links] AnyLN on line ", getLineNumber(), " refers to ", mess, " on line ",
+                getRefersToLNodeType().getLineNumber() );
+
+        if( ( getLnClass() != null ) && !getLnClass().equals( getRefersToLNodeType().getLnClass() ) ) {
+            console.warning( messagePrefix, "lnClass in ", mess, "(", getRefersToLNodeType().getLnClass(), ") is not ",
+                    getLnClass() );
         }
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AssociationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AssociationImpl.java
index 6ac251e..4f3cf60 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AssociationImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AssociationImpl.java
@@ -349,13 +349,14 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      * @generated
      */
     @Override
-    public void setDesc(String newDesc) {
+    public void setDesc( String newDesc ) {
         String oldDesc = desc;
         desc = newDesc;
         boolean oldDescESet = descESet;
         descESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ASSOCIATION__DESC, oldDesc, desc, !oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__DESC, oldDesc, desc,
+                    !oldDescESet ) );
     }
 
     /**
@@ -369,8 +370,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         boolean oldDescESet = descESet;
         desc = DESC_EDEFAULT;
         descESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ASSOCIATION__DESC, oldDesc, DESC_EDEFAULT, oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__DESC, oldDesc,
+                    DESC_EDEFAULT, oldDescESet ) );
     }
 
     /**
@@ -404,8 +406,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         associationID = newAssociationID;
         boolean oldAssociationIDESet = associationIDESet;
         associationIDESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ASSOCIATION__ASSOCIATION_ID, oldAssociationID, associationID, !oldAssociationIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__ASSOCIATION_ID,
+                    oldAssociationID, associationID, !oldAssociationIDESet ) );
     }
 
     /**
@@ -419,8 +422,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         boolean oldAssociationIDESet = associationIDESet;
         associationID = ASSOCIATION_ID_EDEFAULT;
         associationIDESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ASSOCIATION__ASSOCIATION_ID, oldAssociationID, ASSOCIATION_ID_EDEFAULT, oldAssociationIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__ASSOCIATION_ID,
+                    oldAssociationID, ASSOCIATION_ID_EDEFAULT, oldAssociationIDESet ) );
     }
 
     /**
@@ -454,8 +458,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         iedName = newIedName;
         boolean oldIedNameESet = iedNameESet;
         iedNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ASSOCIATION__IED_NAME, oldIedName, iedName, !oldIedNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__IED_NAME, oldIedName,
+                    iedName, !oldIedNameESet ) );
     }
 
     /**
@@ -469,8 +474,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         boolean oldIedNameESet = iedNameESet;
         iedName = IED_NAME_EDEFAULT;
         iedNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ASSOCIATION__IED_NAME, oldIedName, IED_NAME_EDEFAULT, oldIedNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__IED_NAME, oldIedName,
+                    IED_NAME_EDEFAULT, oldIedNameESet ) );
     }
 
     /**
@@ -504,8 +510,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         kind = newKind == null ? KIND_EDEFAULT : newKind;
         boolean oldKindESet = kindESet;
         kindESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ASSOCIATION__KIND, oldKind, kind, !oldKindESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__KIND, oldKind, kind,
+                    !oldKindESet ) );
     }
 
     /**
@@ -519,8 +526,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         boolean oldKindESet = kindESet;
         kind = KIND_EDEFAULT;
         kindESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ASSOCIATION__KIND, oldKind, KIND_EDEFAULT, oldKindESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__KIND, oldKind,
+                    KIND_EDEFAULT, oldKindESet ) );
     }
 
     /**
@@ -540,8 +548,8 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      */
     @Override
     public Server getParentServer() {
-        if (eContainerFeatureID() != SclPackage.ASSOCIATION__PARENT_SERVER) return null;
-        return (Server)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.ASSOCIATION__PARENT_SERVER ) return null;
+        return ( Server ) eInternalContainer();
     }
 
     /**
@@ -549,8 +557,8 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServer(Server newParentServer, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServer, SclPackage.ASSOCIATION__PARENT_SERVER, msgs);
+    public NotificationChain basicSetParentServer( Server newParentServer, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServer, SclPackage.ASSOCIATION__PARENT_SERVER, msgs );
         return msgs;
     }
 
@@ -560,20 +568,23 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      * @generated
      */
     @Override
-    public void setParentServer(Server newParentServer) {
-        if (newParentServer != eInternalContainer() || (eContainerFeatureID() != SclPackage.ASSOCIATION__PARENT_SERVER && newParentServer != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServer))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServer( Server newParentServer ) {
+        if( newParentServer != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.ASSOCIATION__PARENT_SERVER && newParentServer != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServer ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServer != null)
-                msgs = ((InternalEObject)newParentServer).eInverseAdd(this, SclPackage.SERVER__ASSOCIATION, Server.class, msgs);
-            msgs = basicSetParentServer(newParentServer, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServer != null )
+                msgs = ( ( InternalEObject ) newParentServer ).eInverseAdd( this, SclPackage.SERVER__ASSOCIATION,
+                        Server.class, msgs );
+            msgs = basicSetParentServer( newParentServer, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ASSOCIATION__PARENT_SERVER, newParentServer, newParentServer));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__PARENT_SERVER,
+                    newParentServer, newParentServer ) );
     }
 
     /**
@@ -597,8 +608,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         ldInst = newLdInst;
         boolean oldLdInstESet = ldInstESet;
         ldInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ASSOCIATION__LD_INST, oldLdInst, ldInst, !oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__LD_INST, oldLdInst, ldInst,
+                    !oldLdInstESet ) );
     }
 
     /**
@@ -612,8 +624,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         boolean oldLdInstESet = ldInstESet;
         ldInst = LD_INST_EDEFAULT;
         ldInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ASSOCIATION__LD_INST, oldLdInst, LD_INST_EDEFAULT, oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__LD_INST, oldLdInst,
+                    LD_INST_EDEFAULT, oldLdInstESet ) );
     }
 
     /**
@@ -647,8 +660,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         lnClass = newLnClass;
         boolean oldLnClassESet = lnClassESet;
         lnClassESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ASSOCIATION__LN_CLASS, oldLnClass, lnClass, !oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__LN_CLASS, oldLnClass,
+                    lnClass, !oldLnClassESet ) );
     }
 
     /**
@@ -662,8 +676,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         boolean oldLnClassESet = lnClassESet;
         lnClass = LN_CLASS_EDEFAULT;
         lnClassESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ASSOCIATION__LN_CLASS, oldLnClass, LN_CLASS_EDEFAULT, oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__LN_CLASS, oldLnClass,
+                    LN_CLASS_EDEFAULT, oldLnClassESet ) );
     }
 
     /**
@@ -697,8 +712,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         lnInst = newLnInst;
         boolean oldLnInstESet = lnInstESet;
         lnInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ASSOCIATION__LN_INST, oldLnInst, lnInst, !oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__LN_INST, oldLnInst, lnInst,
+                    !oldLnInstESet ) );
     }
 
     /**
@@ -712,8 +728,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         boolean oldLnInstESet = lnInstESet;
         lnInst = LN_INST_EDEFAULT;
         lnInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ASSOCIATION__LN_INST, oldLnInst, LN_INST_EDEFAULT, oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__LN_INST, oldLnInst,
+                    LN_INST_EDEFAULT, oldLnInstESet ) );
     }
 
     /**
@@ -747,8 +764,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         prefix = newPrefix;
         boolean oldPrefixESet = prefixESet;
         prefixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ASSOCIATION__PREFIX, oldPrefix, prefix, !oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__PREFIX, oldPrefix, prefix,
+                    !oldPrefixESet ) );
     }
 
     /**
@@ -762,8 +780,9 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         boolean oldPrefixESet = prefixESet;
         prefix = PREFIX_EDEFAULT;
         prefixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ASSOCIATION__PREFIX, oldPrefix, PREFIX_EDEFAULT, oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__PREFIX, oldPrefix,
+                    PREFIX_EDEFAULT, oldPrefixESet ) );
     }
 
     /**
@@ -796,9 +815,14 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         refersToAnyLN = newRefersToAnyLN;
         boolean oldRefersToAnyLNESet = refersToAnyLNESet;
         refersToAnyLNESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.ASSOCIATION__REFERS_TO_ANY_LN, oldRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.ASSOCIATION__REFERS_TO_ANY_LN, oldRefersToAnyLN, newRefersToAnyLN,
+                    !oldRefersToAnyLNESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -810,20 +834,23 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      */
     @Override
     public void setRefersToAnyLN( AnyLN newRefersToAnyLN ) {
-        if (newRefersToAnyLN != refersToAnyLN) {
+        if( newRefersToAnyLN != refersToAnyLN ) {
             NotificationChain msgs = null;
-            if (refersToAnyLN != null)
-                msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION, AnyLN.class, msgs);
-            if (newRefersToAnyLN != null)
-                msgs = ((InternalEObject)newRefersToAnyLN).eInverseAdd(this, SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION, AnyLN.class, msgs);
-            msgs = basicSetRefersToAnyLN(newRefersToAnyLN, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToAnyLN != null )
+                msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this,
+                        SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION, AnyLN.class, msgs );
+            if( newRefersToAnyLN != null )
+                msgs = ( ( InternalEObject ) newRefersToAnyLN ).eInverseAdd( this,
+                        SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION, AnyLN.class, msgs );
+            msgs = basicSetRefersToAnyLN( newRefersToAnyLN, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAnyLNESet = refersToAnyLNESet;
             refersToAnyLNESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ASSOCIATION__REFERS_TO_ANY_LN, newRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__REFERS_TO_ANY_LN,
+                        newRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet ) );
         }
     }
 
@@ -837,9 +864,13 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         refersToAnyLN = null;
         boolean oldRefersToAnyLNESet = refersToAnyLNESet;
         refersToAnyLNESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.ASSOCIATION__REFERS_TO_ANY_LN, oldRefersToAnyLN, null, oldRefersToAnyLNESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.ASSOCIATION__REFERS_TO_ANY_LN, oldRefersToAnyLN, null, oldRefersToAnyLNESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -851,17 +882,19 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      */
     @Override
     public void unsetRefersToAnyLN() {
-        if (refersToAnyLN != null) {
+        if( refersToAnyLN != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION, AnyLN.class, msgs);
-            msgs = basicUnsetRefersToAnyLN(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this,
+                    SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION, AnyLN.class, msgs );
+            msgs = basicUnsetRefersToAnyLN( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAnyLNESet = refersToAnyLNESet;
             refersToAnyLNESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ASSOCIATION__REFERS_TO_ANY_LN, null, null, oldRefersToAnyLNESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__REFERS_TO_ANY_LN,
+                        null, null, oldRefersToAnyLNESet ) );
         }
     }
 
@@ -882,17 +915,18 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ASSOCIATION__PARENT_SERVER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServer((Server)otherEnd, msgs);
-            case SclPackage.ASSOCIATION__REFERS_TO_ANY_LN:
-                if (refersToAnyLN != null)
-                    msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION, AnyLN.class, msgs);
-                return basicSetRefersToAnyLN((AnyLN)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ASSOCIATION__PARENT_SERVER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServer( ( Server ) otherEnd, msgs );
+        case SclPackage.ASSOCIATION__REFERS_TO_ANY_LN:
+            if( refersToAnyLN != null )
+                msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this,
+                        SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION, AnyLN.class, msgs );
+            return basicSetRefersToAnyLN( ( AnyLN ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -902,13 +936,13 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ASSOCIATION__PARENT_SERVER:
-                return basicSetParentServer(null, msgs);
-            case SclPackage.ASSOCIATION__REFERS_TO_ANY_LN:
-                return basicUnsetRefersToAnyLN(msgs);
+        switch( featureID ) {
+        case SclPackage.ASSOCIATION__PARENT_SERVER:
+            return basicSetParentServer( null, msgs );
+        case SclPackage.ASSOCIATION__REFERS_TO_ANY_LN:
+            return basicUnsetRefersToAnyLN( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -918,11 +952,11 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.ASSOCIATION__PARENT_SERVER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVER__ASSOCIATION, Server.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.ASSOCIATION__PARENT_SERVER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVER__ASSOCIATION, Server.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -932,29 +966,29 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.ASSOCIATION__DESC:
-                return getDesc();
-            case SclPackage.ASSOCIATION__IED_NAME:
-                return getIedName();
-            case SclPackage.ASSOCIATION__LD_INST:
-                return getLdInst();
-            case SclPackage.ASSOCIATION__LN_CLASS:
-                return getLnClass();
-            case SclPackage.ASSOCIATION__LN_INST:
-                return getLnInst();
-            case SclPackage.ASSOCIATION__PREFIX:
-                return getPrefix();
-            case SclPackage.ASSOCIATION__ASSOCIATION_ID:
-                return getAssociationID();
-            case SclPackage.ASSOCIATION__KIND:
-                return getKind();
-            case SclPackage.ASSOCIATION__PARENT_SERVER:
-                return getParentServer();
-            case SclPackage.ASSOCIATION__REFERS_TO_ANY_LN:
-                return getRefersToAnyLN();
+        switch( featureID ) {
+        case SclPackage.ASSOCIATION__DESC:
+            return getDesc();
+        case SclPackage.ASSOCIATION__IED_NAME:
+            return getIedName();
+        case SclPackage.ASSOCIATION__LD_INST:
+            return getLdInst();
+        case SclPackage.ASSOCIATION__LN_CLASS:
+            return getLnClass();
+        case SclPackage.ASSOCIATION__LN_INST:
+            return getLnInst();
+        case SclPackage.ASSOCIATION__PREFIX:
+            return getPrefix();
+        case SclPackage.ASSOCIATION__ASSOCIATION_ID:
+            return getAssociationID();
+        case SclPackage.ASSOCIATION__KIND:
+            return getKind();
+        case SclPackage.ASSOCIATION__PARENT_SERVER:
+            return getParentServer();
+        case SclPackage.ASSOCIATION__REFERS_TO_ANY_LN:
+            return getRefersToAnyLN();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -964,39 +998,39 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.ASSOCIATION__DESC:
-                setDesc((String)newValue);
-                return;
-            case SclPackage.ASSOCIATION__IED_NAME:
-                setIedName((String)newValue);
-                return;
-            case SclPackage.ASSOCIATION__LD_INST:
-                setLdInst((String)newValue);
-                return;
-            case SclPackage.ASSOCIATION__LN_CLASS:
-                setLnClass((String)newValue);
-                return;
-            case SclPackage.ASSOCIATION__LN_INST:
-                setLnInst((String)newValue);
-                return;
-            case SclPackage.ASSOCIATION__PREFIX:
-                setPrefix((String)newValue);
-                return;
-            case SclPackage.ASSOCIATION__ASSOCIATION_ID:
-                setAssociationID((String)newValue);
-                return;
-            case SclPackage.ASSOCIATION__KIND:
-                setKind((AssociationKindEnum)newValue);
-                return;
-            case SclPackage.ASSOCIATION__PARENT_SERVER:
-                setParentServer((Server)newValue);
-                return;
-            case SclPackage.ASSOCIATION__REFERS_TO_ANY_LN:
-                setRefersToAnyLN((AnyLN)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.ASSOCIATION__DESC:
+            setDesc( ( String ) newValue );
+            return;
+        case SclPackage.ASSOCIATION__IED_NAME:
+            setIedName( ( String ) newValue );
+            return;
+        case SclPackage.ASSOCIATION__LD_INST:
+            setLdInst( ( String ) newValue );
+            return;
+        case SclPackage.ASSOCIATION__LN_CLASS:
+            setLnClass( ( String ) newValue );
+            return;
+        case SclPackage.ASSOCIATION__LN_INST:
+            setLnInst( ( String ) newValue );
+            return;
+        case SclPackage.ASSOCIATION__PREFIX:
+            setPrefix( ( String ) newValue );
+            return;
+        case SclPackage.ASSOCIATION__ASSOCIATION_ID:
+            setAssociationID( ( String ) newValue );
+            return;
+        case SclPackage.ASSOCIATION__KIND:
+            setKind( ( AssociationKindEnum ) newValue );
+            return;
+        case SclPackage.ASSOCIATION__PARENT_SERVER:
+            setParentServer( ( Server ) newValue );
+            return;
+        case SclPackage.ASSOCIATION__REFERS_TO_ANY_LN:
+            setRefersToAnyLN( ( AnyLN ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -1006,39 +1040,39 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ASSOCIATION__DESC:
-                unsetDesc();
-                return;
-            case SclPackage.ASSOCIATION__IED_NAME:
-                unsetIedName();
-                return;
-            case SclPackage.ASSOCIATION__LD_INST:
-                unsetLdInst();
-                return;
-            case SclPackage.ASSOCIATION__LN_CLASS:
-                unsetLnClass();
-                return;
-            case SclPackage.ASSOCIATION__LN_INST:
-                unsetLnInst();
-                return;
-            case SclPackage.ASSOCIATION__PREFIX:
-                unsetPrefix();
-                return;
-            case SclPackage.ASSOCIATION__ASSOCIATION_ID:
-                unsetAssociationID();
-                return;
-            case SclPackage.ASSOCIATION__KIND:
-                unsetKind();
-                return;
-            case SclPackage.ASSOCIATION__PARENT_SERVER:
-                setParentServer((Server)null);
-                return;
-            case SclPackage.ASSOCIATION__REFERS_TO_ANY_LN:
-                unsetRefersToAnyLN();
-                return;
+        switch( featureID ) {
+        case SclPackage.ASSOCIATION__DESC:
+            unsetDesc();
+            return;
+        case SclPackage.ASSOCIATION__IED_NAME:
+            unsetIedName();
+            return;
+        case SclPackage.ASSOCIATION__LD_INST:
+            unsetLdInst();
+            return;
+        case SclPackage.ASSOCIATION__LN_CLASS:
+            unsetLnClass();
+            return;
+        case SclPackage.ASSOCIATION__LN_INST:
+            unsetLnInst();
+            return;
+        case SclPackage.ASSOCIATION__PREFIX:
+            unsetPrefix();
+            return;
+        case SclPackage.ASSOCIATION__ASSOCIATION_ID:
+            unsetAssociationID();
+            return;
+        case SclPackage.ASSOCIATION__KIND:
+            unsetKind();
+            return;
+        case SclPackage.ASSOCIATION__PARENT_SERVER:
+            setParentServer( ( Server ) null );
+            return;
+        case SclPackage.ASSOCIATION__REFERS_TO_ANY_LN:
+            unsetRefersToAnyLN();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -1048,29 +1082,29 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ASSOCIATION__DESC:
-                return isSetDesc();
-            case SclPackage.ASSOCIATION__IED_NAME:
-                return isSetIedName();
-            case SclPackage.ASSOCIATION__LD_INST:
-                return isSetLdInst();
-            case SclPackage.ASSOCIATION__LN_CLASS:
-                return isSetLnClass();
-            case SclPackage.ASSOCIATION__LN_INST:
-                return isSetLnInst();
-            case SclPackage.ASSOCIATION__PREFIX:
-                return isSetPrefix();
-            case SclPackage.ASSOCIATION__ASSOCIATION_ID:
-                return isSetAssociationID();
-            case SclPackage.ASSOCIATION__KIND:
-                return isSetKind();
-            case SclPackage.ASSOCIATION__PARENT_SERVER:
-                return getParentServer() != null;
-            case SclPackage.ASSOCIATION__REFERS_TO_ANY_LN:
-                return isSetRefersToAnyLN();
+        switch( featureID ) {
+        case SclPackage.ASSOCIATION__DESC:
+            return isSetDesc();
+        case SclPackage.ASSOCIATION__IED_NAME:
+            return isSetIedName();
+        case SclPackage.ASSOCIATION__LD_INST:
+            return isSetLdInst();
+        case SclPackage.ASSOCIATION__LN_CLASS:
+            return isSetLnClass();
+        case SclPackage.ASSOCIATION__LN_INST:
+            return isSetLnInst();
+        case SclPackage.ASSOCIATION__PREFIX:
+            return isSetPrefix();
+        case SclPackage.ASSOCIATION__ASSOCIATION_ID:
+            return isSetAssociationID();
+        case SclPackage.ASSOCIATION__KIND:
+            return isSetKind();
+        case SclPackage.ASSOCIATION__PARENT_SERVER:
+            return getParentServer() != null;
+        case SclPackage.ASSOCIATION__REFERS_TO_ANY_LN:
+            return isSetRefersToAnyLN();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -1079,29 +1113,38 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      * @generated
      */
     @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDesc.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.ASSOCIATION__DESC: return SclPackage.AG_DESC__DESC;
-                default: return -1;
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDesc.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.ASSOCIATION__DESC:
+                return SclPackage.AG_DESC__DESC;
+            default:
+                return -1;
             }
         }
-        if (baseClass == AgLDRef.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.ASSOCIATION__IED_NAME: return SclPackage.AG_LD_REF__IED_NAME;
-                case SclPackage.ASSOCIATION__LD_INST: return SclPackage.AG_LD_REF__LD_INST;
-                default: return -1;
+        if( baseClass == AgLDRef.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.ASSOCIATION__IED_NAME:
+                return SclPackage.AG_LD_REF__IED_NAME;
+            case SclPackage.ASSOCIATION__LD_INST:
+                return SclPackage.AG_LD_REF__LD_INST;
+            default:
+                return -1;
             }
         }
-        if (baseClass == AgLNRef.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.ASSOCIATION__LN_CLASS: return SclPackage.AG_LN_REF__LN_CLASS;
-                case SclPackage.ASSOCIATION__LN_INST: return SclPackage.AG_LN_REF__LN_INST;
-                case SclPackage.ASSOCIATION__PREFIX: return SclPackage.AG_LN_REF__PREFIX;
-                default: return -1;
+        if( baseClass == AgLNRef.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.ASSOCIATION__LN_CLASS:
+                return SclPackage.AG_LN_REF__LN_CLASS;
+            case SclPackage.ASSOCIATION__LN_INST:
+                return SclPackage.AG_LN_REF__LN_INST;
+            case SclPackage.ASSOCIATION__PREFIX:
+                return SclPackage.AG_LN_REF__PREFIX;
+            default:
+                return -1;
             }
         }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
     }
 
     /**
@@ -1110,29 +1153,38 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      * @generated
      */
     @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDesc.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_DESC__DESC: return SclPackage.ASSOCIATION__DESC;
-                default: return -1;
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDesc.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_DESC__DESC:
+                return SclPackage.ASSOCIATION__DESC;
+            default:
+                return -1;
             }
         }
-        if (baseClass == AgLDRef.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_LD_REF__IED_NAME: return SclPackage.ASSOCIATION__IED_NAME;
-                case SclPackage.AG_LD_REF__LD_INST: return SclPackage.ASSOCIATION__LD_INST;
-                default: return -1;
+        if( baseClass == AgLDRef.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_LD_REF__IED_NAME:
+                return SclPackage.ASSOCIATION__IED_NAME;
+            case SclPackage.AG_LD_REF__LD_INST:
+                return SclPackage.ASSOCIATION__LD_INST;
+            default:
+                return -1;
             }
         }
-        if (baseClass == AgLNRef.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_LN_REF__LN_CLASS: return SclPackage.ASSOCIATION__LN_CLASS;
-                case SclPackage.AG_LN_REF__LN_INST: return SclPackage.ASSOCIATION__LN_INST;
-                case SclPackage.AG_LN_REF__PREFIX: return SclPackage.ASSOCIATION__PREFIX;
-                default: return -1;
+        if( baseClass == AgLNRef.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_LN_REF__LN_CLASS:
+                return SclPackage.ASSOCIATION__LN_CLASS;
+            case SclPackage.AG_LN_REF__LN_INST:
+                return SclPackage.ASSOCIATION__LN_INST;
+            case SclPackage.AG_LN_REF__PREFIX:
+                return SclPackage.ASSOCIATION__PREFIX;
+            default:
+                return -1;
             }
         }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
     }
 
     /**
@@ -1142,26 +1194,50 @@ public class AssociationImpl extends BaseElementImpl implements Association {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (desc: ");
-        if (descESet) result.append(desc); else result.append("<unset>");
-        result.append(", iedName: ");
-        if (iedNameESet) result.append(iedName); else result.append("<unset>");
-        result.append(", ldInst: ");
-        if (ldInstESet) result.append(ldInst); else result.append("<unset>");
-        result.append(", lnClass: ");
-        if (lnClassESet) result.append(lnClass); else result.append("<unset>");
-        result.append(", lnInst: ");
-        if (lnInstESet) result.append(lnInst); else result.append("<unset>");
-        result.append(", prefix: ");
-        if (prefixESet) result.append(prefix); else result.append("<unset>");
-        result.append(", associationID: ");
-        if (associationIDESet) result.append(associationID); else result.append("<unset>");
-        result.append(", kind: ");
-        if (kindESet) result.append(kind); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (desc: " );
+        if( descESet )
+            result.append( desc );
+        else
+            result.append( "<unset>" );
+        result.append( ", iedName: " );
+        if( iedNameESet )
+            result.append( iedName );
+        else
+            result.append( "<unset>" );
+        result.append( ", ldInst: " );
+        if( ldInstESet )
+            result.append( ldInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnClass: " );
+        if( lnClassESet )
+            result.append( lnClass );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnInst: " );
+        if( lnInstESet )
+            result.append( lnInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", prefix: " );
+        if( prefixESet )
+            result.append( prefix );
+        else
+            result.append( "<unset>" );
+        result.append( ", associationID: " );
+        if( associationIDESet )
+            result.append( associationID );
+        else
+            result.append( "<unset>" );
+        result.append( ", kind: " );
+        if( kindESet )
+            result.append( kind );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -1169,7 +1245,7 @@ public class AssociationImpl extends BaseElementImpl implements Association {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         // kind            The kind of pre-configured association, pre-established or predefined
         // associationID   The identification of a pre-configured association (otherwise empty)
         // iedName         The reference identifying the IED on which the client resides
@@ -1180,15 +1256,15 @@ public class AssociationImpl extends BaseElementImpl implements Association {
 
         String messagePrefix = "[SCL links] while resolving link from Association on line " + getLineNumber() + ": ";
 
-        if(( getIedName() == null ) || getIedName().isEmpty() ) {
+        if( ( getIedName() == null ) || getIedName().isEmpty() ) {
             console.warning( messagePrefix, "iedName is missing " );
             return;
         }
-        if(( getLdInst() == null ) || getLdInst().isEmpty() ) {
+        if( ( getLdInst() == null ) || getLdInst().isEmpty() ) {
             console.warning( messagePrefix, "ldInst is missing " );
             return;
         }
-        if(( getLnClass() == null ) || getLnClass().isEmpty() ) {
+        if( ( getLnClass() == null ) || getLnClass().isEmpty() ) {
             console.warning( messagePrefix, "lnClass is missing " );
             return;
         }
@@ -1213,7 +1289,8 @@ public class AssociationImpl extends BaseElementImpl implements Association {
         }
         console.verbose( messagePrefix, "found ", mess2, " on line ", lDevice.getLeft().getLineNumber() );
 
-        Pair< AnyLN, Integer > anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(), getPrefix() );
+        Pair< AnyLN, Integer > anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(),
+                getPrefix() );
         String mess3 = "LN( lnClass = " + getLnClass();
         if( getLnInst() != null ) {
             mess3 += ", inst = " + getLnInst();
@@ -1225,7 +1302,8 @@ public class AssociationImpl extends BaseElementImpl implements Association {
             return;
         }
         setRefersToAnyLN( anyLN.getLeft() );
-        console.info( "[SCL links] Association on line ", getLineNumber(), " refers to ", mess3, " on line ", getRefersToAnyLN().getLineNumber() );
+        console.info( "[SCL links] Association on line ", getLineNumber(), " refers to ", mess3, " on line ",
+                getRefersToAnyLN().getLineNumber() );
     }
 
 } //AssociationImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AuthenticationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AuthenticationImpl.java
index b592017..4cf9cea 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AuthenticationImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AuthenticationImpl.java
@@ -236,8 +236,9 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
         certificate = newCertificate;
         boolean oldCertificateESet = certificateESet;
         certificateESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AUTHENTICATION__CERTIFICATE, oldCertificate, certificate, !oldCertificateESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AUTHENTICATION__CERTIFICATE,
+                    oldCertificate, certificate, !oldCertificateESet ) );
     }
 
     /**
@@ -251,8 +252,9 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
         boolean oldCertificateESet = certificateESet;
         certificate = CERTIFICATE_EDEFAULT;
         certificateESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AUTHENTICATION__CERTIFICATE, oldCertificate, CERTIFICATE_EDEFAULT, oldCertificateESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AUTHENTICATION__CERTIFICATE,
+                    oldCertificate, CERTIFICATE_EDEFAULT, oldCertificateESet ) );
     }
 
     /**
@@ -286,8 +288,9 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
         none = newNone;
         boolean oldNoneESet = noneESet;
         noneESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AUTHENTICATION__NONE, oldNone, none, !oldNoneESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AUTHENTICATION__NONE, oldNone, none,
+                    !oldNoneESet ) );
     }
 
     /**
@@ -301,8 +304,9 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
         boolean oldNoneESet = noneESet;
         none = NONE_EDEFAULT;
         noneESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AUTHENTICATION__NONE, oldNone, NONE_EDEFAULT, oldNoneESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AUTHENTICATION__NONE, oldNone,
+                    NONE_EDEFAULT, oldNoneESet ) );
     }
 
     /**
@@ -336,8 +340,9 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
         password = newPassword;
         boolean oldPasswordESet = passwordESet;
         passwordESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AUTHENTICATION__PASSWORD, oldPassword, password, !oldPasswordESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AUTHENTICATION__PASSWORD, oldPassword,
+                    password, !oldPasswordESet ) );
     }
 
     /**
@@ -351,8 +356,9 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
         boolean oldPasswordESet = passwordESet;
         password = PASSWORD_EDEFAULT;
         passwordESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AUTHENTICATION__PASSWORD, oldPassword, PASSWORD_EDEFAULT, oldPasswordESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AUTHENTICATION__PASSWORD, oldPassword,
+                    PASSWORD_EDEFAULT, oldPasswordESet ) );
     }
 
     /**
@@ -386,8 +392,9 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
         strong = newStrong;
         boolean oldStrongESet = strongESet;
         strongESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AUTHENTICATION__STRONG, oldStrong, strong, !oldStrongESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AUTHENTICATION__STRONG, oldStrong,
+                    strong, !oldStrongESet ) );
     }
 
     /**
@@ -401,8 +408,9 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
         boolean oldStrongESet = strongESet;
         strong = STRONG_EDEFAULT;
         strongESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AUTHENTICATION__STRONG, oldStrong, STRONG_EDEFAULT, oldStrongESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AUTHENTICATION__STRONG, oldStrong,
+                    STRONG_EDEFAULT, oldStrongESet ) );
     }
 
     /**
@@ -436,8 +444,9 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
         weak = newWeak;
         boolean oldWeakESet = weakESet;
         weakESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AUTHENTICATION__WEAK, oldWeak, weak, !oldWeakESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AUTHENTICATION__WEAK, oldWeak, weak,
+                    !oldWeakESet ) );
     }
 
     /**
@@ -451,8 +460,9 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
         boolean oldWeakESet = weakESet;
         weak = WEAK_EDEFAULT;
         weakESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.AUTHENTICATION__WEAK, oldWeak, WEAK_EDEFAULT, oldWeakESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.AUTHENTICATION__WEAK, oldWeak,
+                    WEAK_EDEFAULT, oldWeakESet ) );
     }
 
     /**
@@ -472,8 +482,8 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
      */
     @Override
     public Server getParentServer() {
-        if (eContainerFeatureID() != SclPackage.AUTHENTICATION__PARENT_SERVER) return null;
-        return (Server)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.AUTHENTICATION__PARENT_SERVER ) return null;
+        return ( Server ) eInternalContainer();
     }
 
     /**
@@ -481,8 +491,9 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServer(Server newParentServer, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServer, SclPackage.AUTHENTICATION__PARENT_SERVER, msgs);
+    public NotificationChain basicSetParentServer( Server newParentServer, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServer, SclPackage.AUTHENTICATION__PARENT_SERVER,
+                msgs );
         return msgs;
     }
 
@@ -492,20 +503,23 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
      * @generated
      */
     @Override
-    public void setParentServer(Server newParentServer) {
-        if (newParentServer != eInternalContainer() || (eContainerFeatureID() != SclPackage.AUTHENTICATION__PARENT_SERVER && newParentServer != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServer))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServer( Server newParentServer ) {
+        if( newParentServer != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.AUTHENTICATION__PARENT_SERVER && newParentServer != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServer ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServer != null)
-                msgs = ((InternalEObject)newParentServer).eInverseAdd(this, SclPackage.SERVER__AUTHENTICATION, Server.class, msgs);
-            msgs = basicSetParentServer(newParentServer, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServer != null )
+                msgs = ( ( InternalEObject ) newParentServer ).eInverseAdd( this, SclPackage.SERVER__AUTHENTICATION,
+                        Server.class, msgs );
+            msgs = basicSetParentServer( newParentServer, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.AUTHENTICATION__PARENT_SERVER, newParentServer, newParentServer));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.AUTHENTICATION__PARENT_SERVER,
+                    newParentServer, newParentServer ) );
     }
 
     /**
@@ -515,13 +529,13 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.AUTHENTICATION__PARENT_SERVER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServer((Server)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.AUTHENTICATION__PARENT_SERVER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServer( ( Server ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -531,11 +545,11 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.AUTHENTICATION__PARENT_SERVER:
-                return basicSetParentServer(null, msgs);
+        switch( featureID ) {
+        case SclPackage.AUTHENTICATION__PARENT_SERVER:
+            return basicSetParentServer( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -545,11 +559,11 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.AUTHENTICATION__PARENT_SERVER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVER__AUTHENTICATION, Server.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.AUTHENTICATION__PARENT_SERVER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVER__AUTHENTICATION, Server.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -559,21 +573,21 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.AUTHENTICATION__CERTIFICATE:
-                return getCertificate();
-            case SclPackage.AUTHENTICATION__NONE:
-                return getNone();
-            case SclPackage.AUTHENTICATION__PASSWORD:
-                return getPassword();
-            case SclPackage.AUTHENTICATION__STRONG:
-                return getStrong();
-            case SclPackage.AUTHENTICATION__WEAK:
-                return getWeak();
-            case SclPackage.AUTHENTICATION__PARENT_SERVER:
-                return getParentServer();
+        switch( featureID ) {
+        case SclPackage.AUTHENTICATION__CERTIFICATE:
+            return getCertificate();
+        case SclPackage.AUTHENTICATION__NONE:
+            return getNone();
+        case SclPackage.AUTHENTICATION__PASSWORD:
+            return getPassword();
+        case SclPackage.AUTHENTICATION__STRONG:
+            return getStrong();
+        case SclPackage.AUTHENTICATION__WEAK:
+            return getWeak();
+        case SclPackage.AUTHENTICATION__PARENT_SERVER:
+            return getParentServer();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -583,27 +597,27 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.AUTHENTICATION__CERTIFICATE:
-                setCertificate((Boolean)newValue);
-                return;
-            case SclPackage.AUTHENTICATION__NONE:
-                setNone((Boolean)newValue);
-                return;
-            case SclPackage.AUTHENTICATION__PASSWORD:
-                setPassword((Boolean)newValue);
-                return;
-            case SclPackage.AUTHENTICATION__STRONG:
-                setStrong((Boolean)newValue);
-                return;
-            case SclPackage.AUTHENTICATION__WEAK:
-                setWeak((Boolean)newValue);
-                return;
-            case SclPackage.AUTHENTICATION__PARENT_SERVER:
-                setParentServer((Server)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.AUTHENTICATION__CERTIFICATE:
+            setCertificate( ( Boolean ) newValue );
+            return;
+        case SclPackage.AUTHENTICATION__NONE:
+            setNone( ( Boolean ) newValue );
+            return;
+        case SclPackage.AUTHENTICATION__PASSWORD:
+            setPassword( ( Boolean ) newValue );
+            return;
+        case SclPackage.AUTHENTICATION__STRONG:
+            setStrong( ( Boolean ) newValue );
+            return;
+        case SclPackage.AUTHENTICATION__WEAK:
+            setWeak( ( Boolean ) newValue );
+            return;
+        case SclPackage.AUTHENTICATION__PARENT_SERVER:
+            setParentServer( ( Server ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -613,27 +627,27 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.AUTHENTICATION__CERTIFICATE:
-                unsetCertificate();
-                return;
-            case SclPackage.AUTHENTICATION__NONE:
-                unsetNone();
-                return;
-            case SclPackage.AUTHENTICATION__PASSWORD:
-                unsetPassword();
-                return;
-            case SclPackage.AUTHENTICATION__STRONG:
-                unsetStrong();
-                return;
-            case SclPackage.AUTHENTICATION__WEAK:
-                unsetWeak();
-                return;
-            case SclPackage.AUTHENTICATION__PARENT_SERVER:
-                setParentServer((Server)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.AUTHENTICATION__CERTIFICATE:
+            unsetCertificate();
+            return;
+        case SclPackage.AUTHENTICATION__NONE:
+            unsetNone();
+            return;
+        case SclPackage.AUTHENTICATION__PASSWORD:
+            unsetPassword();
+            return;
+        case SclPackage.AUTHENTICATION__STRONG:
+            unsetStrong();
+            return;
+        case SclPackage.AUTHENTICATION__WEAK:
+            unsetWeak();
+            return;
+        case SclPackage.AUTHENTICATION__PARENT_SERVER:
+            setParentServer( ( Server ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -643,21 +657,21 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.AUTHENTICATION__CERTIFICATE:
-                return isSetCertificate();
-            case SclPackage.AUTHENTICATION__NONE:
-                return isSetNone();
-            case SclPackage.AUTHENTICATION__PASSWORD:
-                return isSetPassword();
-            case SclPackage.AUTHENTICATION__STRONG:
-                return isSetStrong();
-            case SclPackage.AUTHENTICATION__WEAK:
-                return isSetWeak();
-            case SclPackage.AUTHENTICATION__PARENT_SERVER:
-                return getParentServer() != null;
+        switch( featureID ) {
+        case SclPackage.AUTHENTICATION__CERTIFICATE:
+            return isSetCertificate();
+        case SclPackage.AUTHENTICATION__NONE:
+            return isSetNone();
+        case SclPackage.AUTHENTICATION__PASSWORD:
+            return isSetPassword();
+        case SclPackage.AUTHENTICATION__STRONG:
+            return isSetStrong();
+        case SclPackage.AUTHENTICATION__WEAK:
+            return isSetWeak();
+        case SclPackage.AUTHENTICATION__PARENT_SERVER:
+            return getParentServer() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -666,18 +680,24 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
      * @generated
      */
     @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == AgAuthentication.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.AUTHENTICATION__CERTIFICATE: return SclPackage.AG_AUTHENTICATION__CERTIFICATE;
-                case SclPackage.AUTHENTICATION__NONE: return SclPackage.AG_AUTHENTICATION__NONE;
-                case SclPackage.AUTHENTICATION__PASSWORD: return SclPackage.AG_AUTHENTICATION__PASSWORD;
-                case SclPackage.AUTHENTICATION__STRONG: return SclPackage.AG_AUTHENTICATION__STRONG;
-                case SclPackage.AUTHENTICATION__WEAK: return SclPackage.AG_AUTHENTICATION__WEAK;
-                default: return -1;
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgAuthentication.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.AUTHENTICATION__CERTIFICATE:
+                return SclPackage.AG_AUTHENTICATION__CERTIFICATE;
+            case SclPackage.AUTHENTICATION__NONE:
+                return SclPackage.AG_AUTHENTICATION__NONE;
+            case SclPackage.AUTHENTICATION__PASSWORD:
+                return SclPackage.AG_AUTHENTICATION__PASSWORD;
+            case SclPackage.AUTHENTICATION__STRONG:
+                return SclPackage.AG_AUTHENTICATION__STRONG;
+            case SclPackage.AUTHENTICATION__WEAK:
+                return SclPackage.AG_AUTHENTICATION__WEAK;
+            default:
+                return -1;
             }
         }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
     }
 
     /**
@@ -686,18 +706,24 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
      * @generated
      */
     @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == AgAuthentication.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_AUTHENTICATION__CERTIFICATE: return SclPackage.AUTHENTICATION__CERTIFICATE;
-                case SclPackage.AG_AUTHENTICATION__NONE: return SclPackage.AUTHENTICATION__NONE;
-                case SclPackage.AG_AUTHENTICATION__PASSWORD: return SclPackage.AUTHENTICATION__PASSWORD;
-                case SclPackage.AG_AUTHENTICATION__STRONG: return SclPackage.AUTHENTICATION__STRONG;
-                case SclPackage.AG_AUTHENTICATION__WEAK: return SclPackage.AUTHENTICATION__WEAK;
-                default: return -1;
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgAuthentication.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_AUTHENTICATION__CERTIFICATE:
+                return SclPackage.AUTHENTICATION__CERTIFICATE;
+            case SclPackage.AG_AUTHENTICATION__NONE:
+                return SclPackage.AUTHENTICATION__NONE;
+            case SclPackage.AG_AUTHENTICATION__PASSWORD:
+                return SclPackage.AUTHENTICATION__PASSWORD;
+            case SclPackage.AG_AUTHENTICATION__STRONG:
+                return SclPackage.AUTHENTICATION__STRONG;
+            case SclPackage.AG_AUTHENTICATION__WEAK:
+                return SclPackage.AUTHENTICATION__WEAK;
+            default:
+                return -1;
             }
         }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
     }
 
     /**
@@ -707,20 +733,35 @@ public class AuthenticationImpl extends SclObjectImpl implements Authentication
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (certificate: ");
-        if (certificateESet) result.append(certificate); else result.append("<unset>");
-        result.append(", none: ");
-        if (noneESet) result.append(none); else result.append("<unset>");
-        result.append(", password: ");
-        if (passwordESet) result.append(password); else result.append("<unset>");
-        result.append(", strong: ");
-        if (strongESet) result.append(strong); else result.append("<unset>");
-        result.append(", weak: ");
-        if (weakESet) result.append(weak); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (certificate: " );
+        if( certificateESet )
+            result.append( certificate );
+        else
+            result.append( "<unset>" );
+        result.append( ", none: " );
+        if( noneESet )
+            result.append( none );
+        else
+            result.append( "<unset>" );
+        result.append( ", password: " );
+        if( passwordESet )
+            result.append( password );
+        else
+            result.append( "<unset>" );
+        result.append( ", strong: " );
+        if( strongESet )
+            result.append( strong );
+        else
+            result.append( "<unset>" );
+        result.append( ", weak: " );
+        if( weakESet )
+            result.append( weak );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BDAImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BDAImpl.java
index 6e9eac7..a5c6eba 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BDAImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BDAImpl.java
@@ -70,8 +70,8 @@ public class BDAImpl extends AbstractDataAttributeImpl implements BDA {
      */
     @Override
     public DAType getParentDAType() {
-        if (eContainerFeatureID() != SclPackage.BDA__PARENT_DA_TYPE) return null;
-        return (DAType)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.BDA__PARENT_DA_TYPE ) return null;
+        return ( DAType ) eInternalContainer();
     }
 
     /**
@@ -79,8 +79,8 @@ public class BDAImpl extends AbstractDataAttributeImpl implements BDA {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentDAType(DAType newParentDAType, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentDAType, SclPackage.BDA__PARENT_DA_TYPE, msgs);
+    public NotificationChain basicSetParentDAType( DAType newParentDAType, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentDAType, SclPackage.BDA__PARENT_DA_TYPE, msgs );
         return msgs;
     }
 
@@ -90,20 +90,23 @@ public class BDAImpl extends AbstractDataAttributeImpl implements BDA {
      * @generated
      */
     @Override
-    public void setParentDAType(DAType newParentDAType) {
-        if (newParentDAType != eInternalContainer() || (eContainerFeatureID() != SclPackage.BDA__PARENT_DA_TYPE && newParentDAType != null)) {
-            if (EcoreUtil.isAncestor(this, newParentDAType))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentDAType( DAType newParentDAType ) {
+        if( newParentDAType != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.BDA__PARENT_DA_TYPE && newParentDAType != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentDAType ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentDAType != null)
-                msgs = ((InternalEObject)newParentDAType).eInverseAdd(this, SclPackage.DA_TYPE__BDA, DAType.class, msgs);
-            msgs = basicSetParentDAType(newParentDAType, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentDAType != null )
+                msgs = ( ( InternalEObject ) newParentDAType ).eInverseAdd( this, SclPackage.DA_TYPE__BDA, DAType.class,
+                        msgs );
+            msgs = basicSetParentDAType( newParentDAType, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.BDA__PARENT_DA_TYPE, newParentDAType, newParentDAType));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.BDA__PARENT_DA_TYPE, newParentDAType,
+                    newParentDAType ) );
     }
 
     /**
@@ -113,13 +116,13 @@ public class BDAImpl extends AbstractDataAttributeImpl implements BDA {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.BDA__PARENT_DA_TYPE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentDAType((DAType)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.BDA__PARENT_DA_TYPE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentDAType( ( DAType ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -129,11 +132,11 @@ public class BDAImpl extends AbstractDataAttributeImpl implements BDA {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.BDA__PARENT_DA_TYPE:
-                return basicSetParentDAType(null, msgs);
+        switch( featureID ) {
+        case SclPackage.BDA__PARENT_DA_TYPE:
+            return basicSetParentDAType( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -143,11 +146,11 @@ public class BDAImpl extends AbstractDataAttributeImpl implements BDA {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.BDA__PARENT_DA_TYPE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.DA_TYPE__BDA, DAType.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.BDA__PARENT_DA_TYPE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.DA_TYPE__BDA, DAType.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -157,11 +160,11 @@ public class BDAImpl extends AbstractDataAttributeImpl implements BDA {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.BDA__PARENT_DA_TYPE:
-                return getParentDAType();
+        switch( featureID ) {
+        case SclPackage.BDA__PARENT_DA_TYPE:
+            return getParentDAType();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -171,12 +174,12 @@ public class BDAImpl extends AbstractDataAttributeImpl implements BDA {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.BDA__PARENT_DA_TYPE:
-                setParentDAType((DAType)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.BDA__PARENT_DA_TYPE:
+            setParentDAType( ( DAType ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -186,12 +189,12 @@ public class BDAImpl extends AbstractDataAttributeImpl implements BDA {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.BDA__PARENT_DA_TYPE:
-                setParentDAType((DAType)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.BDA__PARENT_DA_TYPE:
+            setParentDAType( ( DAType ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -201,11 +204,11 @@ public class BDAImpl extends AbstractDataAttributeImpl implements BDA {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.BDA__PARENT_DA_TYPE:
-                return getParentDAType() != null;
+        switch( featureID ) {
+        case SclPackage.BDA__PARENT_DA_TYPE:
+            return getParentDAType() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //BDAImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BaseElementImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BaseElementImpl.java
index 8f65df4..7937e2b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BaseElementImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BaseElementImpl.java
@@ -62,7 +62,7 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
      * @generated
      * @ordered
      */
-    protected EList<Private> private_;
+    protected EList< Private > private_;
 
     /**
      * The cached value of the '{@link #getText() <em>Text</em>}' containment reference.
@@ -128,9 +128,10 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
      * @generated
      */
     @Override
-    public EList<Private> getPrivate() {
-        if (private_ == null) {
-            private_ = new EObjectContainmentWithInverseEList.Unsettable<Private>(Private.class, this, SclPackage.BASE_ELEMENT__PRIVATE, SclPackage.PRIVATE__PARENT_BASE_ELEMENT);
+    public EList< Private > getPrivate() {
+        if( private_ == null ) {
+            private_ = new EObjectContainmentWithInverseEList.Unsettable< Private >( Private.class, this,
+                    SclPackage.BASE_ELEMENT__PRIVATE, SclPackage.PRIVATE__PARENT_BASE_ELEMENT );
         }
         return private_;
     }
@@ -142,7 +143,7 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
      */
     @Override
     public void unsetPrivate() {
-        if (private_ != null) ((InternalEList.Unsettable<?>)private_).unset();
+        if( private_ != null ) ( ( InternalEList.Unsettable< ? > ) private_ ).unset();
     }
 
     /**
@@ -152,7 +153,7 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
      */
     @Override
     public boolean isSetPrivate() {
-        return private_ != null && ((InternalEList.Unsettable<?>)private_).isSet();
+        return private_ != null && ( ( InternalEList.Unsettable< ? > ) private_ ).isSet();
     }
 
     /**
@@ -175,9 +176,13 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
         text = newText;
         boolean oldTextESet = textESet;
         textESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.BASE_ELEMENT__TEXT, oldText, newText, !oldTextESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.BASE_ELEMENT__TEXT, oldText, newText, !oldTextESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -189,20 +194,23 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
      */
     @Override
     public void setText( Text newText ) {
-        if (newText != text) {
+        if( newText != text ) {
             NotificationChain msgs = null;
-            if (text != null)
-                msgs = ((InternalEObject)text).eInverseRemove(this, SclPackage.TEXT__PARENT_BASE_ELEMENT, Text.class, msgs);
-            if (newText != null)
-                msgs = ((InternalEObject)newText).eInverseAdd(this, SclPackage.TEXT__PARENT_BASE_ELEMENT, Text.class, msgs);
-            msgs = basicSetText(newText, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( text != null )
+                msgs = ( ( InternalEObject ) text ).eInverseRemove( this, SclPackage.TEXT__PARENT_BASE_ELEMENT,
+                        Text.class, msgs );
+            if( newText != null )
+                msgs = ( ( InternalEObject ) newText ).eInverseAdd( this, SclPackage.TEXT__PARENT_BASE_ELEMENT,
+                        Text.class, msgs );
+            msgs = basicSetText( newText, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldTextESet = textESet;
             textESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.BASE_ELEMENT__TEXT, newText, newText, !oldTextESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.BASE_ELEMENT__TEXT, newText, newText,
+                        !oldTextESet ) );
         }
     }
 
@@ -216,9 +224,13 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
         text = null;
         boolean oldTextESet = textESet;
         textESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.BASE_ELEMENT__TEXT, oldText, null, oldTextESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.BASE_ELEMENT__TEXT, oldText, null, oldTextESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -230,17 +242,19 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
      */
     @Override
     public void unsetText() {
-        if (text != null) {
+        if( text != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)text).eInverseRemove(this, SclPackage.TEXT__PARENT_BASE_ELEMENT, Text.class, msgs);
-            msgs = basicUnsetText(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) text ).eInverseRemove( this, SclPackage.TEXT__PARENT_BASE_ELEMENT, Text.class,
+                    msgs );
+            msgs = basicUnsetText( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldTextESet = textESet;
             textESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.BASE_ELEMENT__TEXT, null, null, oldTextESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.BASE_ELEMENT__TEXT, null, null,
+                        oldTextESet ) );
         }
     }
 
@@ -261,8 +275,8 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
      */
     @Override
     public FeatureMap getAny() {
-        if (any == null) {
-            any = new BasicFeatureMap(this, SclPackage.BASE_ELEMENT__ANY);
+        if( any == null ) {
+            any = new BasicFeatureMap( this, SclPackage.BASE_ELEMENT__ANY );
         }
         return any;
     }
@@ -274,8 +288,8 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
      */
     @Override
     public FeatureMap getAnyAttribute() {
-        if (anyAttribute == null) {
-            anyAttribute = new BasicFeatureMap(this, SclPackage.BASE_ELEMENT__ANY_ATTRIBUTE);
+        if( anyAttribute == null ) {
+            anyAttribute = new BasicFeatureMap( this, SclPackage.BASE_ELEMENT__ANY_ATTRIBUTE );
         }
         return anyAttribute;
     }
@@ -288,15 +302,17 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.BASE_ELEMENT__PRIVATE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getPrivate()).basicAdd(otherEnd, msgs);
-            case SclPackage.BASE_ELEMENT__TEXT:
-                if (text != null)
-                    msgs = ((InternalEObject)text).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.BASE_ELEMENT__TEXT, null, msgs);
-                return basicSetText((Text)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.BASE_ELEMENT__PRIVATE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getPrivate() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.BASE_ELEMENT__TEXT:
+            if( text != null )
+                msgs = ( ( InternalEObject ) text ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.BASE_ELEMENT__TEXT, null, msgs );
+            return basicSetText( ( Text ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -306,17 +322,17 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.BASE_ELEMENT__PRIVATE:
-                return ((InternalEList<?>)getPrivate()).basicRemove(otherEnd, msgs);
-            case SclPackage.BASE_ELEMENT__TEXT:
-                return basicUnsetText(msgs);
-            case SclPackage.BASE_ELEMENT__ANY:
-                return ((InternalEList<?>)getAny()).basicRemove(otherEnd, msgs);
-            case SclPackage.BASE_ELEMENT__ANY_ATTRIBUTE:
-                return ((InternalEList<?>)getAnyAttribute()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.BASE_ELEMENT__PRIVATE:
+            return ( ( InternalEList< ? > ) getPrivate() ).basicRemove( otherEnd, msgs );
+        case SclPackage.BASE_ELEMENT__TEXT:
+            return basicUnsetText( msgs );
+        case SclPackage.BASE_ELEMENT__ANY:
+            return ( ( InternalEList< ? > ) getAny() ).basicRemove( otherEnd, msgs );
+        case SclPackage.BASE_ELEMENT__ANY_ATTRIBUTE:
+            return ( ( InternalEList< ? > ) getAnyAttribute() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -326,19 +342,19 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.BASE_ELEMENT__PRIVATE:
-                return getPrivate();
-            case SclPackage.BASE_ELEMENT__TEXT:
-                return getText();
-            case SclPackage.BASE_ELEMENT__ANY:
-                if (coreType) return getAny();
-                return ((FeatureMap.Internal)getAny()).getWrapper();
-            case SclPackage.BASE_ELEMENT__ANY_ATTRIBUTE:
-                if (coreType) return getAnyAttribute();
-                return ((FeatureMap.Internal)getAnyAttribute()).getWrapper();
+        switch( featureID ) {
+        case SclPackage.BASE_ELEMENT__PRIVATE:
+            return getPrivate();
+        case SclPackage.BASE_ELEMENT__TEXT:
+            return getText();
+        case SclPackage.BASE_ELEMENT__ANY:
+            if( coreType ) return getAny();
+            return ( ( FeatureMap.Internal ) getAny() ).getWrapper();
+        case SclPackage.BASE_ELEMENT__ANY_ATTRIBUTE:
+            if( coreType ) return getAnyAttribute();
+            return ( ( FeatureMap.Internal ) getAnyAttribute() ).getWrapper();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -349,22 +365,22 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.BASE_ELEMENT__PRIVATE:
-                getPrivate().clear();
-                getPrivate().addAll((Collection<? extends Private>)newValue);
-                return;
-            case SclPackage.BASE_ELEMENT__TEXT:
-                setText((Text)newValue);
-                return;
-            case SclPackage.BASE_ELEMENT__ANY:
-                ((FeatureMap.Internal)getAny()).set(newValue);
-                return;
-            case SclPackage.BASE_ELEMENT__ANY_ATTRIBUTE:
-                ((FeatureMap.Internal)getAnyAttribute()).set(newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.BASE_ELEMENT__PRIVATE:
+            getPrivate().clear();
+            getPrivate().addAll( ( Collection< ? extends Private > ) newValue );
+            return;
+        case SclPackage.BASE_ELEMENT__TEXT:
+            setText( ( Text ) newValue );
+            return;
+        case SclPackage.BASE_ELEMENT__ANY:
+            ( ( FeatureMap.Internal ) getAny() ).set( newValue );
+            return;
+        case SclPackage.BASE_ELEMENT__ANY_ATTRIBUTE:
+            ( ( FeatureMap.Internal ) getAnyAttribute() ).set( newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -374,21 +390,21 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.BASE_ELEMENT__PRIVATE:
-                unsetPrivate();
-                return;
-            case SclPackage.BASE_ELEMENT__TEXT:
-                unsetText();
-                return;
-            case SclPackage.BASE_ELEMENT__ANY:
-                getAny().clear();
-                return;
-            case SclPackage.BASE_ELEMENT__ANY_ATTRIBUTE:
-                getAnyAttribute().clear();
-                return;
+        switch( featureID ) {
+        case SclPackage.BASE_ELEMENT__PRIVATE:
+            unsetPrivate();
+            return;
+        case SclPackage.BASE_ELEMENT__TEXT:
+            unsetText();
+            return;
+        case SclPackage.BASE_ELEMENT__ANY:
+            getAny().clear();
+            return;
+        case SclPackage.BASE_ELEMENT__ANY_ATTRIBUTE:
+            getAnyAttribute().clear();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -398,17 +414,17 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.BASE_ELEMENT__PRIVATE:
-                return isSetPrivate();
-            case SclPackage.BASE_ELEMENT__TEXT:
-                return isSetText();
-            case SclPackage.BASE_ELEMENT__ANY:
-                return any != null && !any.isEmpty();
-            case SclPackage.BASE_ELEMENT__ANY_ATTRIBUTE:
-                return anyAttribute != null && !anyAttribute.isEmpty();
+        switch( featureID ) {
+        case SclPackage.BASE_ELEMENT__PRIVATE:
+            return isSetPrivate();
+        case SclPackage.BASE_ELEMENT__TEXT:
+            return isSetText();
+        case SclPackage.BASE_ELEMENT__ANY:
+            return any != null && !any.isEmpty();
+        case SclPackage.BASE_ELEMENT__ANY_ATTRIBUTE:
+            return anyAttribute != null && !anyAttribute.isEmpty();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -418,14 +434,14 @@ public abstract class BaseElementImpl extends SclObjectImpl implements BaseEleme
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (any: ");
-        result.append(any);
-        result.append(", anyAttribute: ");
-        result.append(anyAttribute);
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (any: " );
+        result.append( any );
+        result.append( ", anyAttribute: " );
+        result.append( anyAttribute );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BayImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BayImpl.java
index ead1b38..8c30c43 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BayImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BayImpl.java
@@ -63,7 +63,7 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      * @generated
      * @ordered
      */
-    protected EList<Function> function;
+    protected EList< Function > function;
 
     /**
      * The cached value of the '{@link #getConnectivityNode() <em>Connectivity Node</em>}' containment reference list.
@@ -73,7 +73,7 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      * @generated
      * @ordered
      */
-    protected EList<ConnectivityNode> connectivityNode;
+    protected EList< ConnectivityNode > connectivityNode;
 
     /**
      * The cached value of the '{@link #getConductingEquipment() <em>Conducting Equipment</em>}' containment reference list.
@@ -83,7 +83,7 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      * @generated
      * @ordered
      */
-    protected EList<ConductingEquipment> conductingEquipment;
+    protected EList< ConductingEquipment > conductingEquipment;
 
     /**
      * <!-- begin-user-doc -->
@@ -111,8 +111,8 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      */
     @Override
     public VoltageLevel getParentVoltageLevel() {
-        if (eContainerFeatureID() != SclPackage.BAY__PARENT_VOLTAGE_LEVEL) return null;
-        return (VoltageLevel)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.BAY__PARENT_VOLTAGE_LEVEL ) return null;
+        return ( VoltageLevel ) eInternalContainer();
     }
 
     /**
@@ -120,8 +120,9 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentVoltageLevel(VoltageLevel newParentVoltageLevel, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentVoltageLevel, SclPackage.BAY__PARENT_VOLTAGE_LEVEL, msgs);
+    public NotificationChain basicSetParentVoltageLevel( VoltageLevel newParentVoltageLevel, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentVoltageLevel, SclPackage.BAY__PARENT_VOLTAGE_LEVEL,
+                msgs );
         return msgs;
     }
 
@@ -131,20 +132,24 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      * @generated
      */
     @Override
-    public void setParentVoltageLevel(VoltageLevel newParentVoltageLevel) {
-        if (newParentVoltageLevel != eInternalContainer() || (eContainerFeatureID() != SclPackage.BAY__PARENT_VOLTAGE_LEVEL && newParentVoltageLevel != null)) {
-            if (EcoreUtil.isAncestor(this, newParentVoltageLevel))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentVoltageLevel( VoltageLevel newParentVoltageLevel ) {
+        if( newParentVoltageLevel != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.BAY__PARENT_VOLTAGE_LEVEL
+                        && newParentVoltageLevel != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentVoltageLevel ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentVoltageLevel != null)
-                msgs = ((InternalEObject)newParentVoltageLevel).eInverseAdd(this, SclPackage.VOLTAGE_LEVEL__BAY, VoltageLevel.class, msgs);
-            msgs = basicSetParentVoltageLevel(newParentVoltageLevel, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentVoltageLevel != null )
+                msgs = ( ( InternalEObject ) newParentVoltageLevel ).eInverseAdd( this, SclPackage.VOLTAGE_LEVEL__BAY,
+                        VoltageLevel.class, msgs );
+            msgs = basicSetParentVoltageLevel( newParentVoltageLevel, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.BAY__PARENT_VOLTAGE_LEVEL, newParentVoltageLevel, newParentVoltageLevel));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.BAY__PARENT_VOLTAGE_LEVEL,
+                    newParentVoltageLevel, newParentVoltageLevel ) );
     }
 
     /**
@@ -153,9 +158,10 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      * @generated
      */
     @Override
-    public EList<Function> getFunction() {
-        if (function == null) {
-            function = new EObjectContainmentWithInverseEList.Unsettable<Function>(Function.class, this, SclPackage.BAY__FUNCTION, SclPackage.FUNCTION__PARENT_BAY);
+    public EList< Function > getFunction() {
+        if( function == null ) {
+            function = new EObjectContainmentWithInverseEList.Unsettable< Function >( Function.class, this,
+                    SclPackage.BAY__FUNCTION, SclPackage.FUNCTION__PARENT_BAY );
         }
         return function;
     }
@@ -167,7 +173,7 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      */
     @Override
     public void unsetFunction() {
-        if (function != null) ((InternalEList.Unsettable<?>)function).unset();
+        if( function != null ) ( ( InternalEList.Unsettable< ? > ) function ).unset();
     }
 
     /**
@@ -177,7 +183,7 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      */
     @Override
     public boolean isSetFunction() {
-        return function != null && ((InternalEList.Unsettable<?>)function).isSet();
+        return function != null && ( ( InternalEList.Unsettable< ? > ) function ).isSet();
     }
 
     /**
@@ -186,9 +192,11 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      * @generated
      */
     @Override
-    public EList<ConnectivityNode> getConnectivityNode() {
-        if (connectivityNode == null) {
-            connectivityNode = new EObjectContainmentWithInverseEList.Unsettable<ConnectivityNode>(ConnectivityNode.class, this, SclPackage.BAY__CONNECTIVITY_NODE, SclPackage.CONNECTIVITY_NODE__PARENT_BAY);
+    public EList< ConnectivityNode > getConnectivityNode() {
+        if( connectivityNode == null ) {
+            connectivityNode = new EObjectContainmentWithInverseEList.Unsettable< ConnectivityNode >(
+                    ConnectivityNode.class, this, SclPackage.BAY__CONNECTIVITY_NODE,
+                    SclPackage.CONNECTIVITY_NODE__PARENT_BAY );
         }
         return connectivityNode;
     }
@@ -200,7 +208,7 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      */
     @Override
     public void unsetConnectivityNode() {
-        if (connectivityNode != null) ((InternalEList.Unsettable<?>)connectivityNode).unset();
+        if( connectivityNode != null ) ( ( InternalEList.Unsettable< ? > ) connectivityNode ).unset();
     }
 
     /**
@@ -210,7 +218,7 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      */
     @Override
     public boolean isSetConnectivityNode() {
-        return connectivityNode != null && ((InternalEList.Unsettable<?>)connectivityNode).isSet();
+        return connectivityNode != null && ( ( InternalEList.Unsettable< ? > ) connectivityNode ).isSet();
     }
 
     /**
@@ -219,9 +227,11 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      * @generated
      */
     @Override
-    public EList<ConductingEquipment> getConductingEquipment() {
-        if (conductingEquipment == null) {
-            conductingEquipment = new EObjectContainmentWithInverseEList.Unsettable<ConductingEquipment>(ConductingEquipment.class, this, SclPackage.BAY__CONDUCTING_EQUIPMENT, SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY);
+    public EList< ConductingEquipment > getConductingEquipment() {
+        if( conductingEquipment == null ) {
+            conductingEquipment = new EObjectContainmentWithInverseEList.Unsettable< ConductingEquipment >(
+                    ConductingEquipment.class, this, SclPackage.BAY__CONDUCTING_EQUIPMENT,
+                    SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY );
         }
         return conductingEquipment;
     }
@@ -233,7 +243,7 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      */
     @Override
     public void unsetConductingEquipment() {
-        if (conductingEquipment != null) ((InternalEList.Unsettable<?>)conductingEquipment).unset();
+        if( conductingEquipment != null ) ( ( InternalEList.Unsettable< ? > ) conductingEquipment ).unset();
     }
 
     /**
@@ -243,7 +253,7 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      */
     @Override
     public boolean isSetConductingEquipment() {
-        return conductingEquipment != null && ((InternalEList.Unsettable<?>)conductingEquipment).isSet();
+        return conductingEquipment != null && ( ( InternalEList.Unsettable< ? > ) conductingEquipment ).isSet();
     }
 
     /**
@@ -254,19 +264,22 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.BAY__PARENT_VOLTAGE_LEVEL:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentVoltageLevel((VoltageLevel)otherEnd, msgs);
-            case SclPackage.BAY__FUNCTION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getFunction()).basicAdd(otherEnd, msgs);
-            case SclPackage.BAY__CONNECTIVITY_NODE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getConnectivityNode()).basicAdd(otherEnd, msgs);
-            case SclPackage.BAY__CONDUCTING_EQUIPMENT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getConductingEquipment()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.BAY__PARENT_VOLTAGE_LEVEL:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentVoltageLevel( ( VoltageLevel ) otherEnd, msgs );
+        case SclPackage.BAY__FUNCTION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getFunction() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.BAY__CONNECTIVITY_NODE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getConnectivityNode() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.BAY__CONDUCTING_EQUIPMENT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getConductingEquipment() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -276,17 +289,17 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.BAY__PARENT_VOLTAGE_LEVEL:
-                return basicSetParentVoltageLevel(null, msgs);
-            case SclPackage.BAY__FUNCTION:
-                return ((InternalEList<?>)getFunction()).basicRemove(otherEnd, msgs);
-            case SclPackage.BAY__CONNECTIVITY_NODE:
-                return ((InternalEList<?>)getConnectivityNode()).basicRemove(otherEnd, msgs);
-            case SclPackage.BAY__CONDUCTING_EQUIPMENT:
-                return ((InternalEList<?>)getConductingEquipment()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.BAY__PARENT_VOLTAGE_LEVEL:
+            return basicSetParentVoltageLevel( null, msgs );
+        case SclPackage.BAY__FUNCTION:
+            return ( ( InternalEList< ? > ) getFunction() ).basicRemove( otherEnd, msgs );
+        case SclPackage.BAY__CONNECTIVITY_NODE:
+            return ( ( InternalEList< ? > ) getConnectivityNode() ).basicRemove( otherEnd, msgs );
+        case SclPackage.BAY__CONDUCTING_EQUIPMENT:
+            return ( ( InternalEList< ? > ) getConductingEquipment() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -296,11 +309,11 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.BAY__PARENT_VOLTAGE_LEVEL:
-                return eInternalContainer().eInverseRemove(this, SclPackage.VOLTAGE_LEVEL__BAY, VoltageLevel.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.BAY__PARENT_VOLTAGE_LEVEL:
+            return eInternalContainer().eInverseRemove( this, SclPackage.VOLTAGE_LEVEL__BAY, VoltageLevel.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -310,17 +323,17 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.BAY__PARENT_VOLTAGE_LEVEL:
-                return getParentVoltageLevel();
-            case SclPackage.BAY__FUNCTION:
-                return getFunction();
-            case SclPackage.BAY__CONNECTIVITY_NODE:
-                return getConnectivityNode();
-            case SclPackage.BAY__CONDUCTING_EQUIPMENT:
-                return getConductingEquipment();
+        switch( featureID ) {
+        case SclPackage.BAY__PARENT_VOLTAGE_LEVEL:
+            return getParentVoltageLevel();
+        case SclPackage.BAY__FUNCTION:
+            return getFunction();
+        case SclPackage.BAY__CONNECTIVITY_NODE:
+            return getConnectivityNode();
+        case SclPackage.BAY__CONDUCTING_EQUIPMENT:
+            return getConductingEquipment();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -331,24 +344,24 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.BAY__PARENT_VOLTAGE_LEVEL:
-                setParentVoltageLevel((VoltageLevel)newValue);
-                return;
-            case SclPackage.BAY__FUNCTION:
-                getFunction().clear();
-                getFunction().addAll((Collection<? extends Function>)newValue);
-                return;
-            case SclPackage.BAY__CONNECTIVITY_NODE:
-                getConnectivityNode().clear();
-                getConnectivityNode().addAll((Collection<? extends ConnectivityNode>)newValue);
-                return;
-            case SclPackage.BAY__CONDUCTING_EQUIPMENT:
-                getConductingEquipment().clear();
-                getConductingEquipment().addAll((Collection<? extends ConductingEquipment>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.BAY__PARENT_VOLTAGE_LEVEL:
+            setParentVoltageLevel( ( VoltageLevel ) newValue );
+            return;
+        case SclPackage.BAY__FUNCTION:
+            getFunction().clear();
+            getFunction().addAll( ( Collection< ? extends Function > ) newValue );
+            return;
+        case SclPackage.BAY__CONNECTIVITY_NODE:
+            getConnectivityNode().clear();
+            getConnectivityNode().addAll( ( Collection< ? extends ConnectivityNode > ) newValue );
+            return;
+        case SclPackage.BAY__CONDUCTING_EQUIPMENT:
+            getConductingEquipment().clear();
+            getConductingEquipment().addAll( ( Collection< ? extends ConductingEquipment > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -358,21 +371,21 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.BAY__PARENT_VOLTAGE_LEVEL:
-                setParentVoltageLevel((VoltageLevel)null);
-                return;
-            case SclPackage.BAY__FUNCTION:
-                unsetFunction();
-                return;
-            case SclPackage.BAY__CONNECTIVITY_NODE:
-                unsetConnectivityNode();
-                return;
-            case SclPackage.BAY__CONDUCTING_EQUIPMENT:
-                unsetConductingEquipment();
-                return;
+        switch( featureID ) {
+        case SclPackage.BAY__PARENT_VOLTAGE_LEVEL:
+            setParentVoltageLevel( ( VoltageLevel ) null );
+            return;
+        case SclPackage.BAY__FUNCTION:
+            unsetFunction();
+            return;
+        case SclPackage.BAY__CONNECTIVITY_NODE:
+            unsetConnectivityNode();
+            return;
+        case SclPackage.BAY__CONDUCTING_EQUIPMENT:
+            unsetConductingEquipment();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -382,17 +395,17 @@ public class BayImpl extends EquipmentContainerImpl implements Bay {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.BAY__PARENT_VOLTAGE_LEVEL:
-                return getParentVoltageLevel() != null;
-            case SclPackage.BAY__FUNCTION:
-                return isSetFunction();
-            case SclPackage.BAY__CONNECTIVITY_NODE:
-                return isSetConnectivityNode();
-            case SclPackage.BAY__CONDUCTING_EQUIPMENT:
-                return isSetConductingEquipment();
+        switch( featureID ) {
+        case SclPackage.BAY__PARENT_VOLTAGE_LEVEL:
+            return getParentVoltageLevel() != null;
+        case SclPackage.BAY__FUNCTION:
+            return isSetFunction();
+        case SclPackage.BAY__CONNECTIVITY_NODE:
+            return isSetConnectivityNode();
+        case SclPackage.BAY__CONDUCTING_EQUIPMENT:
+            return isSetConductingEquipment();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //BayImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BitRateImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BitRateImpl.java
index 7f143a6..3129c9a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BitRateImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BitRateImpl.java
@@ -71,8 +71,8 @@ public class BitRateImpl extends BitRateInMbPerSecImpl implements BitRate {
      */
     @Override
     public SubNetwork getParentSubNetwork() {
-        if (eContainerFeatureID() != SclPackage.BIT_RATE__PARENT_SUB_NETWORK) return null;
-        return (SubNetwork)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.BIT_RATE__PARENT_SUB_NETWORK ) return null;
+        return ( SubNetwork ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class BitRateImpl extends BitRateInMbPerSecImpl implements BitRate {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSubNetwork(SubNetwork newParentSubNetwork, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSubNetwork, SclPackage.BIT_RATE__PARENT_SUB_NETWORK, msgs);
+    public NotificationChain basicSetParentSubNetwork( SubNetwork newParentSubNetwork, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSubNetwork, SclPackage.BIT_RATE__PARENT_SUB_NETWORK,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class BitRateImpl extends BitRateInMbPerSecImpl implements BitRate {
      * @generated
      */
     @Override
-    public void setParentSubNetwork(SubNetwork newParentSubNetwork) {
-        if (newParentSubNetwork != eInternalContainer() || (eContainerFeatureID() != SclPackage.BIT_RATE__PARENT_SUB_NETWORK && newParentSubNetwork != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSubNetwork))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSubNetwork( SubNetwork newParentSubNetwork ) {
+        if( newParentSubNetwork != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.BIT_RATE__PARENT_SUB_NETWORK
+                        && newParentSubNetwork != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSubNetwork ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSubNetwork != null)
-                msgs = ((InternalEObject)newParentSubNetwork).eInverseAdd(this, SclPackage.SUB_NETWORK__BIT_RATE, SubNetwork.class, msgs);
-            msgs = basicSetParentSubNetwork(newParentSubNetwork, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSubNetwork != null )
+                msgs = ( ( InternalEObject ) newParentSubNetwork ).eInverseAdd( this, SclPackage.SUB_NETWORK__BIT_RATE,
+                        SubNetwork.class, msgs );
+            msgs = basicSetParentSubNetwork( newParentSubNetwork, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.BIT_RATE__PARENT_SUB_NETWORK, newParentSubNetwork, newParentSubNetwork));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.BIT_RATE__PARENT_SUB_NETWORK,
+                    newParentSubNetwork, newParentSubNetwork ) );
     }
 
     /**
@@ -113,14 +118,14 @@ public class BitRateImpl extends BitRateInMbPerSecImpl implements BitRate {
      * @generated
      */
     @Override
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.BIT_RATE__PARENT_SUB_NETWORK:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSubNetwork((SubNetwork)otherEnd, msgs);
+    public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.BIT_RATE__PARENT_SUB_NETWORK:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSubNetwork( ( SubNetwork ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -129,12 +134,12 @@ public class BitRateImpl extends BitRateInMbPerSecImpl implements BitRate {
      * @generated
      */
     @Override
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.BIT_RATE__PARENT_SUB_NETWORK:
-                return basicSetParentSubNetwork(null, msgs);
+    public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.BIT_RATE__PARENT_SUB_NETWORK:
+            return basicSetParentSubNetwork( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -143,12 +148,13 @@ public class BitRateImpl extends BitRateInMbPerSecImpl implements BitRate {
      * @generated
      */
     @Override
-    public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.BIT_RATE__PARENT_SUB_NETWORK:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SUB_NETWORK__BIT_RATE, SubNetwork.class, msgs);
+    public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
+        switch( eContainerFeatureID() ) {
+        case SclPackage.BIT_RATE__PARENT_SUB_NETWORK:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SUB_NETWORK__BIT_RATE, SubNetwork.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -157,12 +163,12 @@ public class BitRateImpl extends BitRateInMbPerSecImpl implements BitRate {
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.BIT_RATE__PARENT_SUB_NETWORK:
-                return getParentSubNetwork();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.BIT_RATE__PARENT_SUB_NETWORK:
+            return getParentSubNetwork();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -171,13 +177,13 @@ public class BitRateImpl extends BitRateInMbPerSecImpl implements BitRate {
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.BIT_RATE__PARENT_SUB_NETWORK:
-                setParentSubNetwork((SubNetwork)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.BIT_RATE__PARENT_SUB_NETWORK:
+            setParentSubNetwork( ( SubNetwork ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -186,13 +192,13 @@ public class BitRateImpl extends BitRateInMbPerSecImpl implements BitRate {
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.BIT_RATE__PARENT_SUB_NETWORK:
-                setParentSubNetwork((SubNetwork)null);
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.BIT_RATE__PARENT_SUB_NETWORK:
+            setParentSubNetwork( ( SubNetwork ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -201,12 +207,12 @@ public class BitRateImpl extends BitRateInMbPerSecImpl implements BitRate {
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.BIT_RATE__PARENT_SUB_NETWORK:
-                return getParentSubNetwork() != null;
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.BIT_RATE__PARENT_SUB_NETWORK:
+            return getParentSubNetwork() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //BitRateImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BitRateInMbPerSecImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BitRateInMbPerSecImpl.java
index b17e099..a0db505 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BitRateInMbPerSecImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/BitRateInMbPerSecImpl.java
@@ -152,11 +152,12 @@ public class BitRateInMbPerSecImpl extends SclObjectImpl implements BitRateInMbP
      * @generated
      */
     @Override
-    public void setValue(BigDecimal newValue) {
+    public void setValue( BigDecimal newValue ) {
         BigDecimal oldValue = value;
         value = newValue;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.BIT_RATE_IN_MB_PER_SEC__VALUE, oldValue, value));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.BIT_RATE_IN_MB_PER_SEC__VALUE, oldValue,
+                    value ) );
     }
 
     /**
@@ -175,13 +176,14 @@ public class BitRateInMbPerSecImpl extends SclObjectImpl implements BitRateInMbP
      * @generated
      */
     @Override
-    public void setMultiplier(UnitMultiplierEnum newMultiplier) {
+    public void setMultiplier( UnitMultiplierEnum newMultiplier ) {
         UnitMultiplierEnum oldMultiplier = multiplier;
         multiplier = newMultiplier == null ? MULTIPLIER_EDEFAULT : newMultiplier;
         boolean oldMultiplierESet = multiplierESet;
         multiplierESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.BIT_RATE_IN_MB_PER_SEC__MULTIPLIER, oldMultiplier, multiplier, !oldMultiplierESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.BIT_RATE_IN_MB_PER_SEC__MULTIPLIER,
+                    oldMultiplier, multiplier, !oldMultiplierESet ) );
     }
 
     /**
@@ -195,8 +197,9 @@ public class BitRateInMbPerSecImpl extends SclObjectImpl implements BitRateInMbP
         boolean oldMultiplierESet = multiplierESet;
         multiplier = MULTIPLIER_EDEFAULT;
         multiplierESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.BIT_RATE_IN_MB_PER_SEC__MULTIPLIER, oldMultiplier, MULTIPLIER_EDEFAULT, oldMultiplierESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.BIT_RATE_IN_MB_PER_SEC__MULTIPLIER,
+                    oldMultiplier, MULTIPLIER_EDEFAULT, oldMultiplierESet ) );
     }
 
     /**
@@ -225,13 +228,14 @@ public class BitRateInMbPerSecImpl extends SclObjectImpl implements BitRateInMbP
      * @generated
      */
     @Override
-    public void setUnit(String newUnit) {
+    public void setUnit( String newUnit ) {
         String oldUnit = unit;
         unit = newUnit;
         boolean oldUnitESet = unitESet;
         unitESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.BIT_RATE_IN_MB_PER_SEC__UNIT, oldUnit, unit, !oldUnitESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.BIT_RATE_IN_MB_PER_SEC__UNIT, oldUnit,
+                    unit, !oldUnitESet ) );
     }
 
     /**
@@ -245,8 +249,9 @@ public class BitRateInMbPerSecImpl extends SclObjectImpl implements BitRateInMbP
         boolean oldUnitESet = unitESet;
         unit = UNIT_EDEFAULT;
         unitESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.BIT_RATE_IN_MB_PER_SEC__UNIT, oldUnit, UNIT_EDEFAULT, oldUnitESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.BIT_RATE_IN_MB_PER_SEC__UNIT, oldUnit,
+                    UNIT_EDEFAULT, oldUnitESet ) );
     }
 
     /**
@@ -265,16 +270,16 @@ public class BitRateInMbPerSecImpl extends SclObjectImpl implements BitRateInMbP
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__VALUE:
-                return getValue();
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__MULTIPLIER:
-                return getMultiplier();
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__UNIT:
-                return getUnit();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__VALUE:
+            return getValue();
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__MULTIPLIER:
+            return getMultiplier();
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__UNIT:
+            return getUnit();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -283,19 +288,19 @@ public class BitRateInMbPerSecImpl extends SclObjectImpl implements BitRateInMbP
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__VALUE:
-                setValue((BigDecimal)newValue);
-                return;
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__MULTIPLIER:
-                setMultiplier((UnitMultiplierEnum)newValue);
-                return;
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__UNIT:
-                setUnit((String)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__VALUE:
+            setValue( ( BigDecimal ) newValue );
+            return;
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__MULTIPLIER:
+            setMultiplier( ( UnitMultiplierEnum ) newValue );
+            return;
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__UNIT:
+            setUnit( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -304,19 +309,19 @@ public class BitRateInMbPerSecImpl extends SclObjectImpl implements BitRateInMbP
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__VALUE:
-                setValue(VALUE_EDEFAULT);
-                return;
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__MULTIPLIER:
-                unsetMultiplier();
-                return;
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__UNIT:
-                unsetUnit();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__VALUE:
+            setValue( VALUE_EDEFAULT );
+            return;
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__MULTIPLIER:
+            unsetMultiplier();
+            return;
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__UNIT:
+            unsetUnit();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -325,16 +330,16 @@ public class BitRateInMbPerSecImpl extends SclObjectImpl implements BitRateInMbP
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__VALUE:
-                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__MULTIPLIER:
-                return isSetMultiplier();
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC__UNIT:
-                return isSetUnit();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__VALUE:
+            return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals( value );
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__MULTIPLIER:
+            return isSetMultiplier();
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC__UNIT:
+            return isSetUnit();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -344,16 +349,22 @@ public class BitRateInMbPerSecImpl extends SclObjectImpl implements BitRateInMbP
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (value: ");
-        result.append(value);
-        result.append(", multiplier: ");
-        if (multiplierESet) result.append(multiplier); else result.append("<unset>");
-        result.append(", unit: ");
-        if (unitESet) result.append(unit); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (value: " );
+        result.append( value );
+        result.append( ", multiplier: " );
+        if( multiplierESet )
+            result.append( multiplier );
+        else
+            result.append( "<unset>" );
+        result.append( ", unit: " );
+        if( unitESet )
+            result.append( unit );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CertImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CertImpl.java
index 26f395e..a8c84ad 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CertImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CertImpl.java
@@ -137,13 +137,14 @@ public class CertImpl extends SclObjectImpl implements Cert {
      * @generated
      */
     @Override
-    public void setCommonName(String newCommonName) {
+    public void setCommonName( String newCommonName ) {
         String oldCommonName = commonName;
         commonName = newCommonName;
         boolean oldCommonNameESet = commonNameESet;
         commonNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CERT__COMMON_NAME, oldCommonName, commonName, !oldCommonNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CERT__COMMON_NAME, oldCommonName,
+                    commonName, !oldCommonNameESet ) );
     }
 
     /**
@@ -157,8 +158,9 @@ public class CertImpl extends SclObjectImpl implements Cert {
         boolean oldCommonNameESet = commonNameESet;
         commonName = COMMON_NAME_EDEFAULT;
         commonNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CERT__COMMON_NAME, oldCommonName, COMMON_NAME_EDEFAULT, oldCommonNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CERT__COMMON_NAME, oldCommonName,
+                    COMMON_NAME_EDEFAULT, oldCommonNameESet ) );
     }
 
     /**
@@ -187,13 +189,14 @@ public class CertImpl extends SclObjectImpl implements Cert {
      * @generated
      */
     @Override
-    public void setIdHierarchy(String newIdHierarchy) {
+    public void setIdHierarchy( String newIdHierarchy ) {
         String oldIdHierarchy = idHierarchy;
         idHierarchy = newIdHierarchy;
         boolean oldIdHierarchyESet = idHierarchyESet;
         idHierarchyESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CERT__ID_HIERARCHY, oldIdHierarchy, idHierarchy, !oldIdHierarchyESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CERT__ID_HIERARCHY, oldIdHierarchy,
+                    idHierarchy, !oldIdHierarchyESet ) );
     }
 
     /**
@@ -207,8 +210,9 @@ public class CertImpl extends SclObjectImpl implements Cert {
         boolean oldIdHierarchyESet = idHierarchyESet;
         idHierarchy = ID_HIERARCHY_EDEFAULT;
         idHierarchyESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CERT__ID_HIERARCHY, oldIdHierarchy, ID_HIERARCHY_EDEFAULT, oldIdHierarchyESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CERT__ID_HIERARCHY, oldIdHierarchy,
+                    ID_HIERARCHY_EDEFAULT, oldIdHierarchyESet ) );
     }
 
     /**
@@ -227,14 +231,14 @@ public class CertImpl extends SclObjectImpl implements Cert {
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.CERT__COMMON_NAME:
-                return getCommonName();
-            case SclPackage.CERT__ID_HIERARCHY:
-                return getIdHierarchy();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.CERT__COMMON_NAME:
+            return getCommonName();
+        case SclPackage.CERT__ID_HIERARCHY:
+            return getIdHierarchy();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -243,16 +247,16 @@ public class CertImpl extends SclObjectImpl implements Cert {
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.CERT__COMMON_NAME:
-                setCommonName((String)newValue);
-                return;
-            case SclPackage.CERT__ID_HIERARCHY:
-                setIdHierarchy((String)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.CERT__COMMON_NAME:
+            setCommonName( ( String ) newValue );
+            return;
+        case SclPackage.CERT__ID_HIERARCHY:
+            setIdHierarchy( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -261,16 +265,16 @@ public class CertImpl extends SclObjectImpl implements Cert {
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.CERT__COMMON_NAME:
-                unsetCommonName();
-                return;
-            case SclPackage.CERT__ID_HIERARCHY:
-                unsetIdHierarchy();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.CERT__COMMON_NAME:
+            unsetCommonName();
+            return;
+        case SclPackage.CERT__ID_HIERARCHY:
+            unsetIdHierarchy();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -279,14 +283,14 @@ public class CertImpl extends SclObjectImpl implements Cert {
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.CERT__COMMON_NAME:
-                return isSetCommonName();
-            case SclPackage.CERT__ID_HIERARCHY:
-                return isSetIdHierarchy();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.CERT__COMMON_NAME:
+            return isSetCommonName();
+        case SclPackage.CERT__ID_HIERARCHY:
+            return isSetIdHierarchy();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -296,14 +300,20 @@ public class CertImpl extends SclObjectImpl implements Cert {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (commonName: ");
-        if (commonNameESet) result.append(commonName); else result.append("<unset>");
-        result.append(", idHierarchy: ");
-        if (idHierarchyESet) result.append(idHierarchy); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (commonName: " );
+        if( commonNameESet )
+            result.append( commonName );
+        else
+            result.append( "<unset>" );
+        result.append( ", idHierarchy: " );
+        if( idHierarchyESet )
+            result.append( idHierarchy );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CertificateImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CertificateImpl.java
index 7d6ee22..1fda806 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CertificateImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CertificateImpl.java
@@ -186,8 +186,9 @@ public class CertificateImpl extends NamingImpl implements Certificate {
         serialNumber = newSerialNumber;
         boolean oldSerialNumberESet = serialNumberESet;
         serialNumberESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CERTIFICATE__SERIAL_NUMBER, oldSerialNumber, serialNumber, !oldSerialNumberESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CERTIFICATE__SERIAL_NUMBER,
+                    oldSerialNumber, serialNumber, !oldSerialNumberESet ) );
     }
 
     /**
@@ -201,8 +202,9 @@ public class CertificateImpl extends NamingImpl implements Certificate {
         boolean oldSerialNumberESet = serialNumberESet;
         serialNumber = SERIAL_NUMBER_EDEFAULT;
         serialNumberESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CERTIFICATE__SERIAL_NUMBER, oldSerialNumber, SERIAL_NUMBER_EDEFAULT, oldSerialNumberESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CERTIFICATE__SERIAL_NUMBER,
+                    oldSerialNumber, SERIAL_NUMBER_EDEFAULT, oldSerialNumberESet ) );
     }
 
     /**
@@ -236,8 +238,9 @@ public class CertificateImpl extends NamingImpl implements Certificate {
         xferNumber = newXferNumber;
         boolean oldXferNumberESet = xferNumberESet;
         xferNumberESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CERTIFICATE__XFER_NUMBER, oldXferNumber, xferNumber, !oldXferNumberESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CERTIFICATE__XFER_NUMBER, oldXferNumber,
+                    xferNumber, !oldXferNumberESet ) );
     }
 
     /**
@@ -251,8 +254,9 @@ public class CertificateImpl extends NamingImpl implements Certificate {
         boolean oldXferNumberESet = xferNumberESet;
         xferNumber = XFER_NUMBER_EDEFAULT;
         xferNumberESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CERTIFICATE__XFER_NUMBER, oldXferNumber, XFER_NUMBER_EDEFAULT, oldXferNumberESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CERTIFICATE__XFER_NUMBER,
+                    oldXferNumber, XFER_NUMBER_EDEFAULT, oldXferNumberESet ) );
     }
 
     /**
@@ -285,9 +289,13 @@ public class CertificateImpl extends NamingImpl implements Certificate {
         subject = newSubject;
         boolean oldSubjectESet = subjectESet;
         subjectESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.CERTIFICATE__SUBJECT, oldSubject, newSubject, !oldSubjectESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.CERTIFICATE__SUBJECT, oldSubject, newSubject, !oldSubjectESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -299,20 +307,23 @@ public class CertificateImpl extends NamingImpl implements Certificate {
      */
     @Override
     public void setSubject( Subject newSubject ) {
-        if (newSubject != subject) {
+        if( newSubject != subject ) {
             NotificationChain msgs = null;
-            if (subject != null)
-                msgs = ((InternalEObject)subject).eInverseRemove(this, SclPackage.SUBJECT__PARENT_CERTIFICATE, Subject.class, msgs);
-            if (newSubject != null)
-                msgs = ((InternalEObject)newSubject).eInverseAdd(this, SclPackage.SUBJECT__PARENT_CERTIFICATE, Subject.class, msgs);
-            msgs = basicSetSubject(newSubject, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( subject != null )
+                msgs = ( ( InternalEObject ) subject ).eInverseRemove( this, SclPackage.SUBJECT__PARENT_CERTIFICATE,
+                        Subject.class, msgs );
+            if( newSubject != null )
+                msgs = ( ( InternalEObject ) newSubject ).eInverseAdd( this, SclPackage.SUBJECT__PARENT_CERTIFICATE,
+                        Subject.class, msgs );
+            msgs = basicSetSubject( newSubject, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSubjectESet = subjectESet;
             subjectESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CERTIFICATE__SUBJECT, newSubject, newSubject, !oldSubjectESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CERTIFICATE__SUBJECT, newSubject,
+                        newSubject, !oldSubjectESet ) );
         }
     }
 
@@ -326,9 +337,13 @@ public class CertificateImpl extends NamingImpl implements Certificate {
         subject = null;
         boolean oldSubjectESet = subjectESet;
         subjectESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.CERTIFICATE__SUBJECT, oldSubject, null, oldSubjectESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.CERTIFICATE__SUBJECT, oldSubject, null, oldSubjectESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -340,17 +355,19 @@ public class CertificateImpl extends NamingImpl implements Certificate {
      */
     @Override
     public void unsetSubject() {
-        if (subject != null) {
+        if( subject != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)subject).eInverseRemove(this, SclPackage.SUBJECT__PARENT_CERTIFICATE, Subject.class, msgs);
-            msgs = basicUnsetSubject(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) subject ).eInverseRemove( this, SclPackage.SUBJECT__PARENT_CERTIFICATE,
+                    Subject.class, msgs );
+            msgs = basicUnsetSubject( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSubjectESet = subjectESet;
             subjectESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CERTIFICATE__SUBJECT, null, null, oldSubjectESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CERTIFICATE__SUBJECT, null, null,
+                        oldSubjectESet ) );
         }
     }
 
@@ -384,9 +401,13 @@ public class CertificateImpl extends NamingImpl implements Certificate {
         issuerName = newIssuerName;
         boolean oldIssuerNameESet = issuerNameESet;
         issuerNameESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.CERTIFICATE__ISSUER_NAME, oldIssuerName, newIssuerName, !oldIssuerNameESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.CERTIFICATE__ISSUER_NAME, oldIssuerName, newIssuerName, !oldIssuerNameESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -398,20 +419,23 @@ public class CertificateImpl extends NamingImpl implements Certificate {
      */
     @Override
     public void setIssuerName( IssuerName newIssuerName ) {
-        if (newIssuerName != issuerName) {
+        if( newIssuerName != issuerName ) {
             NotificationChain msgs = null;
-            if (issuerName != null)
-                msgs = ((InternalEObject)issuerName).eInverseRemove(this, SclPackage.ISSUER_NAME__PARENT_CERTIFICATE, IssuerName.class, msgs);
-            if (newIssuerName != null)
-                msgs = ((InternalEObject)newIssuerName).eInverseAdd(this, SclPackage.ISSUER_NAME__PARENT_CERTIFICATE, IssuerName.class, msgs);
-            msgs = basicSetIssuerName(newIssuerName, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( issuerName != null )
+                msgs = ( ( InternalEObject ) issuerName ).eInverseRemove( this,
+                        SclPackage.ISSUER_NAME__PARENT_CERTIFICATE, IssuerName.class, msgs );
+            if( newIssuerName != null )
+                msgs = ( ( InternalEObject ) newIssuerName ).eInverseAdd( this,
+                        SclPackage.ISSUER_NAME__PARENT_CERTIFICATE, IssuerName.class, msgs );
+            msgs = basicSetIssuerName( newIssuerName, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldIssuerNameESet = issuerNameESet;
             issuerNameESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CERTIFICATE__ISSUER_NAME, newIssuerName, newIssuerName, !oldIssuerNameESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CERTIFICATE__ISSUER_NAME,
+                        newIssuerName, newIssuerName, !oldIssuerNameESet ) );
         }
     }
 
@@ -425,9 +449,13 @@ public class CertificateImpl extends NamingImpl implements Certificate {
         issuerName = null;
         boolean oldIssuerNameESet = issuerNameESet;
         issuerNameESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.CERTIFICATE__ISSUER_NAME, oldIssuerName, null, oldIssuerNameESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.CERTIFICATE__ISSUER_NAME, oldIssuerName, null, oldIssuerNameESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -439,17 +467,19 @@ public class CertificateImpl extends NamingImpl implements Certificate {
      */
     @Override
     public void unsetIssuerName() {
-        if (issuerName != null) {
+        if( issuerName != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)issuerName).eInverseRemove(this, SclPackage.ISSUER_NAME__PARENT_CERTIFICATE, IssuerName.class, msgs);
-            msgs = basicUnsetIssuerName(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) issuerName ).eInverseRemove( this, SclPackage.ISSUER_NAME__PARENT_CERTIFICATE,
+                    IssuerName.class, msgs );
+            msgs = basicUnsetIssuerName( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldIssuerNameESet = issuerNameESet;
             issuerNameESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CERTIFICATE__ISSUER_NAME, null, null, oldIssuerNameESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CERTIFICATE__ISSUER_NAME, null,
+                        null, oldIssuerNameESet ) );
         }
     }
 
@@ -470,17 +500,19 @@ public class CertificateImpl extends NamingImpl implements Certificate {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CERTIFICATE__SUBJECT:
-                if (subject != null)
-                    msgs = ((InternalEObject)subject).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.CERTIFICATE__SUBJECT, null, msgs);
-                return basicSetSubject((Subject)otherEnd, msgs);
-            case SclPackage.CERTIFICATE__ISSUER_NAME:
-                if (issuerName != null)
-                    msgs = ((InternalEObject)issuerName).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.CERTIFICATE__ISSUER_NAME, null, msgs);
-                return basicSetIssuerName((IssuerName)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CERTIFICATE__SUBJECT:
+            if( subject != null )
+                msgs = ( ( InternalEObject ) subject ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.CERTIFICATE__SUBJECT, null, msgs );
+            return basicSetSubject( ( Subject ) otherEnd, msgs );
+        case SclPackage.CERTIFICATE__ISSUER_NAME:
+            if( issuerName != null )
+                msgs = ( ( InternalEObject ) issuerName ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.CERTIFICATE__ISSUER_NAME, null, msgs );
+            return basicSetIssuerName( ( IssuerName ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -490,13 +522,13 @@ public class CertificateImpl extends NamingImpl implements Certificate {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CERTIFICATE__SUBJECT:
-                return basicUnsetSubject(msgs);
-            case SclPackage.CERTIFICATE__ISSUER_NAME:
-                return basicUnsetIssuerName(msgs);
+        switch( featureID ) {
+        case SclPackage.CERTIFICATE__SUBJECT:
+            return basicUnsetSubject( msgs );
+        case SclPackage.CERTIFICATE__ISSUER_NAME:
+            return basicUnsetIssuerName( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -506,17 +538,17 @@ public class CertificateImpl extends NamingImpl implements Certificate {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CERTIFICATE__SERIAL_NUMBER:
-                return getSerialNumber();
-            case SclPackage.CERTIFICATE__XFER_NUMBER:
-                return getXferNumber();
-            case SclPackage.CERTIFICATE__SUBJECT:
-                return getSubject();
-            case SclPackage.CERTIFICATE__ISSUER_NAME:
-                return getIssuerName();
+        switch( featureID ) {
+        case SclPackage.CERTIFICATE__SERIAL_NUMBER:
+            return getSerialNumber();
+        case SclPackage.CERTIFICATE__XFER_NUMBER:
+            return getXferNumber();
+        case SclPackage.CERTIFICATE__SUBJECT:
+            return getSubject();
+        case SclPackage.CERTIFICATE__ISSUER_NAME:
+            return getIssuerName();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -526,21 +558,21 @@ public class CertificateImpl extends NamingImpl implements Certificate {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CERTIFICATE__SERIAL_NUMBER:
-                setSerialNumber((String)newValue);
-                return;
-            case SclPackage.CERTIFICATE__XFER_NUMBER:
-                setXferNumber((Integer)newValue);
-                return;
-            case SclPackage.CERTIFICATE__SUBJECT:
-                setSubject((Subject)newValue);
-                return;
-            case SclPackage.CERTIFICATE__ISSUER_NAME:
-                setIssuerName((IssuerName)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CERTIFICATE__SERIAL_NUMBER:
+            setSerialNumber( ( String ) newValue );
+            return;
+        case SclPackage.CERTIFICATE__XFER_NUMBER:
+            setXferNumber( ( Integer ) newValue );
+            return;
+        case SclPackage.CERTIFICATE__SUBJECT:
+            setSubject( ( Subject ) newValue );
+            return;
+        case SclPackage.CERTIFICATE__ISSUER_NAME:
+            setIssuerName( ( IssuerName ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -550,21 +582,21 @@ public class CertificateImpl extends NamingImpl implements Certificate {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CERTIFICATE__SERIAL_NUMBER:
-                unsetSerialNumber();
-                return;
-            case SclPackage.CERTIFICATE__XFER_NUMBER:
-                unsetXferNumber();
-                return;
-            case SclPackage.CERTIFICATE__SUBJECT:
-                unsetSubject();
-                return;
-            case SclPackage.CERTIFICATE__ISSUER_NAME:
-                unsetIssuerName();
-                return;
+        switch( featureID ) {
+        case SclPackage.CERTIFICATE__SERIAL_NUMBER:
+            unsetSerialNumber();
+            return;
+        case SclPackage.CERTIFICATE__XFER_NUMBER:
+            unsetXferNumber();
+            return;
+        case SclPackage.CERTIFICATE__SUBJECT:
+            unsetSubject();
+            return;
+        case SclPackage.CERTIFICATE__ISSUER_NAME:
+            unsetIssuerName();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -574,17 +606,17 @@ public class CertificateImpl extends NamingImpl implements Certificate {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CERTIFICATE__SERIAL_NUMBER:
-                return isSetSerialNumber();
-            case SclPackage.CERTIFICATE__XFER_NUMBER:
-                return isSetXferNumber();
-            case SclPackage.CERTIFICATE__SUBJECT:
-                return isSetSubject();
-            case SclPackage.CERTIFICATE__ISSUER_NAME:
-                return isSetIssuerName();
+        switch( featureID ) {
+        case SclPackage.CERTIFICATE__SERIAL_NUMBER:
+            return isSetSerialNumber();
+        case SclPackage.CERTIFICATE__XFER_NUMBER:
+            return isSetXferNumber();
+        case SclPackage.CERTIFICATE__SUBJECT:
+            return isSetSubject();
+        case SclPackage.CERTIFICATE__ISSUER_NAME:
+            return isSetIssuerName();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -594,14 +626,20 @@ public class CertificateImpl extends NamingImpl implements Certificate {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (serialNumber: ");
-        if (serialNumberESet) result.append(serialNumber); else result.append("<unset>");
-        result.append(", xferNumber: ");
-        if (xferNumberESet) result.append(xferNumber); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (serialNumber: " );
+        if( serialNumberESet )
+            result.append( serialNumber );
+        else
+            result.append( "<unset>" );
+        result.append( ", xferNumber: " );
+        if( xferNumberESet )
+            result.append( xferNumber );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java
index 5f06bee..33fd74f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java
@@ -325,8 +325,9 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
         apRef = newApRef;
         boolean oldApRefESet = apRefESet;
         apRefESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_LN__AP_REF, oldApRef, apRef, !oldApRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_LN__AP_REF, oldApRef, apRef,
+                    !oldApRefESet ) );
     }
 
     /**
@@ -340,8 +341,9 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
         boolean oldApRefESet = apRefESet;
         apRef = AP_REF_EDEFAULT;
         apRefESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_LN__AP_REF, oldApRef, AP_REF_EDEFAULT, oldApRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_LN__AP_REF, oldApRef,
+                    AP_REF_EDEFAULT, oldApRefESet ) );
     }
 
     /**
@@ -361,8 +363,8 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      */
     @Override
     public RptEnabled getParentRptEnabled() {
-        if (eContainerFeatureID() != SclPackage.CLIENT_LN__PARENT_RPT_ENABLED) return null;
-        return (RptEnabled)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CLIENT_LN__PARENT_RPT_ENABLED ) return null;
+        return ( RptEnabled ) eInternalContainer();
     }
 
     /**
@@ -370,8 +372,9 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentRptEnabled(RptEnabled newParentRptEnabled, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentRptEnabled, SclPackage.CLIENT_LN__PARENT_RPT_ENABLED, msgs);
+    public NotificationChain basicSetParentRptEnabled( RptEnabled newParentRptEnabled, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentRptEnabled, SclPackage.CLIENT_LN__PARENT_RPT_ENABLED,
+                msgs );
         return msgs;
     }
 
@@ -381,20 +384,24 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      * @generated
      */
     @Override
-    public void setParentRptEnabled(RptEnabled newParentRptEnabled) {
-        if (newParentRptEnabled != eInternalContainer() || (eContainerFeatureID() != SclPackage.CLIENT_LN__PARENT_RPT_ENABLED && newParentRptEnabled != null)) {
-            if (EcoreUtil.isAncestor(this, newParentRptEnabled))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentRptEnabled( RptEnabled newParentRptEnabled ) {
+        if( newParentRptEnabled != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CLIENT_LN__PARENT_RPT_ENABLED
+                        && newParentRptEnabled != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentRptEnabled ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentRptEnabled != null)
-                msgs = ((InternalEObject)newParentRptEnabled).eInverseAdd(this, SclPackage.RPT_ENABLED__CLIENT_LN, RptEnabled.class, msgs);
-            msgs = basicSetParentRptEnabled(newParentRptEnabled, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentRptEnabled != null )
+                msgs = ( ( InternalEObject ) newParentRptEnabled ).eInverseAdd( this, SclPackage.RPT_ENABLED__CLIENT_LN,
+                        RptEnabled.class, msgs );
+            msgs = basicSetParentRptEnabled( newParentRptEnabled, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_LN__PARENT_RPT_ENABLED, newParentRptEnabled, newParentRptEnabled));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_LN__PARENT_RPT_ENABLED,
+                    newParentRptEnabled, newParentRptEnabled ) );
     }
 
     /**
@@ -418,8 +425,9 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
         iedName = newIedName;
         boolean oldIedNameESet = iedNameESet;
         iedNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_LN__IED_NAME, oldIedName, iedName, !oldIedNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_LN__IED_NAME, oldIedName, iedName,
+                    !oldIedNameESet ) );
     }
 
     /**
@@ -433,8 +441,9 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
         boolean oldIedNameESet = iedNameESet;
         iedName = IED_NAME_EDEFAULT;
         iedNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_LN__IED_NAME, oldIedName, IED_NAME_EDEFAULT, oldIedNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_LN__IED_NAME, oldIedName,
+                    IED_NAME_EDEFAULT, oldIedNameESet ) );
     }
 
     /**
@@ -468,8 +477,9 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
         ldInst = newLdInst;
         boolean oldLdInstESet = ldInstESet;
         ldInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_LN__LD_INST, oldLdInst, ldInst, !oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_LN__LD_INST, oldLdInst, ldInst,
+                    !oldLdInstESet ) );
     }
 
     /**
@@ -483,8 +493,9 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
         boolean oldLdInstESet = ldInstESet;
         ldInst = LD_INST_EDEFAULT;
         ldInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_LN__LD_INST, oldLdInst, LD_INST_EDEFAULT, oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_LN__LD_INST, oldLdInst,
+                    LD_INST_EDEFAULT, oldLdInstESet ) );
     }
 
     /**
@@ -518,8 +529,9 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
         lnClass = newLnClass;
         boolean oldLnClassESet = lnClassESet;
         lnClassESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_LN__LN_CLASS, oldLnClass, lnClass, !oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_LN__LN_CLASS, oldLnClass, lnClass,
+                    !oldLnClassESet ) );
     }
 
     /**
@@ -533,8 +545,9 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
         boolean oldLnClassESet = lnClassESet;
         lnClass = LN_CLASS_EDEFAULT;
         lnClassESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_LN__LN_CLASS, oldLnClass, LN_CLASS_EDEFAULT, oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_LN__LN_CLASS, oldLnClass,
+                    LN_CLASS_EDEFAULT, oldLnClassESet ) );
     }
 
     /**
@@ -568,8 +581,9 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
         lnInst = newLnInst;
         boolean oldLnInstESet = lnInstESet;
         lnInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_LN__LN_INST, oldLnInst, lnInst, !oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_LN__LN_INST, oldLnInst, lnInst,
+                    !oldLnInstESet ) );
     }
 
     /**
@@ -583,8 +597,9 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
         boolean oldLnInstESet = lnInstESet;
         lnInst = LN_INST_EDEFAULT;
         lnInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_LN__LN_INST, oldLnInst, LN_INST_EDEFAULT, oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_LN__LN_INST, oldLnInst,
+                    LN_INST_EDEFAULT, oldLnInstESet ) );
     }
 
     /**
@@ -618,8 +633,9 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
         prefix = newPrefix;
         boolean oldPrefixESet = prefixESet;
         prefixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_LN__PREFIX, oldPrefix, prefix, !oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_LN__PREFIX, oldPrefix, prefix,
+                    !oldPrefixESet ) );
     }
 
     /**
@@ -633,8 +649,9 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
         boolean oldPrefixESet = prefixESet;
         prefix = PREFIX_EDEFAULT;
         prefixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_LN__PREFIX, oldPrefix, PREFIX_EDEFAULT, oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_LN__PREFIX, oldPrefix,
+                    PREFIX_EDEFAULT, oldPrefixESet ) );
     }
 
     /**
@@ -663,13 +680,14 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      * @generated
      */
     @Override
-    public void setDesc(String newDesc) {
+    public void setDesc( String newDesc ) {
         String oldDesc = desc;
         desc = newDesc;
         boolean oldDescESet = descESet;
         descESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_LN__DESC, oldDesc, desc, !oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_LN__DESC, oldDesc, desc,
+                    !oldDescESet ) );
     }
 
     /**
@@ -683,8 +701,9 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
         boolean oldDescESet = descESet;
         desc = DESC_EDEFAULT;
         descESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_LN__DESC, oldDesc, DESC_EDEFAULT, oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_LN__DESC, oldDesc,
+                    DESC_EDEFAULT, oldDescESet ) );
     }
 
     /**
@@ -712,14 +731,18 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToAnyLN(AnyLN newRefersToAnyLN, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToAnyLN( AnyLN newRefersToAnyLN, NotificationChain msgs ) {
         AnyLN oldRefersToAnyLN = refersToAnyLN;
         refersToAnyLN = newRefersToAnyLN;
         boolean oldRefersToAnyLNESet = refersToAnyLNESet;
         refersToAnyLNESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_LN__REFERS_TO_ANY_LN, oldRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.CLIENT_LN__REFERS_TO_ANY_LN, oldRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -730,21 +753,24 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      * @generated
      */
     @Override
-    public void setRefersToAnyLN(AnyLN newRefersToAnyLN) {
-        if (newRefersToAnyLN != refersToAnyLN) {
+    public void setRefersToAnyLN( AnyLN newRefersToAnyLN ) {
+        if( newRefersToAnyLN != refersToAnyLN ) {
             NotificationChain msgs = null;
-            if (refersToAnyLN != null)
-                msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN, AnyLN.class, msgs);
-            if (newRefersToAnyLN != null)
-                msgs = ((InternalEObject)newRefersToAnyLN).eInverseAdd(this, SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN, AnyLN.class, msgs);
-            msgs = basicSetRefersToAnyLN(newRefersToAnyLN, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToAnyLN != null )
+                msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this,
+                        SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN, AnyLN.class, msgs );
+            if( newRefersToAnyLN != null )
+                msgs = ( ( InternalEObject ) newRefersToAnyLN ).eInverseAdd( this,
+                        SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN, AnyLN.class, msgs );
+            msgs = basicSetRefersToAnyLN( newRefersToAnyLN, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAnyLNESet = refersToAnyLNESet;
             refersToAnyLNESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_LN__REFERS_TO_ANY_LN, newRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_LN__REFERS_TO_ANY_LN,
+                        newRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet ) );
         }
     }
 
@@ -753,14 +779,18 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToAnyLN(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToAnyLN( NotificationChain msgs ) {
         AnyLN oldRefersToAnyLN = refersToAnyLN;
         refersToAnyLN = null;
         boolean oldRefersToAnyLNESet = refersToAnyLNESet;
         refersToAnyLNESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_LN__REFERS_TO_ANY_LN, oldRefersToAnyLN, null, oldRefersToAnyLNESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.CLIENT_LN__REFERS_TO_ANY_LN, oldRefersToAnyLN, null, oldRefersToAnyLNESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -772,17 +802,19 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      */
     @Override
     public void unsetRefersToAnyLN() {
-        if (refersToAnyLN != null) {
+        if( refersToAnyLN != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN, AnyLN.class, msgs);
-            msgs = basicUnsetRefersToAnyLN(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this, SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN,
+                    AnyLN.class, msgs );
+            msgs = basicUnsetRefersToAnyLN( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAnyLNESet = refersToAnyLNESet;
             refersToAnyLNESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_LN__REFERS_TO_ANY_LN, null, null, oldRefersToAnyLNESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_LN__REFERS_TO_ANY_LN, null,
+                        null, oldRefersToAnyLNESet ) );
         }
     }
 
@@ -803,17 +835,18 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CLIENT_LN__PARENT_RPT_ENABLED:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentRptEnabled((RptEnabled)otherEnd, msgs);
-            case SclPackage.CLIENT_LN__REFERS_TO_ANY_LN:
-                if (refersToAnyLN != null)
-                    msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN, AnyLN.class, msgs);
-                return basicSetRefersToAnyLN((AnyLN)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CLIENT_LN__PARENT_RPT_ENABLED:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentRptEnabled( ( RptEnabled ) otherEnd, msgs );
+        case SclPackage.CLIENT_LN__REFERS_TO_ANY_LN:
+            if( refersToAnyLN != null )
+                msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this,
+                        SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN, AnyLN.class, msgs );
+            return basicSetRefersToAnyLN( ( AnyLN ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -823,13 +856,13 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CLIENT_LN__PARENT_RPT_ENABLED:
-                return basicSetParentRptEnabled(null, msgs);
-            case SclPackage.CLIENT_LN__REFERS_TO_ANY_LN:
-                return basicUnsetRefersToAnyLN(msgs);
+        switch( featureID ) {
+        case SclPackage.CLIENT_LN__PARENT_RPT_ENABLED:
+            return basicSetParentRptEnabled( null, msgs );
+        case SclPackage.CLIENT_LN__REFERS_TO_ANY_LN:
+            return basicUnsetRefersToAnyLN( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -839,11 +872,12 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.CLIENT_LN__PARENT_RPT_ENABLED:
-                return eInternalContainer().eInverseRemove(this, SclPackage.RPT_ENABLED__CLIENT_LN, RptEnabled.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.CLIENT_LN__PARENT_RPT_ENABLED:
+            return eInternalContainer().eInverseRemove( this, SclPackage.RPT_ENABLED__CLIENT_LN, RptEnabled.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -853,27 +887,27 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CLIENT_LN__DESC:
-                return getDesc();
-            case SclPackage.CLIENT_LN__IED_NAME:
-                return getIedName();
-            case SclPackage.CLIENT_LN__LD_INST:
-                return getLdInst();
-            case SclPackage.CLIENT_LN__LN_CLASS:
-                return getLnClass();
-            case SclPackage.CLIENT_LN__LN_INST:
-                return getLnInst();
-            case SclPackage.CLIENT_LN__PREFIX:
-                return getPrefix();
-            case SclPackage.CLIENT_LN__AP_REF:
-                return getApRef();
-            case SclPackage.CLIENT_LN__PARENT_RPT_ENABLED:
-                return getParentRptEnabled();
-            case SclPackage.CLIENT_LN__REFERS_TO_ANY_LN:
-                return getRefersToAnyLN();
+        switch( featureID ) {
+        case SclPackage.CLIENT_LN__DESC:
+            return getDesc();
+        case SclPackage.CLIENT_LN__IED_NAME:
+            return getIedName();
+        case SclPackage.CLIENT_LN__LD_INST:
+            return getLdInst();
+        case SclPackage.CLIENT_LN__LN_CLASS:
+            return getLnClass();
+        case SclPackage.CLIENT_LN__LN_INST:
+            return getLnInst();
+        case SclPackage.CLIENT_LN__PREFIX:
+            return getPrefix();
+        case SclPackage.CLIENT_LN__AP_REF:
+            return getApRef();
+        case SclPackage.CLIENT_LN__PARENT_RPT_ENABLED:
+            return getParentRptEnabled();
+        case SclPackage.CLIENT_LN__REFERS_TO_ANY_LN:
+            return getRefersToAnyLN();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -883,36 +917,36 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CLIENT_LN__DESC:
-                setDesc((String)newValue);
-                return;
-            case SclPackage.CLIENT_LN__IED_NAME:
-                setIedName((String)newValue);
-                return;
-            case SclPackage.CLIENT_LN__LD_INST:
-                setLdInst((String)newValue);
-                return;
-            case SclPackage.CLIENT_LN__LN_CLASS:
-                setLnClass((String)newValue);
-                return;
-            case SclPackage.CLIENT_LN__LN_INST:
-                setLnInst((String)newValue);
-                return;
-            case SclPackage.CLIENT_LN__PREFIX:
-                setPrefix((String)newValue);
-                return;
-            case SclPackage.CLIENT_LN__AP_REF:
-                setApRef((String)newValue);
-                return;
-            case SclPackage.CLIENT_LN__PARENT_RPT_ENABLED:
-                setParentRptEnabled((RptEnabled)newValue);
-                return;
-            case SclPackage.CLIENT_LN__REFERS_TO_ANY_LN:
-                setRefersToAnyLN((AnyLN)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CLIENT_LN__DESC:
+            setDesc( ( String ) newValue );
+            return;
+        case SclPackage.CLIENT_LN__IED_NAME:
+            setIedName( ( String ) newValue );
+            return;
+        case SclPackage.CLIENT_LN__LD_INST:
+            setLdInst( ( String ) newValue );
+            return;
+        case SclPackage.CLIENT_LN__LN_CLASS:
+            setLnClass( ( String ) newValue );
+            return;
+        case SclPackage.CLIENT_LN__LN_INST:
+            setLnInst( ( String ) newValue );
+            return;
+        case SclPackage.CLIENT_LN__PREFIX:
+            setPrefix( ( String ) newValue );
+            return;
+        case SclPackage.CLIENT_LN__AP_REF:
+            setApRef( ( String ) newValue );
+            return;
+        case SclPackage.CLIENT_LN__PARENT_RPT_ENABLED:
+            setParentRptEnabled( ( RptEnabled ) newValue );
+            return;
+        case SclPackage.CLIENT_LN__REFERS_TO_ANY_LN:
+            setRefersToAnyLN( ( AnyLN ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -922,36 +956,36 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CLIENT_LN__DESC:
-                unsetDesc();
-                return;
-            case SclPackage.CLIENT_LN__IED_NAME:
-                unsetIedName();
-                return;
-            case SclPackage.CLIENT_LN__LD_INST:
-                unsetLdInst();
-                return;
-            case SclPackage.CLIENT_LN__LN_CLASS:
-                unsetLnClass();
-                return;
-            case SclPackage.CLIENT_LN__LN_INST:
-                unsetLnInst();
-                return;
-            case SclPackage.CLIENT_LN__PREFIX:
-                unsetPrefix();
-                return;
-            case SclPackage.CLIENT_LN__AP_REF:
-                unsetApRef();
-                return;
-            case SclPackage.CLIENT_LN__PARENT_RPT_ENABLED:
-                setParentRptEnabled((RptEnabled)null);
-                return;
-            case SclPackage.CLIENT_LN__REFERS_TO_ANY_LN:
-                unsetRefersToAnyLN();
-                return;
+        switch( featureID ) {
+        case SclPackage.CLIENT_LN__DESC:
+            unsetDesc();
+            return;
+        case SclPackage.CLIENT_LN__IED_NAME:
+            unsetIedName();
+            return;
+        case SclPackage.CLIENT_LN__LD_INST:
+            unsetLdInst();
+            return;
+        case SclPackage.CLIENT_LN__LN_CLASS:
+            unsetLnClass();
+            return;
+        case SclPackage.CLIENT_LN__LN_INST:
+            unsetLnInst();
+            return;
+        case SclPackage.CLIENT_LN__PREFIX:
+            unsetPrefix();
+            return;
+        case SclPackage.CLIENT_LN__AP_REF:
+            unsetApRef();
+            return;
+        case SclPackage.CLIENT_LN__PARENT_RPT_ENABLED:
+            setParentRptEnabled( ( RptEnabled ) null );
+            return;
+        case SclPackage.CLIENT_LN__REFERS_TO_ANY_LN:
+            unsetRefersToAnyLN();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -961,27 +995,27 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CLIENT_LN__DESC:
-                return isSetDesc();
-            case SclPackage.CLIENT_LN__IED_NAME:
-                return isSetIedName();
-            case SclPackage.CLIENT_LN__LD_INST:
-                return isSetLdInst();
-            case SclPackage.CLIENT_LN__LN_CLASS:
-                return isSetLnClass();
-            case SclPackage.CLIENT_LN__LN_INST:
-                return isSetLnInst();
-            case SclPackage.CLIENT_LN__PREFIX:
-                return isSetPrefix();
-            case SclPackage.CLIENT_LN__AP_REF:
-                return isSetApRef();
-            case SclPackage.CLIENT_LN__PARENT_RPT_ENABLED:
-                return getParentRptEnabled() != null;
-            case SclPackage.CLIENT_LN__REFERS_TO_ANY_LN:
-                return isSetRefersToAnyLN();
+        switch( featureID ) {
+        case SclPackage.CLIENT_LN__DESC:
+            return isSetDesc();
+        case SclPackage.CLIENT_LN__IED_NAME:
+            return isSetIedName();
+        case SclPackage.CLIENT_LN__LD_INST:
+            return isSetLdInst();
+        case SclPackage.CLIENT_LN__LN_CLASS:
+            return isSetLnClass();
+        case SclPackage.CLIENT_LN__LN_INST:
+            return isSetLnInst();
+        case SclPackage.CLIENT_LN__PREFIX:
+            return isSetPrefix();
+        case SclPackage.CLIENT_LN__AP_REF:
+            return isSetApRef();
+        case SclPackage.CLIENT_LN__PARENT_RPT_ENABLED:
+            return getParentRptEnabled() != null;
+        case SclPackage.CLIENT_LN__REFERS_TO_ANY_LN:
+            return isSetRefersToAnyLN();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -990,29 +1024,38 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      * @generated
      */
     @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDesc.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.CLIENT_LN__DESC: return SclPackage.AG_DESC__DESC;
-                default: return -1;
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDesc.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.CLIENT_LN__DESC:
+                return SclPackage.AG_DESC__DESC;
+            default:
+                return -1;
             }
         }
-        if (baseClass == AgLDRef.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.CLIENT_LN__IED_NAME: return SclPackage.AG_LD_REF__IED_NAME;
-                case SclPackage.CLIENT_LN__LD_INST: return SclPackage.AG_LD_REF__LD_INST;
-                default: return -1;
+        if( baseClass == AgLDRef.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.CLIENT_LN__IED_NAME:
+                return SclPackage.AG_LD_REF__IED_NAME;
+            case SclPackage.CLIENT_LN__LD_INST:
+                return SclPackage.AG_LD_REF__LD_INST;
+            default:
+                return -1;
             }
         }
-        if (baseClass == AgLNRef.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.CLIENT_LN__LN_CLASS: return SclPackage.AG_LN_REF__LN_CLASS;
-                case SclPackage.CLIENT_LN__LN_INST: return SclPackage.AG_LN_REF__LN_INST;
-                case SclPackage.CLIENT_LN__PREFIX: return SclPackage.AG_LN_REF__PREFIX;
-                default: return -1;
+        if( baseClass == AgLNRef.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.CLIENT_LN__LN_CLASS:
+                return SclPackage.AG_LN_REF__LN_CLASS;
+            case SclPackage.CLIENT_LN__LN_INST:
+                return SclPackage.AG_LN_REF__LN_INST;
+            case SclPackage.CLIENT_LN__PREFIX:
+                return SclPackage.AG_LN_REF__PREFIX;
+            default:
+                return -1;
             }
         }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
     }
 
     /**
@@ -1021,29 +1064,38 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      * @generated
      */
     @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDesc.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_DESC__DESC: return SclPackage.CLIENT_LN__DESC;
-                default: return -1;
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDesc.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_DESC__DESC:
+                return SclPackage.CLIENT_LN__DESC;
+            default:
+                return -1;
             }
         }
-        if (baseClass == AgLDRef.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_LD_REF__IED_NAME: return SclPackage.CLIENT_LN__IED_NAME;
-                case SclPackage.AG_LD_REF__LD_INST: return SclPackage.CLIENT_LN__LD_INST;
-                default: return -1;
+        if( baseClass == AgLDRef.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_LD_REF__IED_NAME:
+                return SclPackage.CLIENT_LN__IED_NAME;
+            case SclPackage.AG_LD_REF__LD_INST:
+                return SclPackage.CLIENT_LN__LD_INST;
+            default:
+                return -1;
             }
         }
-        if (baseClass == AgLNRef.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_LN_REF__LN_CLASS: return SclPackage.CLIENT_LN__LN_CLASS;
-                case SclPackage.AG_LN_REF__LN_INST: return SclPackage.CLIENT_LN__LN_INST;
-                case SclPackage.AG_LN_REF__PREFIX: return SclPackage.CLIENT_LN__PREFIX;
-                default: return -1;
+        if( baseClass == AgLNRef.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_LN_REF__LN_CLASS:
+                return SclPackage.CLIENT_LN__LN_CLASS;
+            case SclPackage.AG_LN_REF__LN_INST:
+                return SclPackage.CLIENT_LN__LN_INST;
+            case SclPackage.AG_LN_REF__PREFIX:
+                return SclPackage.CLIENT_LN__PREFIX;
+            default:
+                return -1;
             }
         }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
     }
 
     /**
@@ -1053,24 +1105,45 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (desc: ");
-        if (descESet) result.append(desc); else result.append("<unset>");
-        result.append(", iedName: ");
-        if (iedNameESet) result.append(iedName); else result.append("<unset>");
-        result.append(", ldInst: ");
-        if (ldInstESet) result.append(ldInst); else result.append("<unset>");
-        result.append(", lnClass: ");
-        if (lnClassESet) result.append(lnClass); else result.append("<unset>");
-        result.append(", lnInst: ");
-        if (lnInstESet) result.append(lnInst); else result.append("<unset>");
-        result.append(", prefix: ");
-        if (prefixESet) result.append(prefix); else result.append("<unset>");
-        result.append(", apRef: ");
-        if (apRefESet) result.append(apRef); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (desc: " );
+        if( descESet )
+            result.append( desc );
+        else
+            result.append( "<unset>" );
+        result.append( ", iedName: " );
+        if( iedNameESet )
+            result.append( iedName );
+        else
+            result.append( "<unset>" );
+        result.append( ", ldInst: " );
+        if( ldInstESet )
+            result.append( ldInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnClass: " );
+        if( lnClassESet )
+            result.append( lnClass );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnInst: " );
+        if( lnInstESet )
+            result.append( lnInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", prefix: " );
+        if( prefixESet )
+            result.append( prefix );
+        else
+            result.append( "<unset>" );
+        result.append( ", apRef: " );
+        if( apRefESet )
+            result.append( apRef );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -1078,7 +1151,7 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         // iedName The name of the IED where the LN resides
         // apRef   The name of the access point via which the IED shall be accessed. Optional, not needed if the IED has only one access point.
         // ldInst  The instance identification of the LD where the LN resides
@@ -1089,21 +1162,21 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
 
         String messagePrefix = "[SCL links] while resolving link from ClientLN on line " + getLineNumber() + ": ";
 
-        if(( getIedName() == null ) || getIedName().isEmpty() ) {
+        if( ( getIedName() == null ) || getIedName().isEmpty() ) {
             console.warning( messagePrefix, "iedName is missing" );
             return;
         }
-        if(( getLdInst() == null ) || getLdInst().isEmpty() ) {
+        if( ( getLdInst() == null ) || getLdInst().isEmpty() ) {
             console.warning( messagePrefix, "ldInst is missing" );
             return;
         }
-        if(( getLnClass() == null ) || getLnClass().isEmpty() ) {
+        if( ( getLnClass() == null ) || getLnClass().isEmpty() ) {
             console.warning( messagePrefix, "lnClass is missing" );
             return;
         }
 
         // If the reference is to an LN at a pure client access point, then the value of ldInst shall be LD0
-        if( "LD0".equals( getLdInst() )) {
+        if( "LD0".equals( getLdInst() ) ) {
             console.verbose( messagePrefix, "ldInst is LD0: pure client access point, therefore no link" );
             return;
         }
@@ -1117,15 +1190,17 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
             return;
         }
         console.verbose( messagePrefix, "found ", mess1, " on line ", ied.getLeft().getLineNumber() );
-        
+
         Pair< AccessPoint, Integer > ap = null;
-        if(( getApRef() == null ) || getApRef().isEmpty() ) {
+        if( ( getApRef() == null ) || getApRef().isEmpty() ) {
             if( ied.getLeft().getAccessPoint().size() == 0 ) {
-                console.warning( messagePrefix, "no AccessPoint found in ied ( name = ", ied.getLeft().getName(), " )" );
+                console.warning( messagePrefix, "no AccessPoint found in ied ( name = ", ied.getLeft().getName(),
+                        " )" );
                 return;
             }
             if( ied.getLeft().getAccessPoint().size() > 1 ) {
-                console.warning( messagePrefix, "found several AccessPoint in ied ( name = ", ied.getLeft().getName(), " ) but apRef not specified" );
+                console.warning( messagePrefix, "found several AccessPoint in ied ( name = ", ied.getLeft().getName(),
+                        " ) but apRef not specified" );
                 return;
             }
             ap = Pair.of( ied.getLeft().getAccessPoint().get( 0 ), 1 );
@@ -1145,10 +1220,11 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
         if( lDevice.getLeft() == null ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess3, lDevice.getRight() );
             return;
-        }        
+        }
         console.verbose( messagePrefix, "found ", mess3, " on line ", lDevice.getLeft().getLineNumber() );
 
-        Pair< AnyLN,Integer > anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(), getPrefix() );
+        Pair< AnyLN, Integer > anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(),
+                getPrefix() );
         String mess4 = "LN( lnClass = " + getLnClass();
         if( getLnInst() != null ) {
             mess4 += ", inst = " + getLnInst();
@@ -1160,7 +1236,8 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
             return;
         }
         setRefersToAnyLN( anyLN.getLeft() );
-        console.info( "[SCL links] ClientLN on line ", getLineNumber(), " refers to ", mess4, " on line ", getRefersToAnyLN().getLineNumber() );
+        console.info( "[SCL links] ClientLN on line ", getLineNumber(), " refers to ", mess4, " on line ",
+                getRefersToAnyLN().getLineNumber() );
     }
 
 } //ClientLNImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientServicesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientServicesImpl.java
index 9a529be..2b979fd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientServicesImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientServicesImpl.java
@@ -547,8 +547,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         bufReport = newBufReport;
         boolean oldBufReportESet = bufReportESet;
         bufReportESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__BUF_REPORT, oldBufReport, bufReport, !oldBufReportESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__BUF_REPORT,
+                    oldBufReport, bufReport, !oldBufReportESet ) );
     }
 
     /**
@@ -562,8 +563,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         boolean oldBufReportESet = bufReportESet;
         bufReport = BUF_REPORT_EDEFAULT;
         bufReportESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__BUF_REPORT, oldBufReport, BUF_REPORT_EDEFAULT, oldBufReportESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__BUF_REPORT,
+                    oldBufReport, BUF_REPORT_EDEFAULT, oldBufReportESet ) );
     }
 
     /**
@@ -597,8 +599,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         goose = newGoose;
         boolean oldGooseESet = gooseESet;
         gooseESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__GOOSE, oldGoose, goose, !oldGooseESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__GOOSE, oldGoose, goose,
+                    !oldGooseESet ) );
     }
 
     /**
@@ -612,8 +615,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         boolean oldGooseESet = gooseESet;
         goose = GOOSE_EDEFAULT;
         gooseESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__GOOSE, oldGoose, GOOSE_EDEFAULT, oldGooseESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__GOOSE, oldGoose,
+                    GOOSE_EDEFAULT, oldGooseESet ) );
     }
 
     /**
@@ -647,8 +651,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         gsse = newGsse;
         boolean oldGsseESet = gsseESet;
         gsseESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__GSSE, oldGsse, gsse, !oldGsseESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__GSSE, oldGsse, gsse,
+                    !oldGsseESet ) );
     }
 
     /**
@@ -662,8 +667,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         boolean oldGsseESet = gsseESet;
         gsse = GSSE_EDEFAULT;
         gsseESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__GSSE, oldGsse, GSSE_EDEFAULT, oldGsseESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__GSSE, oldGsse,
+                    GSSE_EDEFAULT, oldGsseESet ) );
     }
 
     /**
@@ -697,8 +703,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         maxAttributes = newMaxAttributes;
         boolean oldMaxAttributesESet = maxAttributesESet;
         maxAttributesESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__MAX_ATTRIBUTES, oldMaxAttributes, maxAttributes, !oldMaxAttributesESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__MAX_ATTRIBUTES,
+                    oldMaxAttributes, maxAttributes, !oldMaxAttributesESet ) );
     }
 
     /**
@@ -712,8 +719,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         boolean oldMaxAttributesESet = maxAttributesESet;
         maxAttributes = MAX_ATTRIBUTES_EDEFAULT;
         maxAttributesESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__MAX_ATTRIBUTES, oldMaxAttributes, MAX_ATTRIBUTES_EDEFAULT, oldMaxAttributesESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__MAX_ATTRIBUTES,
+                    oldMaxAttributes, MAX_ATTRIBUTES_EDEFAULT, oldMaxAttributesESet ) );
     }
 
     /**
@@ -747,8 +755,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         maxGOOSE = newMaxGOOSE;
         boolean oldMaxGOOSEESet = maxGOOSEESet;
         maxGOOSEESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__MAX_GOOSE, oldMaxGOOSE, maxGOOSE, !oldMaxGOOSEESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__MAX_GOOSE, oldMaxGOOSE,
+                    maxGOOSE, !oldMaxGOOSEESet ) );
     }
 
     /**
@@ -762,8 +771,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         boolean oldMaxGOOSEESet = maxGOOSEESet;
         maxGOOSE = MAX_GOOSE_EDEFAULT;
         maxGOOSEESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__MAX_GOOSE, oldMaxGOOSE, MAX_GOOSE_EDEFAULT, oldMaxGOOSEESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__MAX_GOOSE,
+                    oldMaxGOOSE, MAX_GOOSE_EDEFAULT, oldMaxGOOSEESet ) );
     }
 
     /**
@@ -797,8 +807,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         maxReports = newMaxReports;
         boolean oldMaxReportsESet = maxReportsESet;
         maxReportsESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__MAX_REPORTS, oldMaxReports, maxReports, !oldMaxReportsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__MAX_REPORTS,
+                    oldMaxReports, maxReports, !oldMaxReportsESet ) );
     }
 
     /**
@@ -812,8 +823,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         boolean oldMaxReportsESet = maxReportsESet;
         maxReports = MAX_REPORTS_EDEFAULT;
         maxReportsESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__MAX_REPORTS, oldMaxReports, MAX_REPORTS_EDEFAULT, oldMaxReportsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__MAX_REPORTS,
+                    oldMaxReports, MAX_REPORTS_EDEFAULT, oldMaxReportsESet ) );
     }
 
     /**
@@ -847,8 +859,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         maxSMV = newMaxSMV;
         boolean oldMaxSMVESet = maxSMVESet;
         maxSMVESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__MAX_SMV, oldMaxSMV, maxSMV, !oldMaxSMVESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__MAX_SMV, oldMaxSMV,
+                    maxSMV, !oldMaxSMVESet ) );
     }
 
     /**
@@ -862,8 +875,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         boolean oldMaxSMVESet = maxSMVESet;
         maxSMV = MAX_SMV_EDEFAULT;
         maxSMVESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__MAX_SMV, oldMaxSMV, MAX_SMV_EDEFAULT, oldMaxSMVESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__MAX_SMV, oldMaxSMV,
+                    MAX_SMV_EDEFAULT, oldMaxSMVESet ) );
     }
 
     /**
@@ -897,8 +911,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         readLog = newReadLog;
         boolean oldReadLogESet = readLogESet;
         readLogESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__READ_LOG, oldReadLog, readLog, !oldReadLogESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__READ_LOG, oldReadLog,
+                    readLog, !oldReadLogESet ) );
     }
 
     /**
@@ -912,8 +927,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         boolean oldReadLogESet = readLogESet;
         readLog = READ_LOG_EDEFAULT;
         readLogESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__READ_LOG, oldReadLog, READ_LOG_EDEFAULT, oldReadLogESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__READ_LOG, oldReadLog,
+                    READ_LOG_EDEFAULT, oldReadLogESet ) );
     }
 
     /**
@@ -947,8 +963,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         supportsLdName = newSupportsLdName;
         boolean oldSupportsLdNameESet = supportsLdNameESet;
         supportsLdNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__SUPPORTS_LD_NAME, oldSupportsLdName, supportsLdName, !oldSupportsLdNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__SUPPORTS_LD_NAME,
+                    oldSupportsLdName, supportsLdName, !oldSupportsLdNameESet ) );
     }
 
     /**
@@ -962,8 +979,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         boolean oldSupportsLdNameESet = supportsLdNameESet;
         supportsLdName = SUPPORTS_LD_NAME_EDEFAULT;
         supportsLdNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__SUPPORTS_LD_NAME, oldSupportsLdName, SUPPORTS_LD_NAME_EDEFAULT, oldSupportsLdNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__SUPPORTS_LD_NAME,
+                    oldSupportsLdName, SUPPORTS_LD_NAME_EDEFAULT, oldSupportsLdNameESet ) );
     }
 
     /**
@@ -997,8 +1015,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         sv = newSv;
         boolean oldSvESet = svESet;
         svESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__SV, oldSv, sv, !oldSvESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__SV, oldSv, sv,
+                    !oldSvESet ) );
     }
 
     /**
@@ -1012,8 +1031,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         boolean oldSvESet = svESet;
         sv = SV_EDEFAULT;
         svESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__SV, oldSv, SV_EDEFAULT, oldSvESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__SV, oldSv,
+                    SV_EDEFAULT, oldSvESet ) );
     }
 
     /**
@@ -1047,8 +1067,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         unbufReport = newUnbufReport;
         boolean oldUnbufReportESet = unbufReportESet;
         unbufReportESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__UNBUF_REPORT, oldUnbufReport, unbufReport, !oldUnbufReportESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__UNBUF_REPORT,
+                    oldUnbufReport, unbufReport, !oldUnbufReportESet ) );
     }
 
     /**
@@ -1062,8 +1083,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         boolean oldUnbufReportESet = unbufReportESet;
         unbufReport = UNBUF_REPORT_EDEFAULT;
         unbufReportESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__UNBUF_REPORT, oldUnbufReport, UNBUF_REPORT_EDEFAULT, oldUnbufReportESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__UNBUF_REPORT,
+                    oldUnbufReport, UNBUF_REPORT_EDEFAULT, oldUnbufReportESet ) );
     }
 
     /**
@@ -1083,8 +1105,8 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.CLIENT_SERVICES__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CLIENT_SERVICES__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -1092,8 +1114,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.CLIENT_SERVICES__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.CLIENT_SERVICES__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -1103,20 +1126,24 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.CLIENT_SERVICES__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CLIENT_SERVICES__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__CLIENT_SERVICES, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this,
+                        SclPackage.SERVICES__CLIENT_SERVICES, Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -1139,9 +1166,14 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         timeSyncProt = newTimeSyncProt;
         boolean oldTimeSyncProtESet = timeSyncProtESet;
         timeSyncProtESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT, oldTimeSyncProt, newTimeSyncProt, !oldTimeSyncProtESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT, oldTimeSyncProt, newTimeSyncProt,
+                    !oldTimeSyncProtESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1153,20 +1185,23 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      */
     @Override
     public void setTimeSyncProt( TimeSyncProt newTimeSyncProt ) {
-        if (newTimeSyncProt != timeSyncProt) {
+        if( newTimeSyncProt != timeSyncProt ) {
             NotificationChain msgs = null;
-            if (timeSyncProt != null)
-                msgs = ((InternalEObject)timeSyncProt).eInverseRemove(this, SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES, TimeSyncProt.class, msgs);
-            if (newTimeSyncProt != null)
-                msgs = ((InternalEObject)newTimeSyncProt).eInverseAdd(this, SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES, TimeSyncProt.class, msgs);
-            msgs = basicSetTimeSyncProt(newTimeSyncProt, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( timeSyncProt != null )
+                msgs = ( ( InternalEObject ) timeSyncProt ).eInverseRemove( this,
+                        SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES, TimeSyncProt.class, msgs );
+            if( newTimeSyncProt != null )
+                msgs = ( ( InternalEObject ) newTimeSyncProt ).eInverseAdd( this,
+                        SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES, TimeSyncProt.class, msgs );
+            msgs = basicSetTimeSyncProt( newTimeSyncProt, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldTimeSyncProtESet = timeSyncProtESet;
             timeSyncProtESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT, newTimeSyncProt, newTimeSyncProt, !oldTimeSyncProtESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT,
+                        newTimeSyncProt, newTimeSyncProt, !oldTimeSyncProtESet ) );
         }
     }
 
@@ -1180,9 +1215,13 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         timeSyncProt = null;
         boolean oldTimeSyncProtESet = timeSyncProtESet;
         timeSyncProtESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT, oldTimeSyncProt, null, oldTimeSyncProtESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT, oldTimeSyncProt, null, oldTimeSyncProtESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1194,17 +1233,19 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      */
     @Override
     public void unsetTimeSyncProt() {
-        if (timeSyncProt != null) {
+        if( timeSyncProt != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)timeSyncProt).eInverseRemove(this, SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES, TimeSyncProt.class, msgs);
-            msgs = basicUnsetTimeSyncProt(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) timeSyncProt ).eInverseRemove( this,
+                    SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES, TimeSyncProt.class, msgs );
+            msgs = basicUnsetTimeSyncProt( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldTimeSyncProtESet = timeSyncProtESet;
             timeSyncProtESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT, null, null, oldTimeSyncProtESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT,
+                        null, null, oldTimeSyncProtESet ) );
         }
     }
 
@@ -1234,13 +1275,14 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      * @generated
      */
     @Override
-    public void setRGOOSE(Boolean newRGOOSE) {
+    public void setRGOOSE( Boolean newRGOOSE ) {
         Boolean oldRGOOSE = rGOOSE;
         rGOOSE = newRGOOSE;
         boolean oldRGOOSEESet = rGOOSEESet;
         rGOOSEESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__RGOOSE, oldRGOOSE, rGOOSE, !oldRGOOSEESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__RGOOSE, oldRGOOSE,
+                    rGOOSE, !oldRGOOSEESet ) );
     }
 
     /**
@@ -1254,8 +1296,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         boolean oldRGOOSEESet = rGOOSEESet;
         rGOOSE = RGOOSE_EDEFAULT;
         rGOOSEESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__RGOOSE, oldRGOOSE, RGOOSE_EDEFAULT, oldRGOOSEESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__RGOOSE, oldRGOOSE,
+                    RGOOSE_EDEFAULT, oldRGOOSEESet ) );
     }
 
     /**
@@ -1284,13 +1327,14 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      * @generated
      */
     @Override
-    public void setRSV(Boolean newRSV) {
+    public void setRSV( Boolean newRSV ) {
         Boolean oldRSV = rSV;
         rSV = newRSV;
         boolean oldRSVESet = rSVESet;
         rSVESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__RSV, oldRSV, rSV, !oldRSVESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__RSV, oldRSV, rSV,
+                    !oldRSVESet ) );
     }
 
     /**
@@ -1304,8 +1348,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         boolean oldRSVESet = rSVESet;
         rSV = RSV_EDEFAULT;
         rSVESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__RSV, oldRSV, RSV_EDEFAULT, oldRSVESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__RSV, oldRSV,
+                    RSV_EDEFAULT, oldRSVESet ) );
     }
 
     /**
@@ -1334,13 +1379,14 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      * @generated
      */
     @Override
-    public void setNoIctBinding(Boolean newNoIctBinding) {
+    public void setNoIctBinding( Boolean newNoIctBinding ) {
         Boolean oldNoIctBinding = noIctBinding;
         noIctBinding = newNoIctBinding;
         boolean oldNoIctBindingESet = noIctBindingESet;
         noIctBindingESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__NO_ICT_BINDING, oldNoIctBinding, noIctBinding, !oldNoIctBindingESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__NO_ICT_BINDING,
+                    oldNoIctBinding, noIctBinding, !oldNoIctBindingESet ) );
     }
 
     /**
@@ -1354,8 +1400,9 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
         boolean oldNoIctBindingESet = noIctBindingESet;
         noIctBinding = NO_ICT_BINDING_EDEFAULT;
         noIctBindingESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__NO_ICT_BINDING, oldNoIctBinding, NO_ICT_BINDING_EDEFAULT, oldNoIctBindingESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__NO_ICT_BINDING,
+                    oldNoIctBinding, NO_ICT_BINDING_EDEFAULT, oldNoIctBindingESet ) );
     }
 
     /**
@@ -1383,14 +1430,18 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetMcSecurity(McSecurity newMcSecurity, NotificationChain msgs) {
+    public NotificationChain basicSetMcSecurity( McSecurity newMcSecurity, NotificationChain msgs ) {
         McSecurity oldMcSecurity = mcSecurity;
         mcSecurity = newMcSecurity;
         boolean oldMcSecurityESet = mcSecurityESet;
         mcSecurityESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__MC_SECURITY, oldMcSecurity, newMcSecurity, !oldMcSecurityESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.CLIENT_SERVICES__MC_SECURITY, oldMcSecurity, newMcSecurity, !oldMcSecurityESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1401,21 +1452,24 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      * @generated
      */
     @Override
-    public void setMcSecurity(McSecurity newMcSecurity) {
-        if (newMcSecurity != mcSecurity) {
+    public void setMcSecurity( McSecurity newMcSecurity ) {
+        if( newMcSecurity != mcSecurity ) {
             NotificationChain msgs = null;
-            if (mcSecurity != null)
-                msgs = ((InternalEObject)mcSecurity).eInverseRemove(this, SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES, McSecurity.class, msgs);
-            if (newMcSecurity != null)
-                msgs = ((InternalEObject)newMcSecurity).eInverseAdd(this, SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES, McSecurity.class, msgs);
-            msgs = basicSetMcSecurity(newMcSecurity, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( mcSecurity != null )
+                msgs = ( ( InternalEObject ) mcSecurity ).eInverseRemove( this,
+                        SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES, McSecurity.class, msgs );
+            if( newMcSecurity != null )
+                msgs = ( ( InternalEObject ) newMcSecurity ).eInverseAdd( this,
+                        SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES, McSecurity.class, msgs );
+            msgs = basicSetMcSecurity( newMcSecurity, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldMcSecurityESet = mcSecurityESet;
             mcSecurityESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CLIENT_SERVICES__MC_SECURITY, newMcSecurity, newMcSecurity, !oldMcSecurityESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CLIENT_SERVICES__MC_SECURITY,
+                        newMcSecurity, newMcSecurity, !oldMcSecurityESet ) );
         }
     }
 
@@ -1424,14 +1478,18 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetMcSecurity(NotificationChain msgs) {
+    public NotificationChain basicUnsetMcSecurity( NotificationChain msgs ) {
         McSecurity oldMcSecurity = mcSecurity;
         mcSecurity = null;
         boolean oldMcSecurityESet = mcSecurityESet;
         mcSecurityESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__MC_SECURITY, oldMcSecurity, null, oldMcSecurityESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.CLIENT_SERVICES__MC_SECURITY, oldMcSecurity, null, oldMcSecurityESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1443,17 +1501,19 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      */
     @Override
     public void unsetMcSecurity() {
-        if (mcSecurity != null) {
+        if( mcSecurity != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)mcSecurity).eInverseRemove(this, SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES, McSecurity.class, msgs);
-            msgs = basicUnsetMcSecurity(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) mcSecurity ).eInverseRemove( this,
+                    SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES, McSecurity.class, msgs );
+            msgs = basicUnsetMcSecurity( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldMcSecurityESet = mcSecurityESet;
             mcSecurityESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CLIENT_SERVICES__MC_SECURITY, null, null, oldMcSecurityESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CLIENT_SERVICES__MC_SECURITY, null,
+                        null, oldMcSecurityESet ) );
         }
     }
 
@@ -1474,21 +1534,23 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CLIENT_SERVICES__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
-            case SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT:
-                if (timeSyncProt != null)
-                    msgs = ((InternalEObject)timeSyncProt).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT, null, msgs);
-                return basicSetTimeSyncProt((TimeSyncProt)otherEnd, msgs);
-            case SclPackage.CLIENT_SERVICES__MC_SECURITY:
-                if (mcSecurity != null)
-                    msgs = ((InternalEObject)mcSecurity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.CLIENT_SERVICES__MC_SECURITY, null, msgs);
-                return basicSetMcSecurity((McSecurity)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CLIENT_SERVICES__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
+        case SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT:
+            if( timeSyncProt != null )
+                msgs = ( ( InternalEObject ) timeSyncProt ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT, null, msgs );
+            return basicSetTimeSyncProt( ( TimeSyncProt ) otherEnd, msgs );
+        case SclPackage.CLIENT_SERVICES__MC_SECURITY:
+            if( mcSecurity != null )
+                msgs = ( ( InternalEObject ) mcSecurity ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.CLIENT_SERVICES__MC_SECURITY, null, msgs );
+            return basicSetMcSecurity( ( McSecurity ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1498,15 +1560,15 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CLIENT_SERVICES__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
-            case SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT:
-                return basicUnsetTimeSyncProt(msgs);
-            case SclPackage.CLIENT_SERVICES__MC_SECURITY:
-                return basicUnsetMcSecurity(msgs);
+        switch( featureID ) {
+        case SclPackage.CLIENT_SERVICES__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
+        case SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT:
+            return basicUnsetTimeSyncProt( msgs );
+        case SclPackage.CLIENT_SERVICES__MC_SECURITY:
+            return basicUnsetMcSecurity( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1516,11 +1578,12 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.CLIENT_SERVICES__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__CLIENT_SERVICES, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.CLIENT_SERVICES__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__CLIENT_SERVICES, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -1530,43 +1593,43 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CLIENT_SERVICES__BUF_REPORT:
-                return getBufReport();
-            case SclPackage.CLIENT_SERVICES__GOOSE:
-                return getGoose();
-            case SclPackage.CLIENT_SERVICES__GSSE:
-                return getGsse();
-            case SclPackage.CLIENT_SERVICES__MAX_ATTRIBUTES:
-                return getMaxAttributes();
-            case SclPackage.CLIENT_SERVICES__MAX_GOOSE:
-                return getMaxGOOSE();
-            case SclPackage.CLIENT_SERVICES__MAX_REPORTS:
-                return getMaxReports();
-            case SclPackage.CLIENT_SERVICES__MAX_SMV:
-                return getMaxSMV();
-            case SclPackage.CLIENT_SERVICES__READ_LOG:
-                return getReadLog();
-            case SclPackage.CLIENT_SERVICES__SUPPORTS_LD_NAME:
-                return getSupportsLdName();
-            case SclPackage.CLIENT_SERVICES__SV:
-                return getSv();
-            case SclPackage.CLIENT_SERVICES__UNBUF_REPORT:
-                return getUnbufReport();
-            case SclPackage.CLIENT_SERVICES__PARENT_SERVICES:
-                return getParentServices();
-            case SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT:
-                return getTimeSyncProt();
-            case SclPackage.CLIENT_SERVICES__RGOOSE:
-                return getRGOOSE();
-            case SclPackage.CLIENT_SERVICES__RSV:
-                return getRSV();
-            case SclPackage.CLIENT_SERVICES__NO_ICT_BINDING:
-                return getNoIctBinding();
-            case SclPackage.CLIENT_SERVICES__MC_SECURITY:
-                return getMcSecurity();
+        switch( featureID ) {
+        case SclPackage.CLIENT_SERVICES__BUF_REPORT:
+            return getBufReport();
+        case SclPackage.CLIENT_SERVICES__GOOSE:
+            return getGoose();
+        case SclPackage.CLIENT_SERVICES__GSSE:
+            return getGsse();
+        case SclPackage.CLIENT_SERVICES__MAX_ATTRIBUTES:
+            return getMaxAttributes();
+        case SclPackage.CLIENT_SERVICES__MAX_GOOSE:
+            return getMaxGOOSE();
+        case SclPackage.CLIENT_SERVICES__MAX_REPORTS:
+            return getMaxReports();
+        case SclPackage.CLIENT_SERVICES__MAX_SMV:
+            return getMaxSMV();
+        case SclPackage.CLIENT_SERVICES__READ_LOG:
+            return getReadLog();
+        case SclPackage.CLIENT_SERVICES__SUPPORTS_LD_NAME:
+            return getSupportsLdName();
+        case SclPackage.CLIENT_SERVICES__SV:
+            return getSv();
+        case SclPackage.CLIENT_SERVICES__UNBUF_REPORT:
+            return getUnbufReport();
+        case SclPackage.CLIENT_SERVICES__PARENT_SERVICES:
+            return getParentServices();
+        case SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT:
+            return getTimeSyncProt();
+        case SclPackage.CLIENT_SERVICES__RGOOSE:
+            return getRGOOSE();
+        case SclPackage.CLIENT_SERVICES__RSV:
+            return getRSV();
+        case SclPackage.CLIENT_SERVICES__NO_ICT_BINDING:
+            return getNoIctBinding();
+        case SclPackage.CLIENT_SERVICES__MC_SECURITY:
+            return getMcSecurity();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -1576,60 +1639,60 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CLIENT_SERVICES__BUF_REPORT:
-                setBufReport((Boolean)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__GOOSE:
-                setGoose((Boolean)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__GSSE:
-                setGsse((Boolean)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__MAX_ATTRIBUTES:
-                setMaxAttributes((Integer)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__MAX_GOOSE:
-                setMaxGOOSE((Integer)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__MAX_REPORTS:
-                setMaxReports((Integer)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__MAX_SMV:
-                setMaxSMV((Integer)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__READ_LOG:
-                setReadLog((Boolean)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__SUPPORTS_LD_NAME:
-                setSupportsLdName((Boolean)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__SV:
-                setSv((Boolean)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__UNBUF_REPORT:
-                setUnbufReport((Boolean)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT:
-                setTimeSyncProt((TimeSyncProt)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__RGOOSE:
-                setRGOOSE((Boolean)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__RSV:
-                setRSV((Boolean)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__NO_ICT_BINDING:
-                setNoIctBinding((Boolean)newValue);
-                return;
-            case SclPackage.CLIENT_SERVICES__MC_SECURITY:
-                setMcSecurity((McSecurity)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CLIENT_SERVICES__BUF_REPORT:
+            setBufReport( ( Boolean ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__GOOSE:
+            setGoose( ( Boolean ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__GSSE:
+            setGsse( ( Boolean ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__MAX_ATTRIBUTES:
+            setMaxAttributes( ( Integer ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__MAX_GOOSE:
+            setMaxGOOSE( ( Integer ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__MAX_REPORTS:
+            setMaxReports( ( Integer ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__MAX_SMV:
+            setMaxSMV( ( Integer ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__READ_LOG:
+            setReadLog( ( Boolean ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__SUPPORTS_LD_NAME:
+            setSupportsLdName( ( Boolean ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__SV:
+            setSv( ( Boolean ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__UNBUF_REPORT:
+            setUnbufReport( ( Boolean ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT:
+            setTimeSyncProt( ( TimeSyncProt ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__RGOOSE:
+            setRGOOSE( ( Boolean ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__RSV:
+            setRSV( ( Boolean ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__NO_ICT_BINDING:
+            setNoIctBinding( ( Boolean ) newValue );
+            return;
+        case SclPackage.CLIENT_SERVICES__MC_SECURITY:
+            setMcSecurity( ( McSecurity ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -1639,60 +1702,60 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CLIENT_SERVICES__BUF_REPORT:
-                unsetBufReport();
-                return;
-            case SclPackage.CLIENT_SERVICES__GOOSE:
-                unsetGoose();
-                return;
-            case SclPackage.CLIENT_SERVICES__GSSE:
-                unsetGsse();
-                return;
-            case SclPackage.CLIENT_SERVICES__MAX_ATTRIBUTES:
-                unsetMaxAttributes();
-                return;
-            case SclPackage.CLIENT_SERVICES__MAX_GOOSE:
-                unsetMaxGOOSE();
-                return;
-            case SclPackage.CLIENT_SERVICES__MAX_REPORTS:
-                unsetMaxReports();
-                return;
-            case SclPackage.CLIENT_SERVICES__MAX_SMV:
-                unsetMaxSMV();
-                return;
-            case SclPackage.CLIENT_SERVICES__READ_LOG:
-                unsetReadLog();
-                return;
-            case SclPackage.CLIENT_SERVICES__SUPPORTS_LD_NAME:
-                unsetSupportsLdName();
-                return;
-            case SclPackage.CLIENT_SERVICES__SV:
-                unsetSv();
-                return;
-            case SclPackage.CLIENT_SERVICES__UNBUF_REPORT:
-                unsetUnbufReport();
-                return;
-            case SclPackage.CLIENT_SERVICES__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
-            case SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT:
-                unsetTimeSyncProt();
-                return;
-            case SclPackage.CLIENT_SERVICES__RGOOSE:
-                unsetRGOOSE();
-                return;
-            case SclPackage.CLIENT_SERVICES__RSV:
-                unsetRSV();
-                return;
-            case SclPackage.CLIENT_SERVICES__NO_ICT_BINDING:
-                unsetNoIctBinding();
-                return;
-            case SclPackage.CLIENT_SERVICES__MC_SECURITY:
-                unsetMcSecurity();
-                return;
+        switch( featureID ) {
+        case SclPackage.CLIENT_SERVICES__BUF_REPORT:
+            unsetBufReport();
+            return;
+        case SclPackage.CLIENT_SERVICES__GOOSE:
+            unsetGoose();
+            return;
+        case SclPackage.CLIENT_SERVICES__GSSE:
+            unsetGsse();
+            return;
+        case SclPackage.CLIENT_SERVICES__MAX_ATTRIBUTES:
+            unsetMaxAttributes();
+            return;
+        case SclPackage.CLIENT_SERVICES__MAX_GOOSE:
+            unsetMaxGOOSE();
+            return;
+        case SclPackage.CLIENT_SERVICES__MAX_REPORTS:
+            unsetMaxReports();
+            return;
+        case SclPackage.CLIENT_SERVICES__MAX_SMV:
+            unsetMaxSMV();
+            return;
+        case SclPackage.CLIENT_SERVICES__READ_LOG:
+            unsetReadLog();
+            return;
+        case SclPackage.CLIENT_SERVICES__SUPPORTS_LD_NAME:
+            unsetSupportsLdName();
+            return;
+        case SclPackage.CLIENT_SERVICES__SV:
+            unsetSv();
+            return;
+        case SclPackage.CLIENT_SERVICES__UNBUF_REPORT:
+            unsetUnbufReport();
+            return;
+        case SclPackage.CLIENT_SERVICES__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
+        case SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT:
+            unsetTimeSyncProt();
+            return;
+        case SclPackage.CLIENT_SERVICES__RGOOSE:
+            unsetRGOOSE();
+            return;
+        case SclPackage.CLIENT_SERVICES__RSV:
+            unsetRSV();
+            return;
+        case SclPackage.CLIENT_SERVICES__NO_ICT_BINDING:
+            unsetNoIctBinding();
+            return;
+        case SclPackage.CLIENT_SERVICES__MC_SECURITY:
+            unsetMcSecurity();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -1702,43 +1765,43 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CLIENT_SERVICES__BUF_REPORT:
-                return isSetBufReport();
-            case SclPackage.CLIENT_SERVICES__GOOSE:
-                return isSetGoose();
-            case SclPackage.CLIENT_SERVICES__GSSE:
-                return isSetGsse();
-            case SclPackage.CLIENT_SERVICES__MAX_ATTRIBUTES:
-                return isSetMaxAttributes();
-            case SclPackage.CLIENT_SERVICES__MAX_GOOSE:
-                return isSetMaxGOOSE();
-            case SclPackage.CLIENT_SERVICES__MAX_REPORTS:
-                return isSetMaxReports();
-            case SclPackage.CLIENT_SERVICES__MAX_SMV:
-                return isSetMaxSMV();
-            case SclPackage.CLIENT_SERVICES__READ_LOG:
-                return isSetReadLog();
-            case SclPackage.CLIENT_SERVICES__SUPPORTS_LD_NAME:
-                return isSetSupportsLdName();
-            case SclPackage.CLIENT_SERVICES__SV:
-                return isSetSv();
-            case SclPackage.CLIENT_SERVICES__UNBUF_REPORT:
-                return isSetUnbufReport();
-            case SclPackage.CLIENT_SERVICES__PARENT_SERVICES:
-                return getParentServices() != null;
-            case SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT:
-                return isSetTimeSyncProt();
-            case SclPackage.CLIENT_SERVICES__RGOOSE:
-                return isSetRGOOSE();
-            case SclPackage.CLIENT_SERVICES__RSV:
-                return isSetRSV();
-            case SclPackage.CLIENT_SERVICES__NO_ICT_BINDING:
-                return isSetNoIctBinding();
-            case SclPackage.CLIENT_SERVICES__MC_SECURITY:
-                return isSetMcSecurity();
+        switch( featureID ) {
+        case SclPackage.CLIENT_SERVICES__BUF_REPORT:
+            return isSetBufReport();
+        case SclPackage.CLIENT_SERVICES__GOOSE:
+            return isSetGoose();
+        case SclPackage.CLIENT_SERVICES__GSSE:
+            return isSetGsse();
+        case SclPackage.CLIENT_SERVICES__MAX_ATTRIBUTES:
+            return isSetMaxAttributes();
+        case SclPackage.CLIENT_SERVICES__MAX_GOOSE:
+            return isSetMaxGOOSE();
+        case SclPackage.CLIENT_SERVICES__MAX_REPORTS:
+            return isSetMaxReports();
+        case SclPackage.CLIENT_SERVICES__MAX_SMV:
+            return isSetMaxSMV();
+        case SclPackage.CLIENT_SERVICES__READ_LOG:
+            return isSetReadLog();
+        case SclPackage.CLIENT_SERVICES__SUPPORTS_LD_NAME:
+            return isSetSupportsLdName();
+        case SclPackage.CLIENT_SERVICES__SV:
+            return isSetSv();
+        case SclPackage.CLIENT_SERVICES__UNBUF_REPORT:
+            return isSetUnbufReport();
+        case SclPackage.CLIENT_SERVICES__PARENT_SERVICES:
+            return getParentServices() != null;
+        case SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT:
+            return isSetTimeSyncProt();
+        case SclPackage.CLIENT_SERVICES__RGOOSE:
+            return isSetRGOOSE();
+        case SclPackage.CLIENT_SERVICES__RSV:
+            return isSetRSV();
+        case SclPackage.CLIENT_SERVICES__NO_ICT_BINDING:
+            return isSetNoIctBinding();
+        case SclPackage.CLIENT_SERVICES__MC_SECURITY:
+            return isSetMcSecurity();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -1748,38 +1811,80 @@ public class ClientServicesImpl extends SclObjectImpl implements ClientServices
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (bufReport: ");
-        if (bufReportESet) result.append(bufReport); else result.append("<unset>");
-        result.append(", goose: ");
-        if (gooseESet) result.append(goose); else result.append("<unset>");
-        result.append(", gsse: ");
-        if (gsseESet) result.append(gsse); else result.append("<unset>");
-        result.append(", maxAttributes: ");
-        if (maxAttributesESet) result.append(maxAttributes); else result.append("<unset>");
-        result.append(", maxGOOSE: ");
-        if (maxGOOSEESet) result.append(maxGOOSE); else result.append("<unset>");
-        result.append(", maxReports: ");
-        if (maxReportsESet) result.append(maxReports); else result.append("<unset>");
-        result.append(", maxSMV: ");
-        if (maxSMVESet) result.append(maxSMV); else result.append("<unset>");
-        result.append(", readLog: ");
-        if (readLogESet) result.append(readLog); else result.append("<unset>");
-        result.append(", supportsLdName: ");
-        if (supportsLdNameESet) result.append(supportsLdName); else result.append("<unset>");
-        result.append(", sv: ");
-        if (svESet) result.append(sv); else result.append("<unset>");
-        result.append(", unbufReport: ");
-        if (unbufReportESet) result.append(unbufReport); else result.append("<unset>");
-        result.append(", rGOOSE: ");
-        if (rGOOSEESet) result.append(rGOOSE); else result.append("<unset>");
-        result.append(", rSV: ");
-        if (rSVESet) result.append(rSV); else result.append("<unset>");
-        result.append(", noIctBinding: ");
-        if (noIctBindingESet) result.append(noIctBinding); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (bufReport: " );
+        if( bufReportESet )
+            result.append( bufReport );
+        else
+            result.append( "<unset>" );
+        result.append( ", goose: " );
+        if( gooseESet )
+            result.append( goose );
+        else
+            result.append( "<unset>" );
+        result.append( ", gsse: " );
+        if( gsseESet )
+            result.append( gsse );
+        else
+            result.append( "<unset>" );
+        result.append( ", maxAttributes: " );
+        if( maxAttributesESet )
+            result.append( maxAttributes );
+        else
+            result.append( "<unset>" );
+        result.append( ", maxGOOSE: " );
+        if( maxGOOSEESet )
+            result.append( maxGOOSE );
+        else
+            result.append( "<unset>" );
+        result.append( ", maxReports: " );
+        if( maxReportsESet )
+            result.append( maxReports );
+        else
+            result.append( "<unset>" );
+        result.append( ", maxSMV: " );
+        if( maxSMVESet )
+            result.append( maxSMV );
+        else
+            result.append( "<unset>" );
+        result.append( ", readLog: " );
+        if( readLogESet )
+            result.append( readLog );
+        else
+            result.append( "<unset>" );
+        result.append( ", supportsLdName: " );
+        if( supportsLdNameESet )
+            result.append( supportsLdName );
+        else
+            result.append( "<unset>" );
+        result.append( ", sv: " );
+        if( svESet )
+            result.append( sv );
+        else
+            result.append( "<unset>" );
+        result.append( ", unbufReport: " );
+        if( unbufReportESet )
+            result.append( unbufReport );
+        else
+            result.append( "<unset>" );
+        result.append( ", rGOOSE: " );
+        if( rGOOSEESet )
+            result.append( rGOOSE );
+        else
+            result.append( "<unset>" );
+        result.append( ", rSV: " );
+        if( rSVESet )
+            result.append( rSV );
+        else
+            result.append( "<unset>" );
+        result.append( ", noIctBinding: " );
+        if( noIctBindingESet )
+            result.append( noIctBinding );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CommProtImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CommProtImpl.java
index fd43c5e..b84b125 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CommProtImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CommProtImpl.java
@@ -115,8 +115,9 @@ public class CommProtImpl extends SclObjectImpl implements CommProt {
         ipv6 = newIpv6;
         boolean oldIpv6ESet = ipv6ESet;
         ipv6ESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.COMM_PROT__IPV6, oldIpv6, ipv6, !oldIpv6ESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.COMM_PROT__IPV6, oldIpv6, ipv6,
+                    !oldIpv6ESet ) );
     }
 
     /**
@@ -130,8 +131,9 @@ public class CommProtImpl extends SclObjectImpl implements CommProt {
         boolean oldIpv6ESet = ipv6ESet;
         ipv6 = IPV6_EDEFAULT;
         ipv6ESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.COMM_PROT__IPV6, oldIpv6, IPV6_EDEFAULT, oldIpv6ESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.COMM_PROT__IPV6, oldIpv6,
+                    IPV6_EDEFAULT, oldIpv6ESet ) );
     }
 
     /**
@@ -151,8 +153,8 @@ public class CommProtImpl extends SclObjectImpl implements CommProt {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.COMM_PROT__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.COMM_PROT__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -160,8 +162,8 @@ public class CommProtImpl extends SclObjectImpl implements CommProt {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.COMM_PROT__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.COMM_PROT__PARENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -171,20 +173,23 @@ public class CommProtImpl extends SclObjectImpl implements CommProt {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.COMM_PROT__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.COMM_PROT__PARENT_SERVICES && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__COMM_PROT, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__COMM_PROT,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.COMM_PROT__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.COMM_PROT__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -194,13 +199,13 @@ public class CommProtImpl extends SclObjectImpl implements CommProt {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.COMM_PROT__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.COMM_PROT__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -210,11 +215,11 @@ public class CommProtImpl extends SclObjectImpl implements CommProt {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.COMM_PROT__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.COMM_PROT__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -224,11 +229,11 @@ public class CommProtImpl extends SclObjectImpl implements CommProt {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.COMM_PROT__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__COMM_PROT, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.COMM_PROT__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__COMM_PROT, Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -238,13 +243,13 @@ public class CommProtImpl extends SclObjectImpl implements CommProt {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.COMM_PROT__IPV6:
-                return getIpv6();
-            case SclPackage.COMM_PROT__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.COMM_PROT__IPV6:
+            return getIpv6();
+        case SclPackage.COMM_PROT__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -254,15 +259,15 @@ public class CommProtImpl extends SclObjectImpl implements CommProt {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.COMM_PROT__IPV6:
-                setIpv6((Boolean)newValue);
-                return;
-            case SclPackage.COMM_PROT__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.COMM_PROT__IPV6:
+            setIpv6( ( Boolean ) newValue );
+            return;
+        case SclPackage.COMM_PROT__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -272,15 +277,15 @@ public class CommProtImpl extends SclObjectImpl implements CommProt {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.COMM_PROT__IPV6:
-                unsetIpv6();
-                return;
-            case SclPackage.COMM_PROT__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.COMM_PROT__IPV6:
+            unsetIpv6();
+            return;
+        case SclPackage.COMM_PROT__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -290,13 +295,13 @@ public class CommProtImpl extends SclObjectImpl implements CommProt {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.COMM_PROT__IPV6:
-                return isSetIpv6();
-            case SclPackage.COMM_PROT__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.COMM_PROT__IPV6:
+            return isSetIpv6();
+        case SclPackage.COMM_PROT__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -306,12 +311,15 @@ public class CommProtImpl extends SclObjectImpl implements CommProt {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (ipv6: ");
-        if (ipv6ESet) result.append(ipv6); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (ipv6: " );
+        if( ipv6ESet )
+            result.append( ipv6 );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CommunicationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CommunicationImpl.java
index efdf511..c720430 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CommunicationImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/CommunicationImpl.java
@@ -59,7 +59,7 @@ public class CommunicationImpl extends UnNamingImpl implements Communication {
      * @generated
      * @ordered
      */
-    protected EList<SubNetwork> subNetwork;
+    protected EList< SubNetwork > subNetwork;
 
     /**
      * <!-- begin-user-doc -->
@@ -86,9 +86,10 @@ public class CommunicationImpl extends UnNamingImpl implements Communication {
      * @generated
      */
     @Override
-    public EList<SubNetwork> getSubNetwork() {
-        if (subNetwork == null) {
-            subNetwork = new EObjectContainmentWithInverseEList.Unsettable<SubNetwork>(SubNetwork.class, this, SclPackage.COMMUNICATION__SUB_NETWORK, SclPackage.SUB_NETWORK__PARENT_COMMUNICATION);
+    public EList< SubNetwork > getSubNetwork() {
+        if( subNetwork == null ) {
+            subNetwork = new EObjectContainmentWithInverseEList.Unsettable< SubNetwork >( SubNetwork.class, this,
+                    SclPackage.COMMUNICATION__SUB_NETWORK, SclPackage.SUB_NETWORK__PARENT_COMMUNICATION );
         }
         return subNetwork;
     }
@@ -100,7 +101,7 @@ public class CommunicationImpl extends UnNamingImpl implements Communication {
      */
     @Override
     public void unsetSubNetwork() {
-        if (subNetwork != null) ((InternalEList.Unsettable<?>)subNetwork).unset();
+        if( subNetwork != null ) ( ( InternalEList.Unsettable< ? > ) subNetwork ).unset();
     }
 
     /**
@@ -110,7 +111,7 @@ public class CommunicationImpl extends UnNamingImpl implements Communication {
      */
     @Override
     public boolean isSetSubNetwork() {
-        return subNetwork != null && ((InternalEList.Unsettable<?>)subNetwork).isSet();
+        return subNetwork != null && ( ( InternalEList.Unsettable< ? > ) subNetwork ).isSet();
     }
 
     /**
@@ -120,8 +121,8 @@ public class CommunicationImpl extends UnNamingImpl implements Communication {
      */
     @Override
     public SCL getParentSCL() {
-        if (eContainerFeatureID() != SclPackage.COMMUNICATION__PARENT_SCL) return null;
-        return (SCL)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.COMMUNICATION__PARENT_SCL ) return null;
+        return ( SCL ) eInternalContainer();
     }
 
     /**
@@ -129,8 +130,8 @@ public class CommunicationImpl extends UnNamingImpl implements Communication {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSCL(SCL newParentSCL, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSCL, SclPackage.COMMUNICATION__PARENT_SCL, msgs);
+    public NotificationChain basicSetParentSCL( SCL newParentSCL, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSCL, SclPackage.COMMUNICATION__PARENT_SCL, msgs );
         return msgs;
     }
 
@@ -140,20 +141,23 @@ public class CommunicationImpl extends UnNamingImpl implements Communication {
      * @generated
      */
     @Override
-    public void setParentSCL(SCL newParentSCL) {
-        if (newParentSCL != eInternalContainer() || (eContainerFeatureID() != SclPackage.COMMUNICATION__PARENT_SCL && newParentSCL != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSCL))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSCL( SCL newParentSCL ) {
+        if( newParentSCL != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.COMMUNICATION__PARENT_SCL && newParentSCL != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSCL ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSCL != null)
-                msgs = ((InternalEObject)newParentSCL).eInverseAdd(this, SclPackage.SCL__COMMUNICATION, SCL.class, msgs);
-            msgs = basicSetParentSCL(newParentSCL, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSCL != null )
+                msgs = ( ( InternalEObject ) newParentSCL ).eInverseAdd( this, SclPackage.SCL__COMMUNICATION, SCL.class,
+                        msgs );
+            msgs = basicSetParentSCL( newParentSCL, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.COMMUNICATION__PARENT_SCL, newParentSCL, newParentSCL));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.COMMUNICATION__PARENT_SCL, newParentSCL,
+                    newParentSCL ) );
     }
 
     /**
@@ -164,15 +168,16 @@ public class CommunicationImpl extends UnNamingImpl implements Communication {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.COMMUNICATION__SUB_NETWORK:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSubNetwork()).basicAdd(otherEnd, msgs);
-            case SclPackage.COMMUNICATION__PARENT_SCL:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSCL((SCL)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.COMMUNICATION__SUB_NETWORK:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSubNetwork() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.COMMUNICATION__PARENT_SCL:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSCL( ( SCL ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -182,13 +187,13 @@ public class CommunicationImpl extends UnNamingImpl implements Communication {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.COMMUNICATION__SUB_NETWORK:
-                return ((InternalEList<?>)getSubNetwork()).basicRemove(otherEnd, msgs);
-            case SclPackage.COMMUNICATION__PARENT_SCL:
-                return basicSetParentSCL(null, msgs);
+        switch( featureID ) {
+        case SclPackage.COMMUNICATION__SUB_NETWORK:
+            return ( ( InternalEList< ? > ) getSubNetwork() ).basicRemove( otherEnd, msgs );
+        case SclPackage.COMMUNICATION__PARENT_SCL:
+            return basicSetParentSCL( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -198,11 +203,11 @@ public class CommunicationImpl extends UnNamingImpl implements Communication {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.COMMUNICATION__PARENT_SCL:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SCL__COMMUNICATION, SCL.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.COMMUNICATION__PARENT_SCL:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SCL__COMMUNICATION, SCL.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -212,13 +217,13 @@ public class CommunicationImpl extends UnNamingImpl implements Communication {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.COMMUNICATION__SUB_NETWORK:
-                return getSubNetwork();
-            case SclPackage.COMMUNICATION__PARENT_SCL:
-                return getParentSCL();
+        switch( featureID ) {
+        case SclPackage.COMMUNICATION__SUB_NETWORK:
+            return getSubNetwork();
+        case SclPackage.COMMUNICATION__PARENT_SCL:
+            return getParentSCL();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -229,16 +234,16 @@ public class CommunicationImpl extends UnNamingImpl implements Communication {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.COMMUNICATION__SUB_NETWORK:
-                getSubNetwork().clear();
-                getSubNetwork().addAll((Collection<? extends SubNetwork>)newValue);
-                return;
-            case SclPackage.COMMUNICATION__PARENT_SCL:
-                setParentSCL((SCL)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.COMMUNICATION__SUB_NETWORK:
+            getSubNetwork().clear();
+            getSubNetwork().addAll( ( Collection< ? extends SubNetwork > ) newValue );
+            return;
+        case SclPackage.COMMUNICATION__PARENT_SCL:
+            setParentSCL( ( SCL ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -248,15 +253,15 @@ public class CommunicationImpl extends UnNamingImpl implements Communication {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.COMMUNICATION__SUB_NETWORK:
-                unsetSubNetwork();
-                return;
-            case SclPackage.COMMUNICATION__PARENT_SCL:
-                setParentSCL((SCL)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.COMMUNICATION__SUB_NETWORK:
+            unsetSubNetwork();
+            return;
+        case SclPackage.COMMUNICATION__PARENT_SCL:
+            setParentSCL( ( SCL ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -266,13 +271,13 @@ public class CommunicationImpl extends UnNamingImpl implements Communication {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.COMMUNICATION__SUB_NETWORK:
-                return isSetSubNetwork();
-            case SclPackage.COMMUNICATION__PARENT_SCL:
-                return getParentSCL() != null;
+        switch( featureID ) {
+        case SclPackage.COMMUNICATION__SUB_NETWORK:
+            return isSetSubNetwork();
+        case SclPackage.COMMUNICATION__PARENT_SCL:
+            return getParentSCL() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //CommunicationImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConductingEquipmentImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConductingEquipmentImpl.java
index 5733000..9d089b6 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConductingEquipmentImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConductingEquipmentImpl.java
@@ -96,7 +96,7 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      * @generated
      * @ordered
      */
-    protected EList<EqFunction> eqFunction;
+    protected EList< EqFunction > eqFunction;
 
     /**
      * <!-- begin-user-doc -->
@@ -138,8 +138,9 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONDUCTING_EQUIPMENT__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONDUCTING_EQUIPMENT__TYPE, oldType,
+                    type, !oldTypeESet ) );
     }
 
     /**
@@ -153,8 +154,9 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONDUCTING_EQUIPMENT__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONDUCTING_EQUIPMENT__TYPE, oldType,
+                    TYPE_EDEFAULT, oldTypeESet ) );
     }
 
     /**
@@ -174,8 +176,8 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      */
     @Override
     public Bay getParentBay() {
-        if (eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY) return null;
-        return (Bay)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY ) return null;
+        return ( Bay ) eInternalContainer();
     }
 
     /**
@@ -183,8 +185,9 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentBay(Bay newParentBay, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentBay, SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY, msgs);
+    public NotificationChain basicSetParentBay( Bay newParentBay, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentBay, SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY,
+                msgs );
         return msgs;
     }
 
@@ -194,20 +197,23 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      * @generated
      */
     @Override
-    public void setParentBay(Bay newParentBay) {
-        if (newParentBay != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY && newParentBay != null)) {
-            if (EcoreUtil.isAncestor(this, newParentBay))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentBay( Bay newParentBay ) {
+        if( newParentBay != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY && newParentBay != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentBay ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentBay != null)
-                msgs = ((InternalEObject)newParentBay).eInverseAdd(this, SclPackage.BAY__CONDUCTING_EQUIPMENT, Bay.class, msgs);
-            msgs = basicSetParentBay(newParentBay, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentBay != null )
+                msgs = ( ( InternalEObject ) newParentBay ).eInverseAdd( this, SclPackage.BAY__CONDUCTING_EQUIPMENT,
+                        Bay.class, msgs );
+            msgs = basicSetParentBay( newParentBay, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY, newParentBay, newParentBay));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY,
+                    newParentBay, newParentBay ) );
     }
 
     /**
@@ -217,8 +223,8 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      */
     @Override
     public Function getParentFunction() {
-        if (eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION) return null;
-        return (Function)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION ) return null;
+        return ( Function ) eInternalContainer();
     }
 
     /**
@@ -226,8 +232,9 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentFunction(Function newParentFunction, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentFunction, SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION, msgs);
+    public NotificationChain basicSetParentFunction( Function newParentFunction, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentFunction,
+                SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION, msgs );
         return msgs;
     }
 
@@ -237,20 +244,24 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      * @generated
      */
     @Override
-    public void setParentFunction(Function newParentFunction) {
-        if (newParentFunction != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION && newParentFunction != null)) {
-            if (EcoreUtil.isAncestor(this, newParentFunction))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentFunction( Function newParentFunction ) {
+        if( newParentFunction != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION
+                        && newParentFunction != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentFunction ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentFunction != null)
-                msgs = ((InternalEObject)newParentFunction).eInverseAdd(this, SclPackage.FUNCTION__CONDUCTING_EQUIPMENT, Function.class, msgs);
-            msgs = basicSetParentFunction(newParentFunction, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentFunction != null )
+                msgs = ( ( InternalEObject ) newParentFunction ).eInverseAdd( this,
+                        SclPackage.FUNCTION__CONDUCTING_EQUIPMENT, Function.class, msgs );
+            msgs = basicSetParentFunction( newParentFunction, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION, newParentFunction, newParentFunction));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION,
+                    newParentFunction, newParentFunction ) );
     }
 
     /**
@@ -260,8 +271,8 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      */
     @Override
     public SubFunction getParentSubFunction() {
-        if (eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION) return null;
-        return (SubFunction)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION ) return null;
+        return ( SubFunction ) eInternalContainer();
     }
 
     /**
@@ -269,8 +280,9 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSubFunction(SubFunction newParentSubFunction, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSubFunction, SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION, msgs);
+    public NotificationChain basicSetParentSubFunction( SubFunction newParentSubFunction, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSubFunction,
+                SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION, msgs );
         return msgs;
     }
 
@@ -280,20 +292,25 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      * @generated
      */
     @Override
-    public void setParentSubFunction(SubFunction newParentSubFunction) {
-        if (newParentSubFunction != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION && newParentSubFunction != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSubFunction))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSubFunction( SubFunction newParentSubFunction ) {
+        if( newParentSubFunction != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION
+                        && newParentSubFunction != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSubFunction ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSubFunction != null)
-                msgs = ((InternalEObject)newParentSubFunction).eInverseAdd(this, SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT, SubFunction.class, msgs);
-            msgs = basicSetParentSubFunction(newParentSubFunction, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSubFunction != null )
+                msgs = ( ( InternalEObject ) newParentSubFunction ).eInverseAdd( this,
+                        SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT, SubFunction.class, msgs );
+            msgs = basicSetParentSubFunction( newParentSubFunction, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION, newParentSubFunction, newParentSubFunction));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET,
+                    SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION, newParentSubFunction,
+                    newParentSubFunction ) );
     }
 
     /**
@@ -302,9 +319,10 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      * @generated
      */
     @Override
-    public EList<EqFunction> getEqFunction() {
-        if (eqFunction == null) {
-            eqFunction = new EObjectContainmentWithInverseEList.Unsettable<EqFunction>(EqFunction.class, this, SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION, SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT);
+    public EList< EqFunction > getEqFunction() {
+        if( eqFunction == null ) {
+            eqFunction = new EObjectContainmentWithInverseEList.Unsettable< EqFunction >( EqFunction.class, this,
+                    SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION, SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT );
         }
         return eqFunction;
     }
@@ -316,7 +334,7 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      */
     @Override
     public void unsetEqFunction() {
-        if (eqFunction != null) ((InternalEList.Unsettable<?>)eqFunction).unset();
+        if( eqFunction != null ) ( ( InternalEList.Unsettable< ? > ) eqFunction ).unset();
     }
 
     /**
@@ -326,7 +344,7 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      */
     @Override
     public boolean isSetEqFunction() {
-        return eqFunction != null && ((InternalEList.Unsettable<?>)eqFunction).isSet();
+        return eqFunction != null && ( ( InternalEList.Unsettable< ? > ) eqFunction ).isSet();
     }
 
     /**
@@ -336,8 +354,8 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      */
     @Override
     public Line getParentLine() {
-        if (eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE) return null;
-        return (Line)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE ) return null;
+        return ( Line ) eInternalContainer();
     }
 
     /**
@@ -345,8 +363,9 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentLine(Line newParentLine, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentLine, SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE, msgs);
+    public NotificationChain basicSetParentLine( Line newParentLine, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentLine, SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE,
+                msgs );
         return msgs;
     }
 
@@ -356,20 +375,24 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      * @generated
      */
     @Override
-    public void setParentLine(Line newParentLine) {
-        if (newParentLine != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE && newParentLine != null)) {
-            if (EcoreUtil.isAncestor(this, newParentLine))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentLine( Line newParentLine ) {
+        if( newParentLine != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE
+                        && newParentLine != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentLine ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentLine != null)
-                msgs = ((InternalEObject)newParentLine).eInverseAdd(this, SclPackage.LINE__CONDUCTING_EQUIPMENT, Line.class, msgs);
-            msgs = basicSetParentLine(newParentLine, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentLine != null )
+                msgs = ( ( InternalEObject ) newParentLine ).eInverseAdd( this, SclPackage.LINE__CONDUCTING_EQUIPMENT,
+                        Line.class, msgs );
+            msgs = basicSetParentLine( newParentLine, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE, newParentLine, newParentLine));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE,
+                    newParentLine, newParentLine ) );
     }
 
     /**
@@ -379,8 +402,8 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      */
     @Override
     public fr.centralesupelec.edf.riseclipse.iec61850.scl.Process getParentProcess() {
-        if (eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS) return null;
-        return (fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS ) return null;
+        return ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) eInternalContainer();
     }
 
     /**
@@ -388,8 +411,10 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentProcess(fr.centralesupelec.edf.riseclipse.iec61850.scl.Process newParentProcess, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentProcess, SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS, msgs);
+    public NotificationChain basicSetParentProcess(
+            fr.centralesupelec.edf.riseclipse.iec61850.scl.Process newParentProcess, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentProcess,
+                SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS, msgs );
         return msgs;
     }
 
@@ -399,20 +424,25 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      * @generated
      */
     @Override
-    public void setParentProcess(fr.centralesupelec.edf.riseclipse.iec61850.scl.Process newParentProcess) {
-        if (newParentProcess != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS && newParentProcess != null)) {
-            if (EcoreUtil.isAncestor(this, newParentProcess))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentProcess( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process newParentProcess ) {
+        if( newParentProcess != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS
+                        && newParentProcess != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentProcess ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentProcess != null)
-                msgs = ((InternalEObject)newParentProcess).eInverseAdd(this, SclPackage.PROCESS__CONDUCTING_EQUIPMENT, fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs);
-            msgs = basicSetParentProcess(newParentProcess, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentProcess != null )
+                msgs = ( ( InternalEObject ) newParentProcess ).eInverseAdd( this,
+                        SclPackage.PROCESS__CONDUCTING_EQUIPMENT,
+                        fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs );
+            msgs = basicSetParentProcess( newParentProcess, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS, newParentProcess, newParentProcess));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS,
+                    newParentProcess, newParentProcess ) );
     }
 
     /**
@@ -423,31 +453,32 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentBay((Bay)otherEnd, msgs);
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentFunction((Function)otherEnd, msgs);
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSubFunction((SubFunction)otherEnd, msgs);
-            case SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getEqFunction()).basicAdd(otherEnd, msgs);
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentLine((Line)otherEnd, msgs);
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentProcess((fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentBay( ( Bay ) otherEnd, msgs );
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentFunction( ( Function ) otherEnd, msgs );
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSubFunction( ( SubFunction ) otherEnd, msgs );
+        case SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getEqFunction() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentLine( ( Line ) otherEnd, msgs );
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentProcess( ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -457,21 +488,21 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY:
-                return basicSetParentBay(null, msgs);
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION:
-                return basicSetParentFunction(null, msgs);
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION:
-                return basicSetParentSubFunction(null, msgs);
-            case SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION:
-                return ((InternalEList<?>)getEqFunction()).basicRemove(otherEnd, msgs);
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE:
-                return basicSetParentLine(null, msgs);
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS:
-                return basicSetParentProcess(null, msgs);
+        switch( featureID ) {
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY:
+            return basicSetParentBay( null, msgs );
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION:
+            return basicSetParentFunction( null, msgs );
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION:
+            return basicSetParentSubFunction( null, msgs );
+        case SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION:
+            return ( ( InternalEList< ? > ) getEqFunction() ).basicRemove( otherEnd, msgs );
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE:
+            return basicSetParentLine( null, msgs );
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS:
+            return basicSetParentProcess( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -481,19 +512,22 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY:
-                return eInternalContainer().eInverseRemove(this, SclPackage.BAY__CONDUCTING_EQUIPMENT, Bay.class, msgs);
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION:
-                return eInternalContainer().eInverseRemove(this, SclPackage.FUNCTION__CONDUCTING_EQUIPMENT, Function.class, msgs);
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT, SubFunction.class, msgs);
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.LINE__CONDUCTING_EQUIPMENT, Line.class, msgs);
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS:
-                return eInternalContainer().eInverseRemove(this, SclPackage.PROCESS__CONDUCTING_EQUIPMENT, fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY:
+            return eInternalContainer().eInverseRemove( this, SclPackage.BAY__CONDUCTING_EQUIPMENT, Bay.class, msgs );
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION:
+            return eInternalContainer().eInverseRemove( this, SclPackage.FUNCTION__CONDUCTING_EQUIPMENT, Function.class,
+                    msgs );
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT,
+                    SubFunction.class, msgs );
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.LINE__CONDUCTING_EQUIPMENT, Line.class, msgs );
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS:
+            return eInternalContainer().eInverseRemove( this, SclPackage.PROCESS__CONDUCTING_EQUIPMENT,
+                    fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -503,23 +537,23 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CONDUCTING_EQUIPMENT__TYPE:
-                return getType();
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY:
-                return getParentBay();
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION:
-                return getParentFunction();
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION:
-                return getParentSubFunction();
-            case SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION:
-                return getEqFunction();
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE:
-                return getParentLine();
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS:
-                return getParentProcess();
+        switch( featureID ) {
+        case SclPackage.CONDUCTING_EQUIPMENT__TYPE:
+            return getType();
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY:
+            return getParentBay();
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION:
+            return getParentFunction();
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION:
+            return getParentSubFunction();
+        case SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION:
+            return getEqFunction();
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE:
+            return getParentLine();
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS:
+            return getParentProcess();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -530,31 +564,31 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CONDUCTING_EQUIPMENT__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY:
-                setParentBay((Bay)newValue);
-                return;
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION:
-                setParentFunction((Function)newValue);
-                return;
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION:
-                setParentSubFunction((SubFunction)newValue);
-                return;
-            case SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION:
-                getEqFunction().clear();
-                getEqFunction().addAll((Collection<? extends EqFunction>)newValue);
-                return;
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE:
-                setParentLine((Line)newValue);
-                return;
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS:
-                setParentProcess((fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONDUCTING_EQUIPMENT__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY:
+            setParentBay( ( Bay ) newValue );
+            return;
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION:
+            setParentFunction( ( Function ) newValue );
+            return;
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION:
+            setParentSubFunction( ( SubFunction ) newValue );
+            return;
+        case SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION:
+            getEqFunction().clear();
+            getEqFunction().addAll( ( Collection< ? extends EqFunction > ) newValue );
+            return;
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE:
+            setParentLine( ( Line ) newValue );
+            return;
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS:
+            setParentProcess( ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -564,30 +598,30 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONDUCTING_EQUIPMENT__TYPE:
-                unsetType();
-                return;
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY:
-                setParentBay((Bay)null);
-                return;
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION:
-                setParentFunction((Function)null);
-                return;
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION:
-                setParentSubFunction((SubFunction)null);
-                return;
-            case SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION:
-                unsetEqFunction();
-                return;
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE:
-                setParentLine((Line)null);
-                return;
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS:
-                setParentProcess((fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONDUCTING_EQUIPMENT__TYPE:
+            unsetType();
+            return;
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY:
+            setParentBay( ( Bay ) null );
+            return;
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION:
+            setParentFunction( ( Function ) null );
+            return;
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION:
+            setParentSubFunction( ( SubFunction ) null );
+            return;
+        case SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION:
+            unsetEqFunction();
+            return;
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE:
+            setParentLine( ( Line ) null );
+            return;
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS:
+            setParentProcess( ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -597,23 +631,23 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONDUCTING_EQUIPMENT__TYPE:
-                return isSetType();
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY:
-                return getParentBay() != null;
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION:
-                return getParentFunction() != null;
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION:
-                return getParentSubFunction() != null;
-            case SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION:
-                return isSetEqFunction();
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE:
-                return getParentLine() != null;
-            case SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS:
-                return getParentProcess() != null;
+        switch( featureID ) {
+        case SclPackage.CONDUCTING_EQUIPMENT__TYPE:
+            return isSetType();
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_BAY:
+            return getParentBay() != null;
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION:
+            return getParentFunction() != null;
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION:
+            return getParentSubFunction() != null;
+        case SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION:
+            return isSetEqFunction();
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE:
+            return getParentLine() != null;
+        case SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS:
+            return getParentProcess() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -623,12 +657,15 @@ public class ConductingEquipmentImpl extends AbstractConductingEquipmentImpl imp
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfDataSetImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfDataSetImpl.java
index 6b091fc..5a0e6ac 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfDataSetImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfDataSetImpl.java
@@ -71,8 +71,8 @@ public class ConfDataSetImpl extends ServiceForConfDataSetImpl implements ConfDa
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.CONF_DATA_SET__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONF_DATA_SET__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class ConfDataSetImpl extends ServiceForConfDataSetImpl implements ConfDa
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.CONF_DATA_SET__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.CONF_DATA_SET__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class ConfDataSetImpl extends ServiceForConfDataSetImpl implements ConfDa
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONF_DATA_SET__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONF_DATA_SET__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__CONF_DATA_SET, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__CONF_DATA_SET,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONF_DATA_SET__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONF_DATA_SET__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class ConfDataSetImpl extends ServiceForConfDataSetImpl implements ConfDa
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONF_DATA_SET__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONF_DATA_SET__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class ConfDataSetImpl extends ServiceForConfDataSetImpl implements ConfDa
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONF_DATA_SET__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.CONF_DATA_SET__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class ConfDataSetImpl extends ServiceForConfDataSetImpl implements ConfDa
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.CONF_DATA_SET__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__CONF_DATA_SET, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.CONF_DATA_SET__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__CONF_DATA_SET, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class ConfDataSetImpl extends ServiceForConfDataSetImpl implements ConfDa
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CONF_DATA_SET__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.CONF_DATA_SET__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class ConfDataSetImpl extends ServiceForConfDataSetImpl implements ConfDa
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CONF_DATA_SET__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONF_DATA_SET__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class ConfDataSetImpl extends ServiceForConfDataSetImpl implements ConfDa
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONF_DATA_SET__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONF_DATA_SET__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class ConfDataSetImpl extends ServiceForConfDataSetImpl implements ConfDa
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONF_DATA_SET__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.CONF_DATA_SET__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //ConfDataSetImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfLNsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfLNsImpl.java
index d11e4ee..fca69f7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfLNsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfLNsImpl.java
@@ -145,8 +145,9 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
         fixLnInst = newFixLnInst;
         boolean oldFixLnInstESet = fixLnInstESet;
         fixLnInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONF_LNS__FIX_LN_INST, oldFixLnInst, fixLnInst, !oldFixLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONF_LNS__FIX_LN_INST, oldFixLnInst,
+                    fixLnInst, !oldFixLnInstESet ) );
     }
 
     /**
@@ -160,8 +161,9 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
         boolean oldFixLnInstESet = fixLnInstESet;
         fixLnInst = FIX_LN_INST_EDEFAULT;
         fixLnInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONF_LNS__FIX_LN_INST, oldFixLnInst, FIX_LN_INST_EDEFAULT, oldFixLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONF_LNS__FIX_LN_INST, oldFixLnInst,
+                    FIX_LN_INST_EDEFAULT, oldFixLnInstESet ) );
     }
 
     /**
@@ -195,8 +197,9 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
         fixPrefix = newFixPrefix;
         boolean oldFixPrefixESet = fixPrefixESet;
         fixPrefixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONF_LNS__FIX_PREFIX, oldFixPrefix, fixPrefix, !oldFixPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONF_LNS__FIX_PREFIX, oldFixPrefix,
+                    fixPrefix, !oldFixPrefixESet ) );
     }
 
     /**
@@ -210,8 +213,9 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
         boolean oldFixPrefixESet = fixPrefixESet;
         fixPrefix = FIX_PREFIX_EDEFAULT;
         fixPrefixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONF_LNS__FIX_PREFIX, oldFixPrefix, FIX_PREFIX_EDEFAULT, oldFixPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONF_LNS__FIX_PREFIX, oldFixPrefix,
+                    FIX_PREFIX_EDEFAULT, oldFixPrefixESet ) );
     }
 
     /**
@@ -231,8 +235,8 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.CONF_LNS__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONF_LNS__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -240,8 +244,8 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.CONF_LNS__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.CONF_LNS__PARENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -251,20 +255,23 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONF_LNS__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONF_LNS__PARENT_SERVICES && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__CONF_LNS, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__CONF_LNS,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONF_LNS__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONF_LNS__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -274,13 +281,13 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONF_LNS__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONF_LNS__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -290,11 +297,11 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONF_LNS__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.CONF_LNS__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -304,11 +311,11 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.CONF_LNS__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__CONF_LNS, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.CONF_LNS__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__CONF_LNS, Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -318,15 +325,15 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CONF_LNS__FIX_LN_INST:
-                return getFixLnInst();
-            case SclPackage.CONF_LNS__FIX_PREFIX:
-                return getFixPrefix();
-            case SclPackage.CONF_LNS__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.CONF_LNS__FIX_LN_INST:
+            return getFixLnInst();
+        case SclPackage.CONF_LNS__FIX_PREFIX:
+            return getFixPrefix();
+        case SclPackage.CONF_LNS__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -336,18 +343,18 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CONF_LNS__FIX_LN_INST:
-                setFixLnInst((Boolean)newValue);
-                return;
-            case SclPackage.CONF_LNS__FIX_PREFIX:
-                setFixPrefix((Boolean)newValue);
-                return;
-            case SclPackage.CONF_LNS__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONF_LNS__FIX_LN_INST:
+            setFixLnInst( ( Boolean ) newValue );
+            return;
+        case SclPackage.CONF_LNS__FIX_PREFIX:
+            setFixPrefix( ( Boolean ) newValue );
+            return;
+        case SclPackage.CONF_LNS__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -357,18 +364,18 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONF_LNS__FIX_LN_INST:
-                unsetFixLnInst();
-                return;
-            case SclPackage.CONF_LNS__FIX_PREFIX:
-                unsetFixPrefix();
-                return;
-            case SclPackage.CONF_LNS__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONF_LNS__FIX_LN_INST:
+            unsetFixLnInst();
+            return;
+        case SclPackage.CONF_LNS__FIX_PREFIX:
+            unsetFixPrefix();
+            return;
+        case SclPackage.CONF_LNS__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -378,15 +385,15 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONF_LNS__FIX_LN_INST:
-                return isSetFixLnInst();
-            case SclPackage.CONF_LNS__FIX_PREFIX:
-                return isSetFixPrefix();
-            case SclPackage.CONF_LNS__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.CONF_LNS__FIX_LN_INST:
+            return isSetFixLnInst();
+        case SclPackage.CONF_LNS__FIX_PREFIX:
+            return isSetFixPrefix();
+        case SclPackage.CONF_LNS__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -396,14 +403,20 @@ public class ConfLNsImpl extends SclObjectImpl implements ConfLNs {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (fixLnInst: ");
-        if (fixLnInstESet) result.append(fixLnInst); else result.append("<unset>");
-        result.append(", fixPrefix: ");
-        if (fixPrefixESet) result.append(fixPrefix); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (fixLnInst: " );
+        if( fixLnInstESet )
+            result.append( fixLnInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", fixPrefix: " );
+        if( fixPrefixESet )
+            result.append( fixPrefix );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfLdNameImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfLdNameImpl.java
index c3d5636..8689183 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfLdNameImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfLdNameImpl.java
@@ -71,8 +71,8 @@ public class ConfLdNameImpl extends ServiceYesNoImpl implements ConfLdName {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.CONF_LD_NAME__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONF_LD_NAME__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class ConfLdNameImpl extends ServiceYesNoImpl implements ConfLdName {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.CONF_LD_NAME__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.CONF_LD_NAME__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class ConfLdNameImpl extends ServiceYesNoImpl implements ConfLdName {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONF_LD_NAME__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONF_LD_NAME__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__CONF_LD_NAME, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__CONF_LD_NAME,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONF_LD_NAME__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONF_LD_NAME__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class ConfLdNameImpl extends ServiceYesNoImpl implements ConfLdName {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONF_LD_NAME__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONF_LD_NAME__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class ConfLdNameImpl extends ServiceYesNoImpl implements ConfLdName {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONF_LD_NAME__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.CONF_LD_NAME__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,11 @@ public class ConfLdNameImpl extends ServiceYesNoImpl implements ConfLdName {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.CONF_LD_NAME__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__CONF_LD_NAME, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.CONF_LD_NAME__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__CONF_LD_NAME, Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +163,11 @@ public class ConfLdNameImpl extends ServiceYesNoImpl implements ConfLdName {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CONF_LD_NAME__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.CONF_LD_NAME__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +177,12 @@ public class ConfLdNameImpl extends ServiceYesNoImpl implements ConfLdName {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CONF_LD_NAME__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONF_LD_NAME__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +192,12 @@ public class ConfLdNameImpl extends ServiceYesNoImpl implements ConfLdName {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONF_LD_NAME__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONF_LD_NAME__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +207,11 @@ public class ConfLdNameImpl extends ServiceYesNoImpl implements ConfLdName {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONF_LD_NAME__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.CONF_LD_NAME__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //ConfLdNameImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfLogControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfLogControlImpl.java
index 96080ab..139a31d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfLogControlImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfLogControlImpl.java
@@ -71,8 +71,8 @@ public class ConfLogControlImpl extends ServiceWithMaxNonZeroImpl implements Con
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class ConfLogControlImpl extends ServiceWithMaxNonZeroImpl implements Con
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class ConfLogControlImpl extends ServiceWithMaxNonZeroImpl implements Con
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__CONF_LOG_CONTROL, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this,
+                        SclPackage.SERVICES__CONF_LOG_CONTROL, Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class ConfLogControlImpl extends ServiceWithMaxNonZeroImpl implements Con
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class ConfLogControlImpl extends ServiceWithMaxNonZeroImpl implements Con
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class ConfLogControlImpl extends ServiceWithMaxNonZeroImpl implements Con
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__CONF_LOG_CONTROL, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__CONF_LOG_CONTROL, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class ConfLogControlImpl extends ServiceWithMaxNonZeroImpl implements Con
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class ConfLogControlImpl extends ServiceWithMaxNonZeroImpl implements Con
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class ConfLogControlImpl extends ServiceWithMaxNonZeroImpl implements Con
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class ConfLogControlImpl extends ServiceWithMaxNonZeroImpl implements Con
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //ConfLogControlImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfReportControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfReportControlImpl.java
index 36af416..9811a28 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfReportControlImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfReportControlImpl.java
@@ -71,8 +71,8 @@ public class ConfReportControlImpl extends ServiceConfReportControlImpl implemen
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class ConfReportControlImpl extends ServiceConfReportControlImpl implemen
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices,
+                SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class ConfReportControlImpl extends ServiceConfReportControlImpl implemen
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__CONF_REPORT_CONTROL, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this,
+                        SclPackage.SERVICES__CONF_REPORT_CONTROL, Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class ConfReportControlImpl extends ServiceConfReportControlImpl implemen
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class ConfReportControlImpl extends ServiceConfReportControlImpl implemen
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class ConfReportControlImpl extends ServiceConfReportControlImpl implemen
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__CONF_REPORT_CONTROL, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__CONF_REPORT_CONTROL, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class ConfReportControlImpl extends ServiceConfReportControlImpl implemen
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class ConfReportControlImpl extends ServiceConfReportControlImpl implemen
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class ConfReportControlImpl extends ServiceConfReportControlImpl implemen
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class ConfReportControlImpl extends ServiceConfReportControlImpl implemen
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //ConfReportControlImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfSGImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfSGImpl.java
index 7f3c073..50ebab6 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfSGImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfSGImpl.java
@@ -115,8 +115,9 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG {
         resvTms = newResvTms;
         boolean oldResvTmsESet = resvTmsESet;
         resvTmsESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONF_SG__RESV_TMS, oldResvTms, resvTms, !oldResvTmsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONF_SG__RESV_TMS, oldResvTms, resvTms,
+                    !oldResvTmsESet ) );
     }
 
     /**
@@ -130,8 +131,9 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG {
         boolean oldResvTmsESet = resvTmsESet;
         resvTms = RESV_TMS_EDEFAULT;
         resvTmsESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONF_SG__RESV_TMS, oldResvTms, RESV_TMS_EDEFAULT, oldResvTmsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONF_SG__RESV_TMS, oldResvTms,
+                    RESV_TMS_EDEFAULT, oldResvTmsESet ) );
     }
 
     /**
@@ -151,8 +153,8 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG {
      */
     @Override
     public SettingGroups getParentSettingGroups() {
-        if (eContainerFeatureID() != SclPackage.CONF_SG__PARENT_SETTING_GROUPS) return null;
-        return (SettingGroups)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONF_SG__PARENT_SETTING_GROUPS ) return null;
+        return ( SettingGroups ) eInternalContainer();
     }
 
     /**
@@ -160,8 +162,10 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSettingGroups(SettingGroups newParentSettingGroups, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSettingGroups, SclPackage.CONF_SG__PARENT_SETTING_GROUPS, msgs);
+    public NotificationChain basicSetParentSettingGroups( SettingGroups newParentSettingGroups,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSettingGroups,
+                SclPackage.CONF_SG__PARENT_SETTING_GROUPS, msgs );
         return msgs;
     }
 
@@ -171,20 +175,24 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG {
      * @generated
      */
     @Override
-    public void setParentSettingGroups(SettingGroups newParentSettingGroups) {
-        if (newParentSettingGroups != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONF_SG__PARENT_SETTING_GROUPS && newParentSettingGroups != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSettingGroups))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSettingGroups( SettingGroups newParentSettingGroups ) {
+        if( newParentSettingGroups != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONF_SG__PARENT_SETTING_GROUPS
+                        && newParentSettingGroups != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSettingGroups ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSettingGroups != null)
-                msgs = ((InternalEObject)newParentSettingGroups).eInverseAdd(this, SclPackage.SETTING_GROUPS__CONF_SG, SettingGroups.class, msgs);
-            msgs = basicSetParentSettingGroups(newParentSettingGroups, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSettingGroups != null )
+                msgs = ( ( InternalEObject ) newParentSettingGroups ).eInverseAdd( this,
+                        SclPackage.SETTING_GROUPS__CONF_SG, SettingGroups.class, msgs );
+            msgs = basicSetParentSettingGroups( newParentSettingGroups, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONF_SG__PARENT_SETTING_GROUPS, newParentSettingGroups, newParentSettingGroups));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONF_SG__PARENT_SETTING_GROUPS,
+                    newParentSettingGroups, newParentSettingGroups ) );
     }
 
     /**
@@ -194,13 +202,13 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONF_SG__PARENT_SETTING_GROUPS:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSettingGroups((SettingGroups)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONF_SG__PARENT_SETTING_GROUPS:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSettingGroups( ( SettingGroups ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -210,11 +218,11 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONF_SG__PARENT_SETTING_GROUPS:
-                return basicSetParentSettingGroups(null, msgs);
+        switch( featureID ) {
+        case SclPackage.CONF_SG__PARENT_SETTING_GROUPS:
+            return basicSetParentSettingGroups( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -224,11 +232,12 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.CONF_SG__PARENT_SETTING_GROUPS:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SETTING_GROUPS__CONF_SG, SettingGroups.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.CONF_SG__PARENT_SETTING_GROUPS:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SETTING_GROUPS__CONF_SG, SettingGroups.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -238,13 +247,13 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CONF_SG__RESV_TMS:
-                return getResvTms();
-            case SclPackage.CONF_SG__PARENT_SETTING_GROUPS:
-                return getParentSettingGroups();
+        switch( featureID ) {
+        case SclPackage.CONF_SG__RESV_TMS:
+            return getResvTms();
+        case SclPackage.CONF_SG__PARENT_SETTING_GROUPS:
+            return getParentSettingGroups();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -254,15 +263,15 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CONF_SG__RESV_TMS:
-                setResvTms((Boolean)newValue);
-                return;
-            case SclPackage.CONF_SG__PARENT_SETTING_GROUPS:
-                setParentSettingGroups((SettingGroups)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONF_SG__RESV_TMS:
+            setResvTms( ( Boolean ) newValue );
+            return;
+        case SclPackage.CONF_SG__PARENT_SETTING_GROUPS:
+            setParentSettingGroups( ( SettingGroups ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -272,15 +281,15 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONF_SG__RESV_TMS:
-                unsetResvTms();
-                return;
-            case SclPackage.CONF_SG__PARENT_SETTING_GROUPS:
-                setParentSettingGroups((SettingGroups)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONF_SG__RESV_TMS:
+            unsetResvTms();
+            return;
+        case SclPackage.CONF_SG__PARENT_SETTING_GROUPS:
+            setParentSettingGroups( ( SettingGroups ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -290,13 +299,13 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONF_SG__RESV_TMS:
-                return isSetResvTms();
-            case SclPackage.CONF_SG__PARENT_SETTING_GROUPS:
-                return getParentSettingGroups() != null;
+        switch( featureID ) {
+        case SclPackage.CONF_SG__RESV_TMS:
+            return isSetResvTms();
+        case SclPackage.CONF_SG__PARENT_SETTING_GROUPS:
+            return getParentSettingGroups() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -306,12 +315,15 @@ public class ConfSGImpl extends SclObjectImpl implements ConfSG {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (resvTms: ");
-        if (resvTmsESet) result.append(resvTms); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (resvTms: " );
+        if( resvTmsESet )
+            result.append( resvTms );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfSigRefImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfSigRefImpl.java
index 725dba3..9f43b89 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfSigRefImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConfSigRefImpl.java
@@ -71,8 +71,8 @@ public class ConfSigRefImpl extends ServiceWithMaxNonZeroImpl implements ConfSig
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.CONF_SIG_REF__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONF_SIG_REF__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class ConfSigRefImpl extends ServiceWithMaxNonZeroImpl implements ConfSig
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.CONF_SIG_REF__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.CONF_SIG_REF__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class ConfSigRefImpl extends ServiceWithMaxNonZeroImpl implements ConfSig
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONF_SIG_REF__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONF_SIG_REF__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__CONF_SIG_REF, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__CONF_SIG_REF,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONF_SIG_REF__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONF_SIG_REF__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class ConfSigRefImpl extends ServiceWithMaxNonZeroImpl implements ConfSig
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONF_SIG_REF__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONF_SIG_REF__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class ConfSigRefImpl extends ServiceWithMaxNonZeroImpl implements ConfSig
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONF_SIG_REF__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.CONF_SIG_REF__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,11 @@ public class ConfSigRefImpl extends ServiceWithMaxNonZeroImpl implements ConfSig
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.CONF_SIG_REF__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__CONF_SIG_REF, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.CONF_SIG_REF__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__CONF_SIG_REF, Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +163,11 @@ public class ConfSigRefImpl extends ServiceWithMaxNonZeroImpl implements ConfSig
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CONF_SIG_REF__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.CONF_SIG_REF__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +177,12 @@ public class ConfSigRefImpl extends ServiceWithMaxNonZeroImpl implements ConfSig
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CONF_SIG_REF__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONF_SIG_REF__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +192,12 @@ public class ConfSigRefImpl extends ServiceWithMaxNonZeroImpl implements ConfSig
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONF_SIG_REF__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONF_SIG_REF__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +207,11 @@ public class ConfSigRefImpl extends ServiceWithMaxNonZeroImpl implements ConfSig
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONF_SIG_REF__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.CONF_SIG_REF__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //ConfSigRefImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectedAPImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectedAPImpl.java
index e70d02d..74af5da 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectedAPImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectedAPImpl.java
@@ -202,7 +202,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      * @generated
      * @ordered
      */
-    protected EList<PhysConn> physConn;
+    protected EList< PhysConn > physConn;
 
     /**
      * The cached value of the '{@link #getControlBlock() <em>Control Block</em>}' attribute list.
@@ -254,8 +254,9 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
         apName = newApName;
         boolean oldApNameESet = apNameESet;
         apNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONNECTED_AP__AP_NAME, oldApName, apName, !oldApNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTED_AP__AP_NAME, oldApName, apName,
+                    !oldApNameESet ) );
     }
 
     /**
@@ -269,8 +270,9 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
         boolean oldApNameESet = apNameESet;
         apName = AP_NAME_EDEFAULT;
         apNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONNECTED_AP__AP_NAME, oldApName, AP_NAME_EDEFAULT, oldApNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONNECTED_AP__AP_NAME, oldApName,
+                    AP_NAME_EDEFAULT, oldApNameESet ) );
     }
 
     /**
@@ -304,8 +306,9 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
         iedName = newIedName;
         boolean oldIedNameESet = iedNameESet;
         iedNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONNECTED_AP__IED_NAME, oldIedName, iedName, !oldIedNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTED_AP__IED_NAME, oldIedName,
+                    iedName, !oldIedNameESet ) );
     }
 
     /**
@@ -319,8 +322,9 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
         boolean oldIedNameESet = iedNameESet;
         iedName = IED_NAME_EDEFAULT;
         iedNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONNECTED_AP__IED_NAME, oldIedName, IED_NAME_EDEFAULT, oldIedNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONNECTED_AP__IED_NAME, oldIedName,
+                    IED_NAME_EDEFAULT, oldIedNameESet ) );
     }
 
     /**
@@ -354,8 +358,9 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
         redProt = newRedProt;
         boolean oldRedProtESet = redProtESet;
         redProtESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONNECTED_AP__RED_PROT, oldRedProt, redProt, !oldRedProtESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTED_AP__RED_PROT, oldRedProt,
+                    redProt, !oldRedProtESet ) );
     }
 
     /**
@@ -369,8 +374,9 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
         boolean oldRedProtESet = redProtESet;
         redProt = RED_PROT_EDEFAULT;
         redProtESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONNECTED_AP__RED_PROT, oldRedProt, RED_PROT_EDEFAULT, oldRedProtESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONNECTED_AP__RED_PROT, oldRedProt,
+                    RED_PROT_EDEFAULT, oldRedProtESet ) );
     }
 
     /**
@@ -403,9 +409,13 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
         address = newAddress;
         boolean oldAddressESet = addressESet;
         addressESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.CONNECTED_AP__ADDRESS, oldAddress, newAddress, !oldAddressESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.CONNECTED_AP__ADDRESS, oldAddress, newAddress, !oldAddressESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -417,20 +427,23 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public void setAddress( Address newAddress ) {
-        if (newAddress != address) {
+        if( newAddress != address ) {
             NotificationChain msgs = null;
-            if (address != null)
-                msgs = ((InternalEObject)address).eInverseRemove(this, SclPackage.ADDRESS__PARENT_CONNECTED_AP, Address.class, msgs);
-            if (newAddress != null)
-                msgs = ((InternalEObject)newAddress).eInverseAdd(this, SclPackage.ADDRESS__PARENT_CONNECTED_AP, Address.class, msgs);
-            msgs = basicSetAddress(newAddress, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( address != null )
+                msgs = ( ( InternalEObject ) address ).eInverseRemove( this, SclPackage.ADDRESS__PARENT_CONNECTED_AP,
+                        Address.class, msgs );
+            if( newAddress != null )
+                msgs = ( ( InternalEObject ) newAddress ).eInverseAdd( this, SclPackage.ADDRESS__PARENT_CONNECTED_AP,
+                        Address.class, msgs );
+            msgs = basicSetAddress( newAddress, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldAddressESet = addressESet;
             addressESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONNECTED_AP__ADDRESS, newAddress, newAddress, !oldAddressESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTED_AP__ADDRESS, newAddress,
+                        newAddress, !oldAddressESet ) );
         }
     }
 
@@ -444,9 +457,13 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
         address = null;
         boolean oldAddressESet = addressESet;
         addressESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.CONNECTED_AP__ADDRESS, oldAddress, null, oldAddressESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.CONNECTED_AP__ADDRESS, oldAddress, null, oldAddressESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -458,17 +475,19 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public void unsetAddress() {
-        if (address != null) {
+        if( address != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)address).eInverseRemove(this, SclPackage.ADDRESS__PARENT_CONNECTED_AP, Address.class, msgs);
-            msgs = basicUnsetAddress(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) address ).eInverseRemove( this, SclPackage.ADDRESS__PARENT_CONNECTED_AP,
+                    Address.class, msgs );
+            msgs = basicUnsetAddress( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldAddressESet = addressESet;
             addressESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONNECTED_AP__ADDRESS, null, null, oldAddressESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONNECTED_AP__ADDRESS, null, null,
+                        oldAddressESet ) );
         }
     }
 
@@ -489,8 +508,8 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public SubNetwork getParentSubNetwork() {
-        if (eContainerFeatureID() != SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK) return null;
-        return (SubNetwork)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK ) return null;
+        return ( SubNetwork ) eInternalContainer();
     }
 
     /**
@@ -498,8 +517,9 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSubNetwork(SubNetwork newParentSubNetwork, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSubNetwork, SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK, msgs);
+    public NotificationChain basicSetParentSubNetwork( SubNetwork newParentSubNetwork, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSubNetwork, SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK,
+                msgs );
         return msgs;
     }
 
@@ -509,20 +529,24 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      * @generated
      */
     @Override
-    public void setParentSubNetwork(SubNetwork newParentSubNetwork) {
-        if (newParentSubNetwork != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK && newParentSubNetwork != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSubNetwork))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSubNetwork( SubNetwork newParentSubNetwork ) {
+        if( newParentSubNetwork != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK
+                        && newParentSubNetwork != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSubNetwork ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSubNetwork != null)
-                msgs = ((InternalEObject)newParentSubNetwork).eInverseAdd(this, SclPackage.SUB_NETWORK__CONNECTED_AP, SubNetwork.class, msgs);
-            msgs = basicSetParentSubNetwork(newParentSubNetwork, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSubNetwork != null )
+                msgs = ( ( InternalEObject ) newParentSubNetwork ).eInverseAdd( this,
+                        SclPackage.SUB_NETWORK__CONNECTED_AP, SubNetwork.class, msgs );
+            msgs = basicSetParentSubNetwork( newParentSubNetwork, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK, newParentSubNetwork, newParentSubNetwork));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK,
+                    newParentSubNetwork, newParentSubNetwork ) );
     }
 
     /**
@@ -545,9 +569,14 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
         refersToAccessPoint = newRefersToAccessPoint;
         boolean oldRefersToAccessPointESet = refersToAccessPointESet;
         refersToAccessPointESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT, oldRefersToAccessPoint, newRefersToAccessPoint, !oldRefersToAccessPointESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT, oldRefersToAccessPoint, newRefersToAccessPoint,
+                    !oldRefersToAccessPointESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -559,20 +588,23 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public void setRefersToAccessPoint( AccessPoint newRefersToAccessPoint ) {
-        if (newRefersToAccessPoint != refersToAccessPoint) {
+        if( newRefersToAccessPoint != refersToAccessPoint ) {
             NotificationChain msgs = null;
-            if (refersToAccessPoint != null)
-                msgs = ((InternalEObject)refersToAccessPoint).eInverseRemove(this, SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP, AccessPoint.class, msgs);
-            if (newRefersToAccessPoint != null)
-                msgs = ((InternalEObject)newRefersToAccessPoint).eInverseAdd(this, SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP, AccessPoint.class, msgs);
-            msgs = basicSetRefersToAccessPoint(newRefersToAccessPoint, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToAccessPoint != null )
+                msgs = ( ( InternalEObject ) refersToAccessPoint ).eInverseRemove( this,
+                        SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP, AccessPoint.class, msgs );
+            if( newRefersToAccessPoint != null )
+                msgs = ( ( InternalEObject ) newRefersToAccessPoint ).eInverseAdd( this,
+                        SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP, AccessPoint.class, msgs );
+            msgs = basicSetRefersToAccessPoint( newRefersToAccessPoint, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAccessPointESet = refersToAccessPointESet;
             refersToAccessPointESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT, newRefersToAccessPoint, newRefersToAccessPoint, !oldRefersToAccessPointESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT,
+                        newRefersToAccessPoint, newRefersToAccessPoint, !oldRefersToAccessPointESet ) );
         }
     }
 
@@ -586,9 +618,14 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
         refersToAccessPoint = null;
         boolean oldRefersToAccessPointESet = refersToAccessPointESet;
         refersToAccessPointESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT, oldRefersToAccessPoint, null, oldRefersToAccessPointESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT, oldRefersToAccessPoint, null,
+                    oldRefersToAccessPointESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -600,17 +637,19 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public void unsetRefersToAccessPoint() {
-        if (refersToAccessPoint != null) {
+        if( refersToAccessPoint != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToAccessPoint).eInverseRemove(this, SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP, AccessPoint.class, msgs);
-            msgs = basicUnsetRefersToAccessPoint(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToAccessPoint ).eInverseRemove( this,
+                    SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP, AccessPoint.class, msgs );
+            msgs = basicUnsetRefersToAccessPoint( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAccessPointESet = refersToAccessPointESet;
             refersToAccessPointESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT, null, null, oldRefersToAccessPointESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET,
+                        SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT, null, null, oldRefersToAccessPointESet ) );
         }
     }
 
@@ -630,9 +669,10 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      * @generated
      */
     @Override
-    public EList<PhysConn> getPhysConn() {
-        if (physConn == null) {
-            physConn = new EObjectContainmentWithInverseEList.Unsettable<PhysConn>(PhysConn.class, this, SclPackage.CONNECTED_AP__PHYS_CONN, SclPackage.PHYS_CONN__PARENT_CONNECTED_AP);
+    public EList< PhysConn > getPhysConn() {
+        if( physConn == null ) {
+            physConn = new EObjectContainmentWithInverseEList.Unsettable< PhysConn >( PhysConn.class, this,
+                    SclPackage.CONNECTED_AP__PHYS_CONN, SclPackage.PHYS_CONN__PARENT_CONNECTED_AP );
         }
         return physConn;
     }
@@ -644,7 +684,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public void unsetPhysConn() {
-        if (physConn != null) ((InternalEList.Unsettable<?>)physConn).unset();
+        if( physConn != null ) ( ( InternalEList.Unsettable< ? > ) physConn ).unset();
     }
 
     /**
@@ -654,7 +694,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public boolean isSetPhysConn() {
-        return physConn != null && ((InternalEList.Unsettable<?>)physConn).isSet();
+        return physConn != null && ( ( InternalEList.Unsettable< ? > ) physConn ).isSet();
     }
 
     /**
@@ -663,8 +703,8 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      * @generated
      */
     @Override
-    public EList<GSE> getGSE() {
-        return getControlBlock().list(SclPackage.eINSTANCE.getConnectedAP_GSE());
+    public EList< GSE > getGSE() {
+        return getControlBlock().list( SclPackage.eINSTANCE.getConnectedAP_GSE() );
     }
 
     /**
@@ -674,7 +714,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public void unsetGSE() {
-        ((FeatureMap.Internal)getControlBlock()).clear(SclPackage.eINSTANCE.getConnectedAP_GSE());
+        ( ( FeatureMap.Internal ) getControlBlock() ).clear( SclPackage.eINSTANCE.getConnectedAP_GSE() );
     }
 
     /**
@@ -684,7 +724,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public boolean isSetGSE() {
-        return !((FeatureMap.Internal)getControlBlock()).isEmpty(SclPackage.eINSTANCE.getConnectedAP_GSE());
+        return !( ( FeatureMap.Internal ) getControlBlock() ).isEmpty( SclPackage.eINSTANCE.getConnectedAP_GSE() );
     }
 
     /**
@@ -693,8 +733,8 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      * @generated
      */
     @Override
-    public EList<SMV> getSMV() {
-        return getControlBlock().list(SclPackage.eINSTANCE.getConnectedAP_SMV());
+    public EList< SMV > getSMV() {
+        return getControlBlock().list( SclPackage.eINSTANCE.getConnectedAP_SMV() );
     }
 
     /**
@@ -704,7 +744,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public void unsetSMV() {
-        ((FeatureMap.Internal)getControlBlock()).clear(SclPackage.eINSTANCE.getConnectedAP_SMV());
+        ( ( FeatureMap.Internal ) getControlBlock() ).clear( SclPackage.eINSTANCE.getConnectedAP_SMV() );
     }
 
     /**
@@ -714,7 +754,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public boolean isSetSMV() {
-        return !((FeatureMap.Internal)getControlBlock()).isEmpty(SclPackage.eINSTANCE.getConnectedAP_SMV());
+        return !( ( FeatureMap.Internal ) getControlBlock() ).isEmpty( SclPackage.eINSTANCE.getConnectedAP_SMV() );
     }
 
     /**
@@ -724,8 +764,8 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public FeatureMap getControlBlock() {
-        if (controlBlock == null) {
-            controlBlock = new BasicFeatureMap(this, SclPackage.CONNECTED_AP__CONTROL_BLOCK);
+        if( controlBlock == null ) {
+            controlBlock = new BasicFeatureMap( this, SclPackage.CONNECTED_AP__CONTROL_BLOCK );
         }
         return controlBlock;
     }
@@ -738,27 +778,30 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONNECTED_AP__ADDRESS:
-                if (address != null)
-                    msgs = ((InternalEObject)address).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.CONNECTED_AP__ADDRESS, null, msgs);
-                return basicSetAddress((Address)otherEnd, msgs);
-            case SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSubNetwork((SubNetwork)otherEnd, msgs);
-            case SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT:
-                if (refersToAccessPoint != null)
-                    msgs = ((InternalEObject)refersToAccessPoint).eInverseRemove(this, SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP, AccessPoint.class, msgs);
-                return basicSetRefersToAccessPoint((AccessPoint)otherEnd, msgs);
-            case SclPackage.CONNECTED_AP__PHYS_CONN:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getPhysConn()).basicAdd(otherEnd, msgs);
-            case SclPackage.CONNECTED_AP__GSE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getGSE()).basicAdd(otherEnd, msgs);
-            case SclPackage.CONNECTED_AP__SMV:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSMV()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONNECTED_AP__ADDRESS:
+            if( address != null )
+                msgs = ( ( InternalEObject ) address ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.CONNECTED_AP__ADDRESS, null, msgs );
+            return basicSetAddress( ( Address ) otherEnd, msgs );
+        case SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSubNetwork( ( SubNetwork ) otherEnd, msgs );
+        case SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT:
+            if( refersToAccessPoint != null )
+                msgs = ( ( InternalEObject ) refersToAccessPoint ).eInverseRemove( this,
+                        SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP, AccessPoint.class, msgs );
+            return basicSetRefersToAccessPoint( ( AccessPoint ) otherEnd, msgs );
+        case SclPackage.CONNECTED_AP__PHYS_CONN:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getPhysConn() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.CONNECTED_AP__GSE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getGSE() ).basicAdd( otherEnd, msgs );
+        case SclPackage.CONNECTED_AP__SMV:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSMV() ).basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -768,23 +811,23 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONNECTED_AP__ADDRESS:
-                return basicUnsetAddress(msgs);
-            case SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK:
-                return basicSetParentSubNetwork(null, msgs);
-            case SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT:
-                return basicUnsetRefersToAccessPoint(msgs);
-            case SclPackage.CONNECTED_AP__PHYS_CONN:
-                return ((InternalEList<?>)getPhysConn()).basicRemove(otherEnd, msgs);
-            case SclPackage.CONNECTED_AP__GSE:
-                return ((InternalEList<?>)getGSE()).basicRemove(otherEnd, msgs);
-            case SclPackage.CONNECTED_AP__SMV:
-                return ((InternalEList<?>)getSMV()).basicRemove(otherEnd, msgs);
-            case SclPackage.CONNECTED_AP__CONTROL_BLOCK:
-                return ((InternalEList<?>)getControlBlock()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONNECTED_AP__ADDRESS:
+            return basicUnsetAddress( msgs );
+        case SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK:
+            return basicSetParentSubNetwork( null, msgs );
+        case SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT:
+            return basicUnsetRefersToAccessPoint( msgs );
+        case SclPackage.CONNECTED_AP__PHYS_CONN:
+            return ( ( InternalEList< ? > ) getPhysConn() ).basicRemove( otherEnd, msgs );
+        case SclPackage.CONNECTED_AP__GSE:
+            return ( ( InternalEList< ? > ) getGSE() ).basicRemove( otherEnd, msgs );
+        case SclPackage.CONNECTED_AP__SMV:
+            return ( ( InternalEList< ? > ) getSMV() ).basicRemove( otherEnd, msgs );
+        case SclPackage.CONNECTED_AP__CONTROL_BLOCK:
+            return ( ( InternalEList< ? > ) getControlBlock() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -794,11 +837,12 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SUB_NETWORK__CONNECTED_AP, SubNetwork.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SUB_NETWORK__CONNECTED_AP, SubNetwork.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -808,30 +852,30 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CONNECTED_AP__AP_NAME:
-                return getApName();
-            case SclPackage.CONNECTED_AP__IED_NAME:
-                return getIedName();
-            case SclPackage.CONNECTED_AP__RED_PROT:
-                return getRedProt();
-            case SclPackage.CONNECTED_AP__ADDRESS:
-                return getAddress();
-            case SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK:
-                return getParentSubNetwork();
-            case SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT:
-                return getRefersToAccessPoint();
-            case SclPackage.CONNECTED_AP__PHYS_CONN:
-                return getPhysConn();
-            case SclPackage.CONNECTED_AP__GSE:
-                return getGSE();
-            case SclPackage.CONNECTED_AP__SMV:
-                return getSMV();
-            case SclPackage.CONNECTED_AP__CONTROL_BLOCK:
-                if (coreType) return getControlBlock();
-                return ((FeatureMap.Internal)getControlBlock()).getWrapper();
+        switch( featureID ) {
+        case SclPackage.CONNECTED_AP__AP_NAME:
+            return getApName();
+        case SclPackage.CONNECTED_AP__IED_NAME:
+            return getIedName();
+        case SclPackage.CONNECTED_AP__RED_PROT:
+            return getRedProt();
+        case SclPackage.CONNECTED_AP__ADDRESS:
+            return getAddress();
+        case SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK:
+            return getParentSubNetwork();
+        case SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT:
+            return getRefersToAccessPoint();
+        case SclPackage.CONNECTED_AP__PHYS_CONN:
+            return getPhysConn();
+        case SclPackage.CONNECTED_AP__GSE:
+            return getGSE();
+        case SclPackage.CONNECTED_AP__SMV:
+            return getSMV();
+        case SclPackage.CONNECTED_AP__CONTROL_BLOCK:
+            if( coreType ) return getControlBlock();
+            return ( ( FeatureMap.Internal ) getControlBlock() ).getWrapper();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -842,42 +886,42 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CONNECTED_AP__AP_NAME:
-                setApName((String)newValue);
-                return;
-            case SclPackage.CONNECTED_AP__IED_NAME:
-                setIedName((String)newValue);
-                return;
-            case SclPackage.CONNECTED_AP__RED_PROT:
-                setRedProt((String)newValue);
-                return;
-            case SclPackage.CONNECTED_AP__ADDRESS:
-                setAddress((Address)newValue);
-                return;
-            case SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK:
-                setParentSubNetwork((SubNetwork)newValue);
-                return;
-            case SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT:
-                setRefersToAccessPoint((AccessPoint)newValue);
-                return;
-            case SclPackage.CONNECTED_AP__PHYS_CONN:
-                getPhysConn().clear();
-                getPhysConn().addAll((Collection<? extends PhysConn>)newValue);
-                return;
-            case SclPackage.CONNECTED_AP__GSE:
-                getGSE().clear();
-                getGSE().addAll((Collection<? extends GSE>)newValue);
-                return;
-            case SclPackage.CONNECTED_AP__SMV:
-                getSMV().clear();
-                getSMV().addAll((Collection<? extends SMV>)newValue);
-                return;
-            case SclPackage.CONNECTED_AP__CONTROL_BLOCK:
-                ((FeatureMap.Internal)getControlBlock()).set(newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONNECTED_AP__AP_NAME:
+            setApName( ( String ) newValue );
+            return;
+        case SclPackage.CONNECTED_AP__IED_NAME:
+            setIedName( ( String ) newValue );
+            return;
+        case SclPackage.CONNECTED_AP__RED_PROT:
+            setRedProt( ( String ) newValue );
+            return;
+        case SclPackage.CONNECTED_AP__ADDRESS:
+            setAddress( ( Address ) newValue );
+            return;
+        case SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK:
+            setParentSubNetwork( ( SubNetwork ) newValue );
+            return;
+        case SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT:
+            setRefersToAccessPoint( ( AccessPoint ) newValue );
+            return;
+        case SclPackage.CONNECTED_AP__PHYS_CONN:
+            getPhysConn().clear();
+            getPhysConn().addAll( ( Collection< ? extends PhysConn > ) newValue );
+            return;
+        case SclPackage.CONNECTED_AP__GSE:
+            getGSE().clear();
+            getGSE().addAll( ( Collection< ? extends GSE > ) newValue );
+            return;
+        case SclPackage.CONNECTED_AP__SMV:
+            getSMV().clear();
+            getSMV().addAll( ( Collection< ? extends SMV > ) newValue );
+            return;
+        case SclPackage.CONNECTED_AP__CONTROL_BLOCK:
+            ( ( FeatureMap.Internal ) getControlBlock() ).set( newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -887,39 +931,39 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONNECTED_AP__AP_NAME:
-                unsetApName();
-                return;
-            case SclPackage.CONNECTED_AP__IED_NAME:
-                unsetIedName();
-                return;
-            case SclPackage.CONNECTED_AP__RED_PROT:
-                unsetRedProt();
-                return;
-            case SclPackage.CONNECTED_AP__ADDRESS:
-                unsetAddress();
-                return;
-            case SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK:
-                setParentSubNetwork((SubNetwork)null);
-                return;
-            case SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT:
-                unsetRefersToAccessPoint();
-                return;
-            case SclPackage.CONNECTED_AP__PHYS_CONN:
-                unsetPhysConn();
-                return;
-            case SclPackage.CONNECTED_AP__GSE:
-                unsetGSE();
-                return;
-            case SclPackage.CONNECTED_AP__SMV:
-                unsetSMV();
-                return;
-            case SclPackage.CONNECTED_AP__CONTROL_BLOCK:
-                getControlBlock().clear();
-                return;
+        switch( featureID ) {
+        case SclPackage.CONNECTED_AP__AP_NAME:
+            unsetApName();
+            return;
+        case SclPackage.CONNECTED_AP__IED_NAME:
+            unsetIedName();
+            return;
+        case SclPackage.CONNECTED_AP__RED_PROT:
+            unsetRedProt();
+            return;
+        case SclPackage.CONNECTED_AP__ADDRESS:
+            unsetAddress();
+            return;
+        case SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK:
+            setParentSubNetwork( ( SubNetwork ) null );
+            return;
+        case SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT:
+            unsetRefersToAccessPoint();
+            return;
+        case SclPackage.CONNECTED_AP__PHYS_CONN:
+            unsetPhysConn();
+            return;
+        case SclPackage.CONNECTED_AP__GSE:
+            unsetGSE();
+            return;
+        case SclPackage.CONNECTED_AP__SMV:
+            unsetSMV();
+            return;
+        case SclPackage.CONNECTED_AP__CONTROL_BLOCK:
+            getControlBlock().clear();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -929,29 +973,29 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONNECTED_AP__AP_NAME:
-                return isSetApName();
-            case SclPackage.CONNECTED_AP__IED_NAME:
-                return isSetIedName();
-            case SclPackage.CONNECTED_AP__RED_PROT:
-                return isSetRedProt();
-            case SclPackage.CONNECTED_AP__ADDRESS:
-                return isSetAddress();
-            case SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK:
-                return getParentSubNetwork() != null;
-            case SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT:
-                return isSetRefersToAccessPoint();
-            case SclPackage.CONNECTED_AP__PHYS_CONN:
-                return isSetPhysConn();
-            case SclPackage.CONNECTED_AP__GSE:
-                return isSetGSE();
-            case SclPackage.CONNECTED_AP__SMV:
-                return isSetSMV();
-            case SclPackage.CONNECTED_AP__CONTROL_BLOCK:
-                return controlBlock != null && !controlBlock.isEmpty();
+        switch( featureID ) {
+        case SclPackage.CONNECTED_AP__AP_NAME:
+            return isSetApName();
+        case SclPackage.CONNECTED_AP__IED_NAME:
+            return isSetIedName();
+        case SclPackage.CONNECTED_AP__RED_PROT:
+            return isSetRedProt();
+        case SclPackage.CONNECTED_AP__ADDRESS:
+            return isSetAddress();
+        case SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK:
+            return getParentSubNetwork() != null;
+        case SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT:
+            return isSetRefersToAccessPoint();
+        case SclPackage.CONNECTED_AP__PHYS_CONN:
+            return isSetPhysConn();
+        case SclPackage.CONNECTED_AP__GSE:
+            return isSetGSE();
+        case SclPackage.CONNECTED_AP__SMV:
+            return isSetSMV();
+        case SclPackage.CONNECTED_AP__CONTROL_BLOCK:
+            return controlBlock != null && !controlBlock.isEmpty();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -961,18 +1005,27 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (apName: ");
-        if (apNameESet) result.append(apName); else result.append("<unset>");
-        result.append(", iedName: ");
-        if (iedNameESet) result.append(iedName); else result.append("<unset>");
-        result.append(", redProt: ");
-        if (redProtESet) result.append(redProt); else result.append("<unset>");
-        result.append(", ControlBlock: ");
-        result.append(controlBlock);
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (apName: " );
+        if( apNameESet )
+            result.append( apName );
+        else
+            result.append( "<unset>" );
+        result.append( ", iedName: " );
+        if( iedNameESet )
+            result.append( iedName );
+        else
+            result.append( "<unset>" );
+        result.append( ", redProt: " );
+        if( redProtESet )
+            result.append( redProt );
+        else
+            result.append( "<unset>" );
+        result.append( ", ControlBlock: " );
+        result.append( controlBlock );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -980,18 +1033,18 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         // iedName a name identifying the IED
         // apName  a name identifying this access point within the IED
         // desc    some descriptive text for this access point at this subnetwork
 
         String messagePrefix = "[SCL links] while resolving link from ConnectedAP on line " + getLineNumber() + ": ";
 
-        if(( getIedName() == null ) || getIedName().isEmpty() ) {
+        if( ( getIedName() == null ) || getIedName().isEmpty() ) {
             console.warning( messagePrefix, "iedName is missing" );
             return;
         }
-        if(( getApName() == null ) || getApName().isEmpty() ) {
+        if( ( getApName() == null ) || getApName().isEmpty() ) {
             console.warning( messagePrefix, "apName is missing" );
             return;
         }
@@ -1012,7 +1065,8 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
             return;
         }
         setRefersToAccessPoint( ap.getLeft() );
-        console.info( "[SCL links] ConnectedAP on line ", getLineNumber(), " refers to ", mess2, " on line ", getRefersToAccessPoint().getLineNumber() );
+        console.info( "[SCL links] ConnectedAP on line ", getLineNumber(), " refers to ", mess2, " on line ",
+                getRefersToAccessPoint().getLineNumber() );
     }
 
 } //ConnectedAPImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectivityNodeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectivityNodeImpl.java
index 8a1a8ec..1a44037 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectivityNodeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectivityNodeImpl.java
@@ -91,7 +91,7 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      * @generated
      * @ordered
      */
-    protected EList<Terminal> referredByTerminal;
+    protected EList< Terminal > referredByTerminal;
 
     /**
      * <!-- begin-user-doc -->
@@ -133,8 +133,9 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
         pathName = newPathName;
         boolean oldPathNameESet = pathNameESet;
         pathNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONNECTIVITY_NODE__PATH_NAME, oldPathName, pathName, !oldPathNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTIVITY_NODE__PATH_NAME,
+                    oldPathName, pathName, !oldPathNameESet ) );
     }
 
     /**
@@ -148,8 +149,9 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
         boolean oldPathNameESet = pathNameESet;
         pathName = PATH_NAME_EDEFAULT;
         pathNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONNECTIVITY_NODE__PATH_NAME, oldPathName, PATH_NAME_EDEFAULT, oldPathNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONNECTIVITY_NODE__PATH_NAME,
+                    oldPathName, PATH_NAME_EDEFAULT, oldPathNameESet ) );
     }
 
     /**
@@ -169,8 +171,8 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      */
     @Override
     public Bay getParentBay() {
-        if (eContainerFeatureID() != SclPackage.CONNECTIVITY_NODE__PARENT_BAY) return null;
-        return (Bay)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONNECTIVITY_NODE__PARENT_BAY ) return null;
+        return ( Bay ) eInternalContainer();
     }
 
     /**
@@ -178,8 +180,8 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentBay(Bay newParentBay, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentBay, SclPackage.CONNECTIVITY_NODE__PARENT_BAY, msgs);
+    public NotificationChain basicSetParentBay( Bay newParentBay, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentBay, SclPackage.CONNECTIVITY_NODE__PARENT_BAY, msgs );
         return msgs;
     }
 
@@ -189,20 +191,23 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      * @generated
      */
     @Override
-    public void setParentBay(Bay newParentBay) {
-        if (newParentBay != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONNECTIVITY_NODE__PARENT_BAY && newParentBay != null)) {
-            if (EcoreUtil.isAncestor(this, newParentBay))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentBay( Bay newParentBay ) {
+        if( newParentBay != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONNECTIVITY_NODE__PARENT_BAY && newParentBay != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentBay ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentBay != null)
-                msgs = ((InternalEObject)newParentBay).eInverseAdd(this, SclPackage.BAY__CONNECTIVITY_NODE, Bay.class, msgs);
-            msgs = basicSetParentBay(newParentBay, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentBay != null )
+                msgs = ( ( InternalEObject ) newParentBay ).eInverseAdd( this, SclPackage.BAY__CONNECTIVITY_NODE,
+                        Bay.class, msgs );
+            msgs = basicSetParentBay( newParentBay, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONNECTIVITY_NODE__PARENT_BAY, newParentBay, newParentBay));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTIVITY_NODE__PARENT_BAY,
+                    newParentBay, newParentBay ) );
     }
 
     /**
@@ -211,9 +216,11 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      * @generated
      */
     @Override
-    public EList<Terminal> getReferredByTerminal() {
-        if (referredByTerminal == null) {
-            referredByTerminal = new EObjectWithInverseEList.Unsettable<Terminal>(Terminal.class, this, SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL, SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE);
+    public EList< Terminal > getReferredByTerminal() {
+        if( referredByTerminal == null ) {
+            referredByTerminal = new EObjectWithInverseEList.Unsettable< Terminal >( Terminal.class, this,
+                    SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL,
+                    SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE );
         }
         return referredByTerminal;
     }
@@ -225,7 +232,7 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      */
     @Override
     public void unsetReferredByTerminal() {
-        if (referredByTerminal != null) ((InternalEList.Unsettable<?>)referredByTerminal).unset();
+        if( referredByTerminal != null ) ( ( InternalEList.Unsettable< ? > ) referredByTerminal ).unset();
     }
 
     /**
@@ -235,7 +242,7 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      */
     @Override
     public boolean isSetReferredByTerminal() {
-        return referredByTerminal != null && ((InternalEList.Unsettable<?>)referredByTerminal).isSet();
+        return referredByTerminal != null && ( ( InternalEList.Unsettable< ? > ) referredByTerminal ).isSet();
     }
 
     /**
@@ -245,8 +252,8 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      */
     @Override
     public Line getParentLine() {
-        if (eContainerFeatureID() != SclPackage.CONNECTIVITY_NODE__PARENT_LINE) return null;
-        return (Line)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.CONNECTIVITY_NODE__PARENT_LINE ) return null;
+        return ( Line ) eInternalContainer();
     }
 
     /**
@@ -254,8 +261,8 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentLine(Line newParentLine, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentLine, SclPackage.CONNECTIVITY_NODE__PARENT_LINE, msgs);
+    public NotificationChain basicSetParentLine( Line newParentLine, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentLine, SclPackage.CONNECTIVITY_NODE__PARENT_LINE, msgs );
         return msgs;
     }
 
@@ -265,20 +272,23 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      * @generated
      */
     @Override
-    public void setParentLine(Line newParentLine) {
-        if (newParentLine != eInternalContainer() || (eContainerFeatureID() != SclPackage.CONNECTIVITY_NODE__PARENT_LINE && newParentLine != null)) {
-            if (EcoreUtil.isAncestor(this, newParentLine))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentLine( Line newParentLine ) {
+        if( newParentLine != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.CONNECTIVITY_NODE__PARENT_LINE && newParentLine != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentLine ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentLine != null)
-                msgs = ((InternalEObject)newParentLine).eInverseAdd(this, SclPackage.LINE__CONNECTIVITY_NODE, Line.class, msgs);
-            msgs = basicSetParentLine(newParentLine, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentLine != null )
+                msgs = ( ( InternalEObject ) newParentLine ).eInverseAdd( this, SclPackage.LINE__CONNECTIVITY_NODE,
+                        Line.class, msgs );
+            msgs = basicSetParentLine( newParentLine, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONNECTIVITY_NODE__PARENT_LINE, newParentLine, newParentLine));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTIVITY_NODE__PARENT_LINE,
+                    newParentLine, newParentLine ) );
     }
 
     /**
@@ -289,19 +299,20 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONNECTIVITY_NODE__PARENT_BAY:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentBay((Bay)otherEnd, msgs);
-            case SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByTerminal()).basicAdd(otherEnd, msgs);
-            case SclPackage.CONNECTIVITY_NODE__PARENT_LINE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentLine((Line)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONNECTIVITY_NODE__PARENT_BAY:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentBay( ( Bay ) otherEnd, msgs );
+        case SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByTerminal() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.CONNECTIVITY_NODE__PARENT_LINE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentLine( ( Line ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -311,15 +322,15 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONNECTIVITY_NODE__PARENT_BAY:
-                return basicSetParentBay(null, msgs);
-            case SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL:
-                return ((InternalEList<?>)getReferredByTerminal()).basicRemove(otherEnd, msgs);
-            case SclPackage.CONNECTIVITY_NODE__PARENT_LINE:
-                return basicSetParentLine(null, msgs);
+        switch( featureID ) {
+        case SclPackage.CONNECTIVITY_NODE__PARENT_BAY:
+            return basicSetParentBay( null, msgs );
+        case SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL:
+            return ( ( InternalEList< ? > ) getReferredByTerminal() ).basicRemove( otherEnd, msgs );
+        case SclPackage.CONNECTIVITY_NODE__PARENT_LINE:
+            return basicSetParentLine( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -329,13 +340,13 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.CONNECTIVITY_NODE__PARENT_BAY:
-                return eInternalContainer().eInverseRemove(this, SclPackage.BAY__CONNECTIVITY_NODE, Bay.class, msgs);
-            case SclPackage.CONNECTIVITY_NODE__PARENT_LINE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.LINE__CONNECTIVITY_NODE, Line.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.CONNECTIVITY_NODE__PARENT_BAY:
+            return eInternalContainer().eInverseRemove( this, SclPackage.BAY__CONNECTIVITY_NODE, Bay.class, msgs );
+        case SclPackage.CONNECTIVITY_NODE__PARENT_LINE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.LINE__CONNECTIVITY_NODE, Line.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -345,17 +356,17 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CONNECTIVITY_NODE__PATH_NAME:
-                return getPathName();
-            case SclPackage.CONNECTIVITY_NODE__PARENT_BAY:
-                return getParentBay();
-            case SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL:
-                return getReferredByTerminal();
-            case SclPackage.CONNECTIVITY_NODE__PARENT_LINE:
-                return getParentLine();
+        switch( featureID ) {
+        case SclPackage.CONNECTIVITY_NODE__PATH_NAME:
+            return getPathName();
+        case SclPackage.CONNECTIVITY_NODE__PARENT_BAY:
+            return getParentBay();
+        case SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL:
+            return getReferredByTerminal();
+        case SclPackage.CONNECTIVITY_NODE__PARENT_LINE:
+            return getParentLine();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -366,22 +377,22 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CONNECTIVITY_NODE__PATH_NAME:
-                setPathName((String)newValue);
-                return;
-            case SclPackage.CONNECTIVITY_NODE__PARENT_BAY:
-                setParentBay((Bay)newValue);
-                return;
-            case SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL:
-                getReferredByTerminal().clear();
-                getReferredByTerminal().addAll((Collection<? extends Terminal>)newValue);
-                return;
-            case SclPackage.CONNECTIVITY_NODE__PARENT_LINE:
-                setParentLine((Line)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONNECTIVITY_NODE__PATH_NAME:
+            setPathName( ( String ) newValue );
+            return;
+        case SclPackage.CONNECTIVITY_NODE__PARENT_BAY:
+            setParentBay( ( Bay ) newValue );
+            return;
+        case SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL:
+            getReferredByTerminal().clear();
+            getReferredByTerminal().addAll( ( Collection< ? extends Terminal > ) newValue );
+            return;
+        case SclPackage.CONNECTIVITY_NODE__PARENT_LINE:
+            setParentLine( ( Line ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -391,21 +402,21 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONNECTIVITY_NODE__PATH_NAME:
-                unsetPathName();
-                return;
-            case SclPackage.CONNECTIVITY_NODE__PARENT_BAY:
-                setParentBay((Bay)null);
-                return;
-            case SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL:
-                unsetReferredByTerminal();
-                return;
-            case SclPackage.CONNECTIVITY_NODE__PARENT_LINE:
-                setParentLine((Line)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONNECTIVITY_NODE__PATH_NAME:
+            unsetPathName();
+            return;
+        case SclPackage.CONNECTIVITY_NODE__PARENT_BAY:
+            setParentBay( ( Bay ) null );
+            return;
+        case SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL:
+            unsetReferredByTerminal();
+            return;
+        case SclPackage.CONNECTIVITY_NODE__PARENT_LINE:
+            setParentLine( ( Line ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -415,17 +426,17 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONNECTIVITY_NODE__PATH_NAME:
-                return isSetPathName();
-            case SclPackage.CONNECTIVITY_NODE__PARENT_BAY:
-                return getParentBay() != null;
-            case SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL:
-                return isSetReferredByTerminal();
-            case SclPackage.CONNECTIVITY_NODE__PARENT_LINE:
-                return getParentLine() != null;
+        switch( featureID ) {
+        case SclPackage.CONNECTIVITY_NODE__PATH_NAME:
+            return isSetPathName();
+        case SclPackage.CONNECTIVITY_NODE__PARENT_BAY:
+            return getParentBay() != null;
+        case SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL:
+            return isSetReferredByTerminal();
+        case SclPackage.CONNECTIVITY_NODE__PARENT_LINE:
+            return getParentLine() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -435,12 +446,15 @@ public class ConnectivityNodeImpl extends LNodeContainerImpl implements Connecti
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (pathName: ");
-        if (pathNameESet) result.append(pathName); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (pathName: " );
+        if( pathNameESet )
+            result.append( pathName );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlBlockImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlBlockImpl.java
index aba410b..3565ad0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlBlockImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlBlockImpl.java
@@ -198,8 +198,9 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
         cbName = newCbName;
         boolean oldCbNameESet = cbNameESet;
         cbNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL_BLOCK__CB_NAME, oldCbName, cbName, !oldCbNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL_BLOCK__CB_NAME, oldCbName,
+                    cbName, !oldCbNameESet ) );
     }
 
     /**
@@ -213,8 +214,9 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
         boolean oldCbNameESet = cbNameESet;
         cbName = CB_NAME_EDEFAULT;
         cbNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL_BLOCK__CB_NAME, oldCbName, CB_NAME_EDEFAULT, oldCbNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL_BLOCK__CB_NAME, oldCbName,
+                    CB_NAME_EDEFAULT, oldCbNameESet ) );
     }
 
     /**
@@ -248,8 +250,9 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
         ldInst = newLdInst;
         boolean oldLdInstESet = ldInstESet;
         ldInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL_BLOCK__LD_INST, oldLdInst, ldInst, !oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL_BLOCK__LD_INST, oldLdInst,
+                    ldInst, !oldLdInstESet ) );
     }
 
     /**
@@ -263,8 +266,9 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
         boolean oldLdInstESet = ldInstESet;
         ldInst = LD_INST_EDEFAULT;
         ldInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL_BLOCK__LD_INST, oldLdInst, LD_INST_EDEFAULT, oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL_BLOCK__LD_INST, oldLdInst,
+                    LD_INST_EDEFAULT, oldLdInstESet ) );
     }
 
     /**
@@ -297,9 +301,13 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
         address = newAddress;
         boolean oldAddressESet = addressESet;
         addressESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL_BLOCK__ADDRESS, oldAddress, newAddress, !oldAddressESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.CONTROL_BLOCK__ADDRESS, oldAddress, newAddress, !oldAddressESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -311,20 +319,23 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
      */
     @Override
     public void setAddress( Address newAddress ) {
-        if (newAddress != address) {
+        if( newAddress != address ) {
             NotificationChain msgs = null;
-            if (address != null)
-                msgs = ((InternalEObject)address).eInverseRemove(this, SclPackage.ADDRESS__PARENT_CONTROL_BLOCK, Address.class, msgs);
-            if (newAddress != null)
-                msgs = ((InternalEObject)newAddress).eInverseAdd(this, SclPackage.ADDRESS__PARENT_CONTROL_BLOCK, Address.class, msgs);
-            msgs = basicSetAddress(newAddress, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( address != null )
+                msgs = ( ( InternalEObject ) address ).eInverseRemove( this, SclPackage.ADDRESS__PARENT_CONTROL_BLOCK,
+                        Address.class, msgs );
+            if( newAddress != null )
+                msgs = ( ( InternalEObject ) newAddress ).eInverseAdd( this, SclPackage.ADDRESS__PARENT_CONTROL_BLOCK,
+                        Address.class, msgs );
+            msgs = basicSetAddress( newAddress, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldAddressESet = addressESet;
             addressESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL_BLOCK__ADDRESS, newAddress, newAddress, !oldAddressESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL_BLOCK__ADDRESS, newAddress,
+                        newAddress, !oldAddressESet ) );
         }
     }
 
@@ -338,9 +349,13 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
         address = null;
         boolean oldAddressESet = addressESet;
         addressESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL_BLOCK__ADDRESS, oldAddress, null, oldAddressESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.CONTROL_BLOCK__ADDRESS, oldAddress, null, oldAddressESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -352,17 +367,19 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
      */
     @Override
     public void unsetAddress() {
-        if (address != null) {
+        if( address != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)address).eInverseRemove(this, SclPackage.ADDRESS__PARENT_CONTROL_BLOCK, Address.class, msgs);
-            msgs = basicUnsetAddress(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) address ).eInverseRemove( this, SclPackage.ADDRESS__PARENT_CONTROL_BLOCK,
+                    Address.class, msgs );
+            msgs = basicUnsetAddress( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldAddressESet = addressESet;
             addressESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL_BLOCK__ADDRESS, null, null, oldAddressESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL_BLOCK__ADDRESS, null, null,
+                        oldAddressESet ) );
         }
     }
 
@@ -397,9 +414,14 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
         refersToControlWithIEDName = newRefersToControlWithIEDName;
         boolean oldRefersToControlWithIEDNameESet = refersToControlWithIEDNameESet;
         refersToControlWithIEDNameESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME, oldRefersToControlWithIEDName, newRefersToControlWithIEDName, !oldRefersToControlWithIEDNameESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME, oldRefersToControlWithIEDName,
+                    newRefersToControlWithIEDName, !oldRefersToControlWithIEDNameESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -411,20 +433,24 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
      */
     @Override
     public void setRefersToControlWithIEDName( ControlWithIEDName newRefersToControlWithIEDName ) {
-        if (newRefersToControlWithIEDName != refersToControlWithIEDName) {
+        if( newRefersToControlWithIEDName != refersToControlWithIEDName ) {
             NotificationChain msgs = null;
-            if (refersToControlWithIEDName != null)
-                msgs = ((InternalEObject)refersToControlWithIEDName).eInverseRemove(this, SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK, ControlWithIEDName.class, msgs);
-            if (newRefersToControlWithIEDName != null)
-                msgs = ((InternalEObject)newRefersToControlWithIEDName).eInverseAdd(this, SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK, ControlWithIEDName.class, msgs);
-            msgs = basicSetRefersToControlWithIEDName(newRefersToControlWithIEDName, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToControlWithIEDName != null )
+                msgs = ( ( InternalEObject ) refersToControlWithIEDName ).eInverseRemove( this,
+                        SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK, ControlWithIEDName.class, msgs );
+            if( newRefersToControlWithIEDName != null )
+                msgs = ( ( InternalEObject ) newRefersToControlWithIEDName ).eInverseAdd( this,
+                        SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK, ControlWithIEDName.class, msgs );
+            msgs = basicSetRefersToControlWithIEDName( newRefersToControlWithIEDName, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToControlWithIEDNameESet = refersToControlWithIEDNameESet;
             refersToControlWithIEDNameESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME, newRefersToControlWithIEDName, newRefersToControlWithIEDName, !oldRefersToControlWithIEDNameESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET,
+                        SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME, newRefersToControlWithIEDName,
+                        newRefersToControlWithIEDName, !oldRefersToControlWithIEDNameESet ) );
         }
     }
 
@@ -438,9 +464,14 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
         refersToControlWithIEDName = null;
         boolean oldRefersToControlWithIEDNameESet = refersToControlWithIEDNameESet;
         refersToControlWithIEDNameESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME, oldRefersToControlWithIEDName, null, oldRefersToControlWithIEDNameESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME, oldRefersToControlWithIEDName, null,
+                    oldRefersToControlWithIEDNameESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -452,17 +483,20 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
      */
     @Override
     public void unsetRefersToControlWithIEDName() {
-        if (refersToControlWithIEDName != null) {
+        if( refersToControlWithIEDName != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToControlWithIEDName).eInverseRemove(this, SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK, ControlWithIEDName.class, msgs);
-            msgs = basicUnsetRefersToControlWithIEDName(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToControlWithIEDName ).eInverseRemove( this,
+                    SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK, ControlWithIEDName.class, msgs );
+            msgs = basicUnsetRefersToControlWithIEDName( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToControlWithIEDNameESet = refersToControlWithIEDNameESet;
             refersToControlWithIEDNameESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME, null, null, oldRefersToControlWithIEDNameESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET,
+                        SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME, null, null,
+                        oldRefersToControlWithIEDNameESet ) );
         }
     }
 
@@ -493,17 +527,19 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_BLOCK__ADDRESS:
-                if (address != null)
-                    msgs = ((InternalEObject)address).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.CONTROL_BLOCK__ADDRESS, null, msgs);
-                return basicSetAddress((Address)otherEnd, msgs);
-            case SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME:
-                if (refersToControlWithIEDName != null)
-                    msgs = ((InternalEObject)refersToControlWithIEDName).eInverseRemove(this, SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK, ControlWithIEDName.class, msgs);
-                return basicSetRefersToControlWithIEDName((ControlWithIEDName)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONTROL_BLOCK__ADDRESS:
+            if( address != null )
+                msgs = ( ( InternalEObject ) address ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.CONTROL_BLOCK__ADDRESS, null, msgs );
+            return basicSetAddress( ( Address ) otherEnd, msgs );
+        case SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME:
+            if( refersToControlWithIEDName != null )
+                msgs = ( ( InternalEObject ) refersToControlWithIEDName ).eInverseRemove( this,
+                        SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK, ControlWithIEDName.class, msgs );
+            return basicSetRefersToControlWithIEDName( ( ControlWithIEDName ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -513,13 +549,13 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_BLOCK__ADDRESS:
-                return basicUnsetAddress(msgs);
-            case SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME:
-                return basicUnsetRefersToControlWithIEDName(msgs);
+        switch( featureID ) {
+        case SclPackage.CONTROL_BLOCK__ADDRESS:
+            return basicUnsetAddress( msgs );
+        case SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME:
+            return basicUnsetRefersToControlWithIEDName( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -529,17 +565,17 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_BLOCK__CB_NAME:
-                return getCbName();
-            case SclPackage.CONTROL_BLOCK__LD_INST:
-                return getLdInst();
-            case SclPackage.CONTROL_BLOCK__ADDRESS:
-                return getAddress();
-            case SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME:
-                return getRefersToControlWithIEDName();
+        switch( featureID ) {
+        case SclPackage.CONTROL_BLOCK__CB_NAME:
+            return getCbName();
+        case SclPackage.CONTROL_BLOCK__LD_INST:
+            return getLdInst();
+        case SclPackage.CONTROL_BLOCK__ADDRESS:
+            return getAddress();
+        case SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME:
+            return getRefersToControlWithIEDName();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -549,21 +585,21 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_BLOCK__CB_NAME:
-                setCbName((String)newValue);
-                return;
-            case SclPackage.CONTROL_BLOCK__LD_INST:
-                setLdInst((String)newValue);
-                return;
-            case SclPackage.CONTROL_BLOCK__ADDRESS:
-                setAddress((Address)newValue);
-                return;
-            case SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME:
-                setRefersToControlWithIEDName((ControlWithIEDName)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONTROL_BLOCK__CB_NAME:
+            setCbName( ( String ) newValue );
+            return;
+        case SclPackage.CONTROL_BLOCK__LD_INST:
+            setLdInst( ( String ) newValue );
+            return;
+        case SclPackage.CONTROL_BLOCK__ADDRESS:
+            setAddress( ( Address ) newValue );
+            return;
+        case SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME:
+            setRefersToControlWithIEDName( ( ControlWithIEDName ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -573,21 +609,21 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_BLOCK__CB_NAME:
-                unsetCbName();
-                return;
-            case SclPackage.CONTROL_BLOCK__LD_INST:
-                unsetLdInst();
-                return;
-            case SclPackage.CONTROL_BLOCK__ADDRESS:
-                unsetAddress();
-                return;
-            case SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME:
-                unsetRefersToControlWithIEDName();
-                return;
+        switch( featureID ) {
+        case SclPackage.CONTROL_BLOCK__CB_NAME:
+            unsetCbName();
+            return;
+        case SclPackage.CONTROL_BLOCK__LD_INST:
+            unsetLdInst();
+            return;
+        case SclPackage.CONTROL_BLOCK__ADDRESS:
+            unsetAddress();
+            return;
+        case SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME:
+            unsetRefersToControlWithIEDName();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -597,17 +633,17 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_BLOCK__CB_NAME:
-                return isSetCbName();
-            case SclPackage.CONTROL_BLOCK__LD_INST:
-                return isSetLdInst();
-            case SclPackage.CONTROL_BLOCK__ADDRESS:
-                return isSetAddress();
-            case SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME:
-                return isSetRefersToControlWithIEDName();
+        switch( featureID ) {
+        case SclPackage.CONTROL_BLOCK__CB_NAME:
+            return isSetCbName();
+        case SclPackage.CONTROL_BLOCK__LD_INST:
+            return isSetLdInst();
+        case SclPackage.CONTROL_BLOCK__ADDRESS:
+            return isSetAddress();
+        case SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME:
+            return isSetRefersToControlWithIEDName();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -616,12 +652,12 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
      * @generated
      */
     @Override
-    public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-        switch (operationID) {
-            case SclPackage.CONTROL_BLOCK___GET_PARENT_CONNECTED_AP:
-                return getParentConnectedAP();
+    public Object eInvoke( int operationID, EList< ? > arguments ) throws InvocationTargetException {
+        switch( operationID ) {
+        case SclPackage.CONTROL_BLOCK___GET_PARENT_CONNECTED_AP:
+            return getParentConnectedAP();
         }
-        return super.eInvoke(operationID, arguments);
+        return super.eInvoke( operationID, arguments );
     }
 
     /**
@@ -631,14 +667,20 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (cbName: ");
-        if (cbNameESet) result.append(cbName); else result.append("<unset>");
-        result.append(", ldInst: ");
-        if (ldInstESet) result.append(ldInst); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (cbName: " );
+        if( cbNameESet )
+            result.append( cbName );
+        else
+            result.append( "<unset>" );
+        result.append( ", ldInst: " );
+        if( ldInstESet )
+            result.append( ldInst );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -646,7 +688,7 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         // desc    Textual description
         // ldInst  The instance identification of the LD within this IED, on which the control block is located.
         //         An LN is not necessary, as these control blocks are only in LLN0.
@@ -658,11 +700,11 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
 
         String messagePrefix = "[SCL links] while resolving link from ControlBlock on line " + getLineNumber() + ": ";
 
-        if(( getLdInst() == null ) || getLdInst().isEmpty() ) {
+        if( ( getLdInst() == null ) || getLdInst().isEmpty() ) {
             console.warning( messagePrefix, "ldInst is missing" );
             return;
         }
-        if(( getCbName() == null ) || getCbName().isEmpty() ) {
+        if( ( getCbName() == null ) || getCbName().isEmpty() ) {
             console.warning( messagePrefix, "cbName is missing" );
             return;
         }
@@ -693,20 +735,20 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
         List< ControlWithIEDName > l2 = new ArrayList< ControlWithIEDName >();
         l2.addAll( lDevice.getLeft().getLN0().getGSEControl() );
         l2.addAll( lDevice.getLeft().getLN0().getSampledValueControl() );
-        
-        List< ControlWithIEDName > res2 =
-                l2
+
+        List< ControlWithIEDName > res2 = l2
                 .stream()
-                .filter(  c -> getCbName().equals(  c.getName() ))
+                .filter( c -> getCbName().equals( c.getName() ) )
                 .collect( Collectors.toList() );
-        
+
         String mess2 = "ControlWithIEDName( name = " + getCbName() + " )";
         if( res2.size() != 1 ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess2, res2.size() );
             return;
         }
-        setRefersToControlWithIEDName( res2.get( 0 ));
-        console.info( "[SCL links] ControlBlock on line ", getLineNumber(), " refers to ", mess2, " on line ", getRefersToControlWithIEDName().getLineNumber() );
+        setRefersToControlWithIEDName( res2.get( 0 ) );
+        console.info( "[SCL links] ControlBlock on line ", getLineNumber(), " refers to ", mess2, " on line ",
+                getRefersToControlWithIEDName().getLineNumber() );
     }
 
 } //ControlBlockImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlImpl.java
index f0faa2e..d32a85d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlImpl.java
@@ -145,7 +145,7 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      * @generated
      * @ordered
      */
-    protected EList<ExtRef> referredByExtRef;
+    protected EList< ExtRef > referredByExtRef;
 
     /**
      * <!-- begin-user-doc -->
@@ -187,8 +187,9 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
         datSet = newDatSet;
         boolean oldDatSetESet = datSetESet;
         datSetESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL__DAT_SET, oldDatSet, datSet, !oldDatSetESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL__DAT_SET, oldDatSet, datSet,
+                    !oldDatSetESet ) );
     }
 
     /**
@@ -202,8 +203,9 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
         boolean oldDatSetESet = datSetESet;
         datSet = DAT_SET_EDEFAULT;
         datSetESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL__DAT_SET, oldDatSet, DAT_SET_EDEFAULT, oldDatSetESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL__DAT_SET, oldDatSet,
+                    DAT_SET_EDEFAULT, oldDatSetESet ) );
     }
 
     /**
@@ -231,14 +233,19 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToDataSet(DataSet newRefersToDataSet, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToDataSet( DataSet newRefersToDataSet, NotificationChain msgs ) {
         DataSet oldRefersToDataSet = refersToDataSet;
         refersToDataSet = newRefersToDataSet;
         boolean oldRefersToDataSetESet = refersToDataSetESet;
         refersToDataSetESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL__REFERS_TO_DATA_SET, oldRefersToDataSet, newRefersToDataSet, !oldRefersToDataSetESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.CONTROL__REFERS_TO_DATA_SET, oldRefersToDataSet, newRefersToDataSet,
+                    !oldRefersToDataSetESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -249,21 +256,24 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      * @generated
      */
     @Override
-    public void setRefersToDataSet(DataSet newRefersToDataSet) {
-        if (newRefersToDataSet != refersToDataSet) {
+    public void setRefersToDataSet( DataSet newRefersToDataSet ) {
+        if( newRefersToDataSet != refersToDataSet ) {
             NotificationChain msgs = null;
-            if (refersToDataSet != null)
-                msgs = ((InternalEObject)refersToDataSet).eInverseRemove(this, SclPackage.DATA_SET__REFERRED_BY_CONTROL, DataSet.class, msgs);
-            if (newRefersToDataSet != null)
-                msgs = ((InternalEObject)newRefersToDataSet).eInverseAdd(this, SclPackage.DATA_SET__REFERRED_BY_CONTROL, DataSet.class, msgs);
-            msgs = basicSetRefersToDataSet(newRefersToDataSet, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToDataSet != null )
+                msgs = ( ( InternalEObject ) refersToDataSet ).eInverseRemove( this,
+                        SclPackage.DATA_SET__REFERRED_BY_CONTROL, DataSet.class, msgs );
+            if( newRefersToDataSet != null )
+                msgs = ( ( InternalEObject ) newRefersToDataSet ).eInverseAdd( this,
+                        SclPackage.DATA_SET__REFERRED_BY_CONTROL, DataSet.class, msgs );
+            msgs = basicSetRefersToDataSet( newRefersToDataSet, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToDataSetESet = refersToDataSetESet;
             refersToDataSetESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL__REFERS_TO_DATA_SET, newRefersToDataSet, newRefersToDataSet, !oldRefersToDataSetESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL__REFERS_TO_DATA_SET,
+                        newRefersToDataSet, newRefersToDataSet, !oldRefersToDataSetESet ) );
         }
     }
 
@@ -272,14 +282,18 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToDataSet(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToDataSet( NotificationChain msgs ) {
         DataSet oldRefersToDataSet = refersToDataSet;
         refersToDataSet = null;
         boolean oldRefersToDataSetESet = refersToDataSetESet;
         refersToDataSetESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL__REFERS_TO_DATA_SET, oldRefersToDataSet, null, oldRefersToDataSetESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.CONTROL__REFERS_TO_DATA_SET, oldRefersToDataSet, null, oldRefersToDataSetESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -291,17 +305,19 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      */
     @Override
     public void unsetRefersToDataSet() {
-        if (refersToDataSet != null) {
+        if( refersToDataSet != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToDataSet).eInverseRemove(this, SclPackage.DATA_SET__REFERRED_BY_CONTROL, DataSet.class, msgs);
-            msgs = basicUnsetRefersToDataSet(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToDataSet ).eInverseRemove( this,
+                    SclPackage.DATA_SET__REFERRED_BY_CONTROL, DataSet.class, msgs );
+            msgs = basicUnsetRefersToDataSet( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToDataSetESet = refersToDataSetESet;
             refersToDataSetESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL__REFERS_TO_DATA_SET, null, null, oldRefersToDataSetESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL__REFERS_TO_DATA_SET, null,
+                        null, oldRefersToDataSetESet ) );
         }
     }
 
@@ -331,13 +347,14 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      * @generated
      */
     @Override
-    public void setName(String newName) {
+    public void setName( String newName ) {
         String oldName = name;
         name = newName;
         boolean oldNameESet = nameESet;
         nameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL__NAME, oldName, name, !oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL__NAME, oldName, name,
+                    !oldNameESet ) );
     }
 
     /**
@@ -351,8 +368,9 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
         boolean oldNameESet = nameESet;
         name = NAME_EDEFAULT;
         nameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL__NAME, oldName, NAME_EDEFAULT, oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL__NAME, oldName, NAME_EDEFAULT,
+                    oldNameESet ) );
     }
 
     /**
@@ -371,9 +389,10 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      * @generated
      */
     @Override
-    public EList<ExtRef> getReferredByExtRef() {
-        if (referredByExtRef == null) {
-            referredByExtRef = new EObjectWithInverseEList.Unsettable<ExtRef>(ExtRef.class, this, SclPackage.CONTROL__REFERRED_BY_EXT_REF, SclPackage.EXT_REF__REFERS_TO_CONTROL);
+    public EList< ExtRef > getReferredByExtRef() {
+        if( referredByExtRef == null ) {
+            referredByExtRef = new EObjectWithInverseEList.Unsettable< ExtRef >( ExtRef.class, this,
+                    SclPackage.CONTROL__REFERRED_BY_EXT_REF, SclPackage.EXT_REF__REFERS_TO_CONTROL );
         }
         return referredByExtRef;
     }
@@ -385,7 +404,7 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      */
     @Override
     public void unsetReferredByExtRef() {
-        if (referredByExtRef != null) ((InternalEList.Unsettable<?>)referredByExtRef).unset();
+        if( referredByExtRef != null ) ( ( InternalEList.Unsettable< ? > ) referredByExtRef ).unset();
     }
 
     /**
@@ -395,7 +414,7 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      */
     @Override
     public boolean isSetReferredByExtRef() {
-        return referredByExtRef != null && ((InternalEList.Unsettable<?>)referredByExtRef).isSet();
+        return referredByExtRef != null && ( ( InternalEList.Unsettable< ? > ) referredByExtRef ).isSet();
     }
 
     /**
@@ -413,18 +432,20 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONTROL__REFERS_TO_DATA_SET:
-                if (refersToDataSet != null)
-                    msgs = ((InternalEObject)refersToDataSet).eInverseRemove(this, SclPackage.DATA_SET__REFERRED_BY_CONTROL, DataSet.class, msgs);
-                return basicSetRefersToDataSet((DataSet)otherEnd, msgs);
-            case SclPackage.CONTROL__REFERRED_BY_EXT_REF:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByExtRef()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONTROL__REFERS_TO_DATA_SET:
+            if( refersToDataSet != null )
+                msgs = ( ( InternalEObject ) refersToDataSet ).eInverseRemove( this,
+                        SclPackage.DATA_SET__REFERRED_BY_CONTROL, DataSet.class, msgs );
+            return basicSetRefersToDataSet( ( DataSet ) otherEnd, msgs );
+        case SclPackage.CONTROL__REFERRED_BY_EXT_REF:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByExtRef() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -434,13 +455,13 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONTROL__REFERS_TO_DATA_SET:
-                return basicUnsetRefersToDataSet(msgs);
-            case SclPackage.CONTROL__REFERRED_BY_EXT_REF:
-                return ((InternalEList<?>)getReferredByExtRef()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONTROL__REFERS_TO_DATA_SET:
+            return basicUnsetRefersToDataSet( msgs );
+        case SclPackage.CONTROL__REFERRED_BY_EXT_REF:
+            return ( ( InternalEList< ? > ) getReferredByExtRef() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -450,17 +471,17 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CONTROL__DAT_SET:
-                return getDatSet();
-            case SclPackage.CONTROL__REFERS_TO_DATA_SET:
-                return getRefersToDataSet();
-            case SclPackage.CONTROL__NAME:
-                return getName();
-            case SclPackage.CONTROL__REFERRED_BY_EXT_REF:
-                return getReferredByExtRef();
+        switch( featureID ) {
+        case SclPackage.CONTROL__DAT_SET:
+            return getDatSet();
+        case SclPackage.CONTROL__REFERS_TO_DATA_SET:
+            return getRefersToDataSet();
+        case SclPackage.CONTROL__NAME:
+            return getName();
+        case SclPackage.CONTROL__REFERRED_BY_EXT_REF:
+            return getReferredByExtRef();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -468,25 +489,25 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CONTROL__DAT_SET:
-                setDatSet((String)newValue);
-                return;
-            case SclPackage.CONTROL__REFERS_TO_DATA_SET:
-                setRefersToDataSet((DataSet)newValue);
-                return;
-            case SclPackage.CONTROL__NAME:
-                setName((String)newValue);
-                return;
-            case SclPackage.CONTROL__REFERRED_BY_EXT_REF:
-                getReferredByExtRef().clear();
-                getReferredByExtRef().addAll((Collection<? extends ExtRef>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONTROL__DAT_SET:
+            setDatSet( ( String ) newValue );
+            return;
+        case SclPackage.CONTROL__REFERS_TO_DATA_SET:
+            setRefersToDataSet( ( DataSet ) newValue );
+            return;
+        case SclPackage.CONTROL__NAME:
+            setName( ( String ) newValue );
+            return;
+        case SclPackage.CONTROL__REFERRED_BY_EXT_REF:
+            getReferredByExtRef().clear();
+            getReferredByExtRef().addAll( ( Collection< ? extends ExtRef > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -496,21 +517,21 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONTROL__DAT_SET:
-                unsetDatSet();
-                return;
-            case SclPackage.CONTROL__REFERS_TO_DATA_SET:
-                unsetRefersToDataSet();
-                return;
-            case SclPackage.CONTROL__NAME:
-                unsetName();
-                return;
-            case SclPackage.CONTROL__REFERRED_BY_EXT_REF:
-                unsetReferredByExtRef();
-                return;
+        switch( featureID ) {
+        case SclPackage.CONTROL__DAT_SET:
+            unsetDatSet();
+            return;
+        case SclPackage.CONTROL__REFERS_TO_DATA_SET:
+            unsetRefersToDataSet();
+            return;
+        case SclPackage.CONTROL__NAME:
+            unsetName();
+            return;
+        case SclPackage.CONTROL__REFERRED_BY_EXT_REF:
+            unsetReferredByExtRef();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -520,17 +541,17 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONTROL__DAT_SET:
-                return isSetDatSet();
-            case SclPackage.CONTROL__REFERS_TO_DATA_SET:
-                return isSetRefersToDataSet();
-            case SclPackage.CONTROL__NAME:
-                return isSetName();
-            case SclPackage.CONTROL__REFERRED_BY_EXT_REF:
-                return isSetReferredByExtRef();
+        switch( featureID ) {
+        case SclPackage.CONTROL__DAT_SET:
+            return isSetDatSet();
+        case SclPackage.CONTROL__REFERS_TO_DATA_SET:
+            return isSetRefersToDataSet();
+        case SclPackage.CONTROL__NAME:
+            return isSetName();
+        case SclPackage.CONTROL__REFERRED_BY_EXT_REF:
+            return isSetReferredByExtRef();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -539,12 +560,12 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      * @generated
      */
     @Override
-    public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-        switch (operationID) {
-            case SclPackage.CONTROL___GET_PARENT_ANY_LN:
-                return getParentAnyLN();
+    public Object eInvoke( int operationID, EList< ? > arguments ) throws InvocationTargetException {
+        switch( operationID ) {
+        case SclPackage.CONTROL___GET_PARENT_ANY_LN:
+            return getParentAnyLN();
         }
-        return super.eInvoke(operationID, arguments);
+        return super.eInvoke( operationID, arguments );
     }
 
     /**
@@ -554,14 +575,20 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (datSet: ");
-        if (datSetESet) result.append(datSet); else result.append("<unset>");
-        result.append(", name: ");
-        if (nameESet) result.append(name); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (datSet: " );
+        if( datSetESet )
+            result.append( datSet );
+        else
+            result.append( "<unset>" );
+        result.append( ", name: " );
+        if( nameESet )
+            result.append( name );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -569,7 +596,7 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         // name    Name of the report control block. This name is relative to the LN hosting the RCB, and shall be unique within the LN
         // desc    The description text 
         // datSet  The name of the data set to be sent by the report control block; datSet should only be missing within an ICD-File,
@@ -577,7 +604,7 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
 
         String messagePrefix = "[SCL links] while resolving link from Control on line " + getLineNumber() + ": ";
 
-        if(( getDatSet() == null ) || getDatSet().isEmpty() ) {
+        if( ( getDatSet() == null ) || getDatSet().isEmpty() ) {
             console.warning( messagePrefix, "datSet is missing" );
             return;
         }
@@ -587,20 +614,20 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
 
         // find an DataSet with
         //   DataSet.name == Control.datSet
-        List< DataSet > res =
-                getParentAnyLN()
+        List< DataSet > res = getParentAnyLN()
                 .getDataSet()
                 .stream()
-                .filter( d -> getDatSet().equals( d.getName() ))
+                .filter( d -> getDatSet().equals( d.getName() ) )
                 .collect( Collectors.toList() );
-        
+
         String mess = "DataSet( name = " + getDatSet() + " )";
         if( res.size() != 1 ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess, res.size() );
             return;
         }
-        setRefersToDataSet( res.get( 0 ));
-        console.info( "[SCL links] Control on line ", getLineNumber(), " refers to ", mess, " on line ", getRefersToDataSet().getLineNumber() );
+        setRefersToDataSet( res.get( 0 ) );
+        console.info( "[SCL links] Control on line ", getLineNumber(), " refers to ", mess, " on line ",
+                getRefersToDataSet().getLineNumber() );
     }
 
 } //ControlImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlWithIEDNameImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlWithIEDNameImpl.java
index 654f3c7..488d73c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlWithIEDNameImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlWithIEDNameImpl.java
@@ -91,7 +91,7 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      * @generated
      * @ordered
      */
-    protected EList<IEDName> iedName;
+    protected EList< IEDName > iedName;
 
     /**
      * The cached value of the '{@link #getReferredByControlBlock() <em>Referred By Control Block</em>}' reference list.
@@ -101,7 +101,7 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      * @generated
      * @ordered
      */
-    protected EList<ControlBlock> referredByControlBlock;
+    protected EList< ControlBlock > referredByControlBlock;
 
     /**
      * The cached value of the '{@link #getProtocol() <em>Protocol</em>}' containment reference.
@@ -162,8 +162,9 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
         confRev = newConfRev;
         boolean oldConfRevESet = confRevESet;
         confRevESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL_WITH_IED_NAME__CONF_REV, oldConfRev, confRev, !oldConfRevESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL_WITH_IED_NAME__CONF_REV,
+                    oldConfRev, confRev, !oldConfRevESet ) );
     }
 
     /**
@@ -177,8 +178,9 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
         boolean oldConfRevESet = confRevESet;
         confRev = CONF_REV_EDEFAULT;
         confRevESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL_WITH_IED_NAME__CONF_REV, oldConfRev, CONF_REV_EDEFAULT, oldConfRevESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL_WITH_IED_NAME__CONF_REV,
+                    oldConfRev, CONF_REV_EDEFAULT, oldConfRevESet ) );
     }
 
     /**
@@ -197,9 +199,10 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      * @generated
      */
     @Override
-    public EList<IEDName> getIEDName() {
-        if (iedName == null) {
-            iedName = new EObjectContainmentWithInverseEList.Unsettable<IEDName>(IEDName.class, this, SclPackage.CONTROL_WITH_IED_NAME__IED_NAME, SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME);
+    public EList< IEDName > getIEDName() {
+        if( iedName == null ) {
+            iedName = new EObjectContainmentWithInverseEList.Unsettable< IEDName >( IEDName.class, this,
+                    SclPackage.CONTROL_WITH_IED_NAME__IED_NAME, SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME );
         }
         return iedName;
     }
@@ -211,7 +214,7 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      */
     @Override
     public void unsetIEDName() {
-        if (iedName != null) ((InternalEList.Unsettable<?>)iedName).unset();
+        if( iedName != null ) ( ( InternalEList.Unsettable< ? > ) iedName ).unset();
     }
 
     /**
@@ -221,7 +224,7 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      */
     @Override
     public boolean isSetIEDName() {
-        return iedName != null && ((InternalEList.Unsettable<?>)iedName).isSet();
+        return iedName != null && ( ( InternalEList.Unsettable< ? > ) iedName ).isSet();
     }
 
     /**
@@ -230,9 +233,11 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      * @generated
      */
     @Override
-    public EList<ControlBlock> getReferredByControlBlock() {
-        if (referredByControlBlock == null) {
-            referredByControlBlock = new EObjectWithInverseEList.Unsettable<ControlBlock>(ControlBlock.class, this, SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK, SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME);
+    public EList< ControlBlock > getReferredByControlBlock() {
+        if( referredByControlBlock == null ) {
+            referredByControlBlock = new EObjectWithInverseEList.Unsettable< ControlBlock >( ControlBlock.class, this,
+                    SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK,
+                    SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME );
         }
         return referredByControlBlock;
     }
@@ -244,7 +249,7 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      */
     @Override
     public void unsetReferredByControlBlock() {
-        if (referredByControlBlock != null) ((InternalEList.Unsettable<?>)referredByControlBlock).unset();
+        if( referredByControlBlock != null ) ( ( InternalEList.Unsettable< ? > ) referredByControlBlock ).unset();
     }
 
     /**
@@ -254,7 +259,7 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      */
     @Override
     public boolean isSetReferredByControlBlock() {
-        return referredByControlBlock != null && ((InternalEList.Unsettable<?>)referredByControlBlock).isSet();
+        return referredByControlBlock != null && ( ( InternalEList.Unsettable< ? > ) referredByControlBlock ).isSet();
     }
 
     /**
@@ -277,9 +282,13 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
         protocol = newProtocol;
         boolean oldProtocolESet = protocolESet;
         protocolESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL, oldProtocol, newProtocol, !oldProtocolESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL, oldProtocol, newProtocol, !oldProtocolESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -291,20 +300,23 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      */
     @Override
     public void setProtocol( Protocol newProtocol ) {
-        if (newProtocol != protocol) {
+        if( newProtocol != protocol ) {
             NotificationChain msgs = null;
-            if (protocol != null)
-                msgs = ((InternalEObject)protocol).eInverseRemove(this, SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME, Protocol.class, msgs);
-            if (newProtocol != null)
-                msgs = ((InternalEObject)newProtocol).eInverseAdd(this, SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME, Protocol.class, msgs);
-            msgs = basicSetProtocol(newProtocol, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( protocol != null )
+                msgs = ( ( InternalEObject ) protocol ).eInverseRemove( this,
+                        SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME, Protocol.class, msgs );
+            if( newProtocol != null )
+                msgs = ( ( InternalEObject ) newProtocol ).eInverseAdd( this,
+                        SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME, Protocol.class, msgs );
+            msgs = basicSetProtocol( newProtocol, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldProtocolESet = protocolESet;
             protocolESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL, newProtocol, newProtocol, !oldProtocolESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL,
+                        newProtocol, newProtocol, !oldProtocolESet ) );
         }
     }
 
@@ -318,9 +330,13 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
         protocol = null;
         boolean oldProtocolESet = protocolESet;
         protocolESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL, oldProtocol, null, oldProtocolESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL, oldProtocol, null, oldProtocolESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -332,17 +348,19 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      */
     @Override
     public void unsetProtocol() {
-        if (protocol != null) {
+        if( protocol != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)protocol).eInverseRemove(this, SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME, Protocol.class, msgs);
-            msgs = basicUnsetProtocol(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) protocol ).eInverseRemove( this,
+                    SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME, Protocol.class, msgs );
+            msgs = basicUnsetProtocol( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldProtocolESet = protocolESet;
             protocolESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL, null, null, oldProtocolESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL,
+                        null, null, oldProtocolESet ) );
         }
     }
 
@@ -364,17 +382,20 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_WITH_IED_NAME__IED_NAME:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getIEDName()).basicAdd(otherEnd, msgs);
-            case SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByControlBlock()).basicAdd(otherEnd, msgs);
-            case SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL:
-                if (protocol != null)
-                    msgs = ((InternalEObject)protocol).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL, null, msgs);
-                return basicSetProtocol((Protocol)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONTROL_WITH_IED_NAME__IED_NAME:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getIEDName() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByControlBlock() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL:
+            if( protocol != null )
+                msgs = ( ( InternalEObject ) protocol ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL, null, msgs );
+            return basicSetProtocol( ( Protocol ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -384,15 +405,15 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_WITH_IED_NAME__IED_NAME:
-                return ((InternalEList<?>)getIEDName()).basicRemove(otherEnd, msgs);
-            case SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK:
-                return ((InternalEList<?>)getReferredByControlBlock()).basicRemove(otherEnd, msgs);
-            case SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL:
-                return basicUnsetProtocol(msgs);
+        switch( featureID ) {
+        case SclPackage.CONTROL_WITH_IED_NAME__IED_NAME:
+            return ( ( InternalEList< ? > ) getIEDName() ).basicRemove( otherEnd, msgs );
+        case SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK:
+            return ( ( InternalEList< ? > ) getReferredByControlBlock() ).basicRemove( otherEnd, msgs );
+        case SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL:
+            return basicUnsetProtocol( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -402,17 +423,17 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_WITH_IED_NAME__CONF_REV:
-                return getConfRev();
-            case SclPackage.CONTROL_WITH_IED_NAME__IED_NAME:
-                return getIEDName();
-            case SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK:
-                return getReferredByControlBlock();
-            case SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL:
-                return getProtocol();
+        switch( featureID ) {
+        case SclPackage.CONTROL_WITH_IED_NAME__CONF_REV:
+            return getConfRev();
+        case SclPackage.CONTROL_WITH_IED_NAME__IED_NAME:
+            return getIEDName();
+        case SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK:
+            return getReferredByControlBlock();
+        case SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL:
+            return getProtocol();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -423,23 +444,23 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_WITH_IED_NAME__CONF_REV:
-                setConfRev((Integer)newValue);
-                return;
-            case SclPackage.CONTROL_WITH_IED_NAME__IED_NAME:
-                getIEDName().clear();
-                getIEDName().addAll((Collection<? extends IEDName>)newValue);
-                return;
-            case SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK:
-                getReferredByControlBlock().clear();
-                getReferredByControlBlock().addAll((Collection<? extends ControlBlock>)newValue);
-                return;
-            case SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL:
-                setProtocol((Protocol)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONTROL_WITH_IED_NAME__CONF_REV:
+            setConfRev( ( Integer ) newValue );
+            return;
+        case SclPackage.CONTROL_WITH_IED_NAME__IED_NAME:
+            getIEDName().clear();
+            getIEDName().addAll( ( Collection< ? extends IEDName > ) newValue );
+            return;
+        case SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK:
+            getReferredByControlBlock().clear();
+            getReferredByControlBlock().addAll( ( Collection< ? extends ControlBlock > ) newValue );
+            return;
+        case SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL:
+            setProtocol( ( Protocol ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -449,21 +470,21 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_WITH_IED_NAME__CONF_REV:
-                unsetConfRev();
-                return;
-            case SclPackage.CONTROL_WITH_IED_NAME__IED_NAME:
-                unsetIEDName();
-                return;
-            case SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK:
-                unsetReferredByControlBlock();
-                return;
-            case SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL:
-                unsetProtocol();
-                return;
+        switch( featureID ) {
+        case SclPackage.CONTROL_WITH_IED_NAME__CONF_REV:
+            unsetConfRev();
+            return;
+        case SclPackage.CONTROL_WITH_IED_NAME__IED_NAME:
+            unsetIEDName();
+            return;
+        case SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK:
+            unsetReferredByControlBlock();
+            return;
+        case SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL:
+            unsetProtocol();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -473,17 +494,17 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_WITH_IED_NAME__CONF_REV:
-                return isSetConfRev();
-            case SclPackage.CONTROL_WITH_IED_NAME__IED_NAME:
-                return isSetIEDName();
-            case SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK:
-                return isSetReferredByControlBlock();
-            case SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL:
-                return isSetProtocol();
+        switch( featureID ) {
+        case SclPackage.CONTROL_WITH_IED_NAME__CONF_REV:
+            return isSetConfRev();
+        case SclPackage.CONTROL_WITH_IED_NAME__IED_NAME:
+            return isSetIEDName();
+        case SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK:
+            return isSetReferredByControlBlock();
+        case SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL:
+            return isSetProtocol();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -493,12 +514,15 @@ public class ControlWithIEDNameImpl extends ControlImpl implements ControlWithIE
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (confRev: ");
-        if (confRevESet) result.append(confRev); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (confRev: " );
+        if( confRevESet )
+            result.append( confRev );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlWithTriggerOptImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlWithTriggerOptImpl.java
index e6de372..ab8bba4 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlWithTriggerOptImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlWithTriggerOptImpl.java
@@ -135,8 +135,9 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C
         intgPd = newIntgPd;
         boolean oldIntgPdESet = intgPdESet;
         intgPdESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL_WITH_TRIGGER_OPT__INTG_PD, oldIntgPd, intgPd, !oldIntgPdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL_WITH_TRIGGER_OPT__INTG_PD,
+                    oldIntgPd, intgPd, !oldIntgPdESet ) );
     }
 
     /**
@@ -150,8 +151,9 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C
         boolean oldIntgPdESet = intgPdESet;
         intgPd = INTG_PD_EDEFAULT;
         intgPdESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL_WITH_TRIGGER_OPT__INTG_PD, oldIntgPd, INTG_PD_EDEFAULT, oldIntgPdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL_WITH_TRIGGER_OPT__INTG_PD,
+                    oldIntgPd, INTG_PD_EDEFAULT, oldIntgPdESet ) );
     }
 
     /**
@@ -184,9 +186,13 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C
         trgOps = newTrgOps;
         boolean oldTrgOpsESet = trgOpsESet;
         trgOpsESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS, oldTrgOps, newTrgOps, !oldTrgOpsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS, oldTrgOps, newTrgOps, !oldTrgOpsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -198,20 +204,23 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C
      */
     @Override
     public void setTrgOps( TrgOps newTrgOps ) {
-        if (newTrgOps != trgOps) {
+        if( newTrgOps != trgOps ) {
             NotificationChain msgs = null;
-            if (trgOps != null)
-                msgs = ((InternalEObject)trgOps).eInverseRemove(this, SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT, TrgOps.class, msgs);
-            if (newTrgOps != null)
-                msgs = ((InternalEObject)newTrgOps).eInverseAdd(this, SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT, TrgOps.class, msgs);
-            msgs = basicSetTrgOps(newTrgOps, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( trgOps != null )
+                msgs = ( ( InternalEObject ) trgOps ).eInverseRemove( this,
+                        SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT, TrgOps.class, msgs );
+            if( newTrgOps != null )
+                msgs = ( ( InternalEObject ) newTrgOps ).eInverseAdd( this,
+                        SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT, TrgOps.class, msgs );
+            msgs = basicSetTrgOps( newTrgOps, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldTrgOpsESet = trgOpsESet;
             trgOpsESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS, newTrgOps, newTrgOps, !oldTrgOpsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS,
+                        newTrgOps, newTrgOps, !oldTrgOpsESet ) );
         }
     }
 
@@ -225,9 +234,13 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C
         trgOps = null;
         boolean oldTrgOpsESet = trgOpsESet;
         trgOpsESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS, oldTrgOps, null, oldTrgOpsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS, oldTrgOps, null, oldTrgOpsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -239,17 +252,19 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C
      */
     @Override
     public void unsetTrgOps() {
-        if (trgOps != null) {
+        if( trgOps != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)trgOps).eInverseRemove(this, SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT, TrgOps.class, msgs);
-            msgs = basicUnsetTrgOps(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) trgOps ).eInverseRemove( this,
+                    SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT, TrgOps.class, msgs );
+            msgs = basicUnsetTrgOps( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldTrgOpsESet = trgOpsESet;
             trgOpsESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS, null, null, oldTrgOpsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS,
+                        null, null, oldTrgOpsESet ) );
         }
     }
 
@@ -270,13 +285,14 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS:
-                if (trgOps != null)
-                    msgs = ((InternalEObject)trgOps).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS, null, msgs);
-                return basicSetTrgOps((TrgOps)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS:
+            if( trgOps != null )
+                msgs = ( ( InternalEObject ) trgOps ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS, null, msgs );
+            return basicSetTrgOps( ( TrgOps ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -286,11 +302,11 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS:
-                return basicUnsetTrgOps(msgs);
+        switch( featureID ) {
+        case SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS:
+            return basicUnsetTrgOps( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -300,13 +316,13 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_WITH_TRIGGER_OPT__INTG_PD:
-                return getIntgPd();
-            case SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS:
-                return getTrgOps();
+        switch( featureID ) {
+        case SclPackage.CONTROL_WITH_TRIGGER_OPT__INTG_PD:
+            return getIntgPd();
+        case SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS:
+            return getTrgOps();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -316,15 +332,15 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_WITH_TRIGGER_OPT__INTG_PD:
-                setIntgPd((Integer)newValue);
-                return;
-            case SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS:
-                setTrgOps((TrgOps)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.CONTROL_WITH_TRIGGER_OPT__INTG_PD:
+            setIntgPd( ( Integer ) newValue );
+            return;
+        case SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS:
+            setTrgOps( ( TrgOps ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -334,15 +350,15 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_WITH_TRIGGER_OPT__INTG_PD:
-                unsetIntgPd();
-                return;
-            case SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS:
-                unsetTrgOps();
-                return;
+        switch( featureID ) {
+        case SclPackage.CONTROL_WITH_TRIGGER_OPT__INTG_PD:
+            unsetIntgPd();
+            return;
+        case SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS:
+            unsetTrgOps();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -352,13 +368,13 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.CONTROL_WITH_TRIGGER_OPT__INTG_PD:
-                return isSetIntgPd();
-            case SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS:
-                return isSetTrgOps();
+        switch( featureID ) {
+        case SclPackage.CONTROL_WITH_TRIGGER_OPT__INTG_PD:
+            return isSetIntgPd();
+        case SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS:
+            return isSetTrgOps();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -368,12 +384,15 @@ public abstract class ControlWithTriggerOptImpl extends ControlImpl implements C
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (intgPd: ");
-        if (intgPdESet) result.append(intgPd); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (intgPd: " );
+        if( intgPdESet )
+            result.append( intgPd );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DAIImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DAIImpl.java
index 2d7c23b..ca512f3 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DAIImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DAIImpl.java
@@ -196,7 +196,7 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      * @generated
      * @ordered
      */
-    protected EList<Val> val;
+    protected EList< Val > val;
 
     /**
      * The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -286,8 +286,8 @@ public class DAIImpl extends UnNamingImpl implements DAI {
         ix = newIx;
         boolean oldIxESet = ixESet;
         ixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DAI__IX, oldIx, ix, !oldIxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__IX, oldIx, ix, !oldIxESet ) );
     }
 
     /**
@@ -301,8 +301,9 @@ public class DAIImpl extends UnNamingImpl implements DAI {
         boolean oldIxESet = ixESet;
         ix = IX_EDEFAULT;
         ixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DAI__IX, oldIx, IX_EDEFAULT, oldIxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DAI__IX, oldIx, IX_EDEFAULT,
+                    oldIxESet ) );
     }
 
     /**
@@ -336,8 +337,9 @@ public class DAIImpl extends UnNamingImpl implements DAI {
         sAddr = newSAddr;
         boolean oldSAddrESet = sAddrESet;
         sAddrESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DAI__SADDR, oldSAddr, sAddr, !oldSAddrESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__SADDR, oldSAddr, sAddr,
+                    !oldSAddrESet ) );
     }
 
     /**
@@ -351,8 +353,9 @@ public class DAIImpl extends UnNamingImpl implements DAI {
         boolean oldSAddrESet = sAddrESet;
         sAddr = SADDR_EDEFAULT;
         sAddrESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DAI__SADDR, oldSAddr, SADDR_EDEFAULT, oldSAddrESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DAI__SADDR, oldSAddr, SADDR_EDEFAULT,
+                    oldSAddrESet ) );
     }
 
     /**
@@ -386,8 +389,9 @@ public class DAIImpl extends UnNamingImpl implements DAI {
         valImport = newValImport;
         boolean oldValImportESet = valImportESet;
         valImportESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DAI__VAL_IMPORT, oldValImport, valImport, !oldValImportESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__VAL_IMPORT, oldValImport, valImport,
+                    !oldValImportESet ) );
     }
 
     /**
@@ -401,8 +405,9 @@ public class DAIImpl extends UnNamingImpl implements DAI {
         boolean oldValImportESet = valImportESet;
         valImport = VAL_IMPORT_EDEFAULT;
         valImportESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DAI__VAL_IMPORT, oldValImport, VAL_IMPORT_EDEFAULT, oldValImportESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DAI__VAL_IMPORT, oldValImport,
+                    VAL_IMPORT_EDEFAULT, oldValImportESet ) );
     }
 
     /**
@@ -436,8 +441,9 @@ public class DAIImpl extends UnNamingImpl implements DAI {
         valKind = newValKind == null ? VAL_KIND_EDEFAULT : newValKind;
         boolean oldValKindESet = valKindESet;
         valKindESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DAI__VAL_KIND, oldValKind, valKind, !oldValKindESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__VAL_KIND, oldValKind, valKind,
+                    !oldValKindESet ) );
     }
 
     /**
@@ -451,8 +457,9 @@ public class DAIImpl extends UnNamingImpl implements DAI {
         boolean oldValKindESet = valKindESet;
         valKind = VAL_KIND_EDEFAULT;
         valKindESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DAI__VAL_KIND, oldValKind, VAL_KIND_EDEFAULT, oldValKindESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DAI__VAL_KIND, oldValKind,
+                    VAL_KIND_EDEFAULT, oldValKindESet ) );
     }
 
     /**
@@ -471,9 +478,10 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      * @generated
      */
     @Override
-    public EList<Val> getVal() {
-        if (val == null) {
-            val = new EObjectContainmentWithInverseEList.Unsettable<Val>(Val.class, this, SclPackage.DAI__VAL, SclPackage.VAL__PARENT_DAI);
+    public EList< Val > getVal() {
+        if( val == null ) {
+            val = new EObjectContainmentWithInverseEList.Unsettable< Val >( Val.class, this, SclPackage.DAI__VAL,
+                    SclPackage.VAL__PARENT_DAI );
         }
         return val;
     }
@@ -485,7 +493,7 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      */
     @Override
     public void unsetVal() {
-        if (val != null) ((InternalEList.Unsettable<?>)val).unset();
+        if( val != null ) ( ( InternalEList.Unsettable< ? > ) val ).unset();
     }
 
     /**
@@ -495,7 +503,7 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      */
     @Override
     public boolean isSetVal() {
-        return val != null && ((InternalEList.Unsettable<?>)val).isSet();
+        return val != null && ( ( InternalEList.Unsettable< ? > ) val ).isSet();
     }
 
     /**
@@ -505,8 +513,8 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      */
     @Override
     public DOI getParentDOI() {
-        if (eContainerFeatureID() != SclPackage.DAI__PARENT_DOI) return null;
-        return (DOI)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.DAI__PARENT_DOI ) return null;
+        return ( DOI ) eInternalContainer();
     }
 
     /**
@@ -514,8 +522,8 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentDOI(DOI newParentDOI, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentDOI, SclPackage.DAI__PARENT_DOI, msgs);
+    public NotificationChain basicSetParentDOI( DOI newParentDOI, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentDOI, SclPackage.DAI__PARENT_DOI, msgs );
         return msgs;
     }
 
@@ -525,20 +533,22 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      * @generated
      */
     @Override
-    public void setParentDOI(DOI newParentDOI) {
-        if (newParentDOI != eInternalContainer() || (eContainerFeatureID() != SclPackage.DAI__PARENT_DOI && newParentDOI != null)) {
-            if (EcoreUtil.isAncestor(this, newParentDOI))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentDOI( DOI newParentDOI ) {
+        if( newParentDOI != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.DAI__PARENT_DOI && newParentDOI != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentDOI ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentDOI != null)
-                msgs = ((InternalEObject)newParentDOI).eInverseAdd(this, SclPackage.DOI__DAI, DOI.class, msgs);
-            msgs = basicSetParentDOI(newParentDOI, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentDOI != null )
+                msgs = ( ( InternalEObject ) newParentDOI ).eInverseAdd( this, SclPackage.DOI__DAI, DOI.class, msgs );
+            msgs = basicSetParentDOI( newParentDOI, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DAI__PARENT_DOI, newParentDOI, newParentDOI));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__PARENT_DOI, newParentDOI,
+                    newParentDOI ) );
     }
 
     /**
@@ -548,8 +558,8 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      */
     @Override
     public SDI getParentSDI() {
-        if (eContainerFeatureID() != SclPackage.DAI__PARENT_SDI) return null;
-        return (SDI)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.DAI__PARENT_SDI ) return null;
+        return ( SDI ) eInternalContainer();
     }
 
     /**
@@ -557,8 +567,8 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSDI(SDI newParentSDI, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSDI, SclPackage.DAI__PARENT_SDI, msgs);
+    public NotificationChain basicSetParentSDI( SDI newParentSDI, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSDI, SclPackage.DAI__PARENT_SDI, msgs );
         return msgs;
     }
 
@@ -568,20 +578,22 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      * @generated
      */
     @Override
-    public void setParentSDI(SDI newParentSDI) {
-        if (newParentSDI != eInternalContainer() || (eContainerFeatureID() != SclPackage.DAI__PARENT_SDI && newParentSDI != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSDI))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSDI( SDI newParentSDI ) {
+        if( newParentSDI != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.DAI__PARENT_SDI && newParentSDI != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSDI ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSDI != null)
-                msgs = ((InternalEObject)newParentSDI).eInverseAdd(this, SclPackage.SDI__DAI, SDI.class, msgs);
-            msgs = basicSetParentSDI(newParentSDI, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSDI != null )
+                msgs = ( ( InternalEObject ) newParentSDI ).eInverseAdd( this, SclPackage.SDI__DAI, SDI.class, msgs );
+            msgs = basicSetParentSDI( newParentSDI, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DAI__PARENT_SDI, newParentSDI, newParentSDI));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__PARENT_SDI, newParentSDI,
+                    newParentSDI ) );
     }
 
     /**
@@ -600,13 +612,14 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      * @generated
      */
     @Override
-    public void setName(String newName) {
+    public void setName( String newName ) {
         String oldName = name;
         name = newName;
         boolean oldNameESet = nameESet;
         nameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DAI__NAME, oldName, name, !oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__NAME, oldName, name,
+                    !oldNameESet ) );
     }
 
     /**
@@ -620,8 +633,9 @@ public class DAIImpl extends UnNamingImpl implements DAI {
         boolean oldNameESet = nameESet;
         name = NAME_EDEFAULT;
         nameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DAI__NAME, oldName, NAME_EDEFAULT, oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DAI__NAME, oldName, NAME_EDEFAULT,
+                    oldNameESet ) );
     }
 
     /**
@@ -649,14 +663,20 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToAbstractDataAttribute(AbstractDataAttribute newRefersToAbstractDataAttribute, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToAbstractDataAttribute(
+            AbstractDataAttribute newRefersToAbstractDataAttribute, NotificationChain msgs ) {
         AbstractDataAttribute oldRefersToAbstractDataAttribute = refersToAbstractDataAttribute;
         refersToAbstractDataAttribute = newRefersToAbstractDataAttribute;
         boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet;
         refersToAbstractDataAttributeESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute, newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute,
+                    newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -667,21 +687,25 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      * @generated
      */
     @Override
-    public void setRefersToAbstractDataAttribute(AbstractDataAttribute newRefersToAbstractDataAttribute) {
-        if (newRefersToAbstractDataAttribute != refersToAbstractDataAttribute) {
+    public void setRefersToAbstractDataAttribute( AbstractDataAttribute newRefersToAbstractDataAttribute ) {
+        if( newRefersToAbstractDataAttribute != refersToAbstractDataAttribute ) {
             NotificationChain msgs = null;
-            if (refersToAbstractDataAttribute != null)
-                msgs = ((InternalEObject)refersToAbstractDataAttribute).eInverseRemove(this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI, AbstractDataAttribute.class, msgs);
-            if (newRefersToAbstractDataAttribute != null)
-                msgs = ((InternalEObject)newRefersToAbstractDataAttribute).eInverseAdd(this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI, AbstractDataAttribute.class, msgs);
-            msgs = basicSetRefersToAbstractDataAttribute(newRefersToAbstractDataAttribute, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToAbstractDataAttribute != null )
+                msgs = ( ( InternalEObject ) refersToAbstractDataAttribute ).eInverseRemove( this,
+                        SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI, AbstractDataAttribute.class, msgs );
+            if( newRefersToAbstractDataAttribute != null )
+                msgs = ( ( InternalEObject ) newRefersToAbstractDataAttribute ).eInverseAdd( this,
+                        SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI, AbstractDataAttribute.class, msgs );
+            msgs = basicSetRefersToAbstractDataAttribute( newRefersToAbstractDataAttribute, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet;
             refersToAbstractDataAttributeESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, newRefersToAbstractDataAttribute, newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET,
+                        SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, newRefersToAbstractDataAttribute,
+                        newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet ) );
         }
     }
 
@@ -690,14 +714,19 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToAbstractDataAttribute(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToAbstractDataAttribute( NotificationChain msgs ) {
         AbstractDataAttribute oldRefersToAbstractDataAttribute = refersToAbstractDataAttribute;
         refersToAbstractDataAttribute = null;
         boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet;
         refersToAbstractDataAttributeESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute, null, oldRefersToAbstractDataAttributeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute, null,
+                    oldRefersToAbstractDataAttributeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -709,17 +738,20 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      */
     @Override
     public void unsetRefersToAbstractDataAttribute() {
-        if (refersToAbstractDataAttribute != null) {
+        if( refersToAbstractDataAttribute != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToAbstractDataAttribute).eInverseRemove(this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI, AbstractDataAttribute.class, msgs);
-            msgs = basicUnsetRefersToAbstractDataAttribute(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToAbstractDataAttribute ).eInverseRemove( this,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI, AbstractDataAttribute.class, msgs );
+            msgs = basicUnsetRefersToAbstractDataAttribute( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet;
             refersToAbstractDataAttributeESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, null, null, oldRefersToAbstractDataAttributeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET,
+                        SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, null, null,
+                        oldRefersToAbstractDataAttributeESet ) );
         }
     }
 
@@ -741,23 +773,24 @@ public class DAIImpl extends UnNamingImpl implements DAI {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DAI__VAL:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getVal()).basicAdd(otherEnd, msgs);
-            case SclPackage.DAI__PARENT_DOI:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentDOI((DOI)otherEnd, msgs);
-            case SclPackage.DAI__PARENT_SDI:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSDI((SDI)otherEnd, msgs);
-            case SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                if (refersToAbstractDataAttribute != null)
-                    msgs = ((InternalEObject)refersToAbstractDataAttribute).eInverseRemove(this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI, AbstractDataAttribute.class, msgs);
-                return basicSetRefersToAbstractDataAttribute((AbstractDataAttribute)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DAI__VAL:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getVal() ).basicAdd( otherEnd, msgs );
+        case SclPackage.DAI__PARENT_DOI:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentDOI( ( DOI ) otherEnd, msgs );
+        case SclPackage.DAI__PARENT_SDI:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSDI( ( SDI ) otherEnd, msgs );
+        case SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            if( refersToAbstractDataAttribute != null )
+                msgs = ( ( InternalEObject ) refersToAbstractDataAttribute ).eInverseRemove( this,
+                        SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI, AbstractDataAttribute.class, msgs );
+            return basicSetRefersToAbstractDataAttribute( ( AbstractDataAttribute ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -767,17 +800,17 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DAI__VAL:
-                return ((InternalEList<?>)getVal()).basicRemove(otherEnd, msgs);
-            case SclPackage.DAI__PARENT_DOI:
-                return basicSetParentDOI(null, msgs);
-            case SclPackage.DAI__PARENT_SDI:
-                return basicSetParentSDI(null, msgs);
-            case SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                return basicUnsetRefersToAbstractDataAttribute(msgs);
+        switch( featureID ) {
+        case SclPackage.DAI__VAL:
+            return ( ( InternalEList< ? > ) getVal() ).basicRemove( otherEnd, msgs );
+        case SclPackage.DAI__PARENT_DOI:
+            return basicSetParentDOI( null, msgs );
+        case SclPackage.DAI__PARENT_SDI:
+            return basicSetParentSDI( null, msgs );
+        case SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            return basicUnsetRefersToAbstractDataAttribute( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -787,13 +820,13 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.DAI__PARENT_DOI:
-                return eInternalContainer().eInverseRemove(this, SclPackage.DOI__DAI, DOI.class, msgs);
-            case SclPackage.DAI__PARENT_SDI:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SDI__DAI, SDI.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.DAI__PARENT_DOI:
+            return eInternalContainer().eInverseRemove( this, SclPackage.DOI__DAI, DOI.class, msgs );
+        case SclPackage.DAI__PARENT_SDI:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SDI__DAI, SDI.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -803,27 +836,27 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.DAI__IX:
-                return getIx();
-            case SclPackage.DAI__SADDR:
-                return getSAddr();
-            case SclPackage.DAI__VAL_IMPORT:
-                return getValImport();
-            case SclPackage.DAI__VAL_KIND:
-                return getValKind();
-            case SclPackage.DAI__VAL:
-                return getVal();
-            case SclPackage.DAI__PARENT_DOI:
-                return getParentDOI();
-            case SclPackage.DAI__PARENT_SDI:
-                return getParentSDI();
-            case SclPackage.DAI__NAME:
-                return getName();
-            case SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                return getRefersToAbstractDataAttribute();
+        switch( featureID ) {
+        case SclPackage.DAI__IX:
+            return getIx();
+        case SclPackage.DAI__SADDR:
+            return getSAddr();
+        case SclPackage.DAI__VAL_IMPORT:
+            return getValImport();
+        case SclPackage.DAI__VAL_KIND:
+            return getValKind();
+        case SclPackage.DAI__VAL:
+            return getVal();
+        case SclPackage.DAI__PARENT_DOI:
+            return getParentDOI();
+        case SclPackage.DAI__PARENT_SDI:
+            return getParentSDI();
+        case SclPackage.DAI__NAME:
+            return getName();
+        case SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            return getRefersToAbstractDataAttribute();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -834,37 +867,37 @@ public class DAIImpl extends UnNamingImpl implements DAI {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.DAI__IX:
-                setIx((Integer)newValue);
-                return;
-            case SclPackage.DAI__SADDR:
-                setSAddr((String)newValue);
-                return;
-            case SclPackage.DAI__VAL_IMPORT:
-                setValImport((Boolean)newValue);
-                return;
-            case SclPackage.DAI__VAL_KIND:
-                setValKind((ValKindEnum)newValue);
-                return;
-            case SclPackage.DAI__VAL:
-                getVal().clear();
-                getVal().addAll((Collection<? extends Val>)newValue);
-                return;
-            case SclPackage.DAI__PARENT_DOI:
-                setParentDOI((DOI)newValue);
-                return;
-            case SclPackage.DAI__PARENT_SDI:
-                setParentSDI((SDI)newValue);
-                return;
-            case SclPackage.DAI__NAME:
-                setName((String)newValue);
-                return;
-            case SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                setRefersToAbstractDataAttribute((AbstractDataAttribute)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.DAI__IX:
+            setIx( ( Integer ) newValue );
+            return;
+        case SclPackage.DAI__SADDR:
+            setSAddr( ( String ) newValue );
+            return;
+        case SclPackage.DAI__VAL_IMPORT:
+            setValImport( ( Boolean ) newValue );
+            return;
+        case SclPackage.DAI__VAL_KIND:
+            setValKind( ( ValKindEnum ) newValue );
+            return;
+        case SclPackage.DAI__VAL:
+            getVal().clear();
+            getVal().addAll( ( Collection< ? extends Val > ) newValue );
+            return;
+        case SclPackage.DAI__PARENT_DOI:
+            setParentDOI( ( DOI ) newValue );
+            return;
+        case SclPackage.DAI__PARENT_SDI:
+            setParentSDI( ( SDI ) newValue );
+            return;
+        case SclPackage.DAI__NAME:
+            setName( ( String ) newValue );
+            return;
+        case SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            setRefersToAbstractDataAttribute( ( AbstractDataAttribute ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -874,36 +907,36 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DAI__IX:
-                unsetIx();
-                return;
-            case SclPackage.DAI__SADDR:
-                unsetSAddr();
-                return;
-            case SclPackage.DAI__VAL_IMPORT:
-                unsetValImport();
-                return;
-            case SclPackage.DAI__VAL_KIND:
-                unsetValKind();
-                return;
-            case SclPackage.DAI__VAL:
-                unsetVal();
-                return;
-            case SclPackage.DAI__PARENT_DOI:
-                setParentDOI((DOI)null);
-                return;
-            case SclPackage.DAI__PARENT_SDI:
-                setParentSDI((SDI)null);
-                return;
-            case SclPackage.DAI__NAME:
-                unsetName();
-                return;
-            case SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                unsetRefersToAbstractDataAttribute();
-                return;
+        switch( featureID ) {
+        case SclPackage.DAI__IX:
+            unsetIx();
+            return;
+        case SclPackage.DAI__SADDR:
+            unsetSAddr();
+            return;
+        case SclPackage.DAI__VAL_IMPORT:
+            unsetValImport();
+            return;
+        case SclPackage.DAI__VAL_KIND:
+            unsetValKind();
+            return;
+        case SclPackage.DAI__VAL:
+            unsetVal();
+            return;
+        case SclPackage.DAI__PARENT_DOI:
+            setParentDOI( ( DOI ) null );
+            return;
+        case SclPackage.DAI__PARENT_SDI:
+            setParentSDI( ( SDI ) null );
+            return;
+        case SclPackage.DAI__NAME:
+            unsetName();
+            return;
+        case SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            unsetRefersToAbstractDataAttribute();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -913,27 +946,27 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DAI__IX:
-                return isSetIx();
-            case SclPackage.DAI__SADDR:
-                return isSetSAddr();
-            case SclPackage.DAI__VAL_IMPORT:
-                return isSetValImport();
-            case SclPackage.DAI__VAL_KIND:
-                return isSetValKind();
-            case SclPackage.DAI__VAL:
-                return isSetVal();
-            case SclPackage.DAI__PARENT_DOI:
-                return getParentDOI() != null;
-            case SclPackage.DAI__PARENT_SDI:
-                return getParentSDI() != null;
-            case SclPackage.DAI__NAME:
-                return isSetName();
-            case SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                return isSetRefersToAbstractDataAttribute();
+        switch( featureID ) {
+        case SclPackage.DAI__IX:
+            return isSetIx();
+        case SclPackage.DAI__SADDR:
+            return isSetSAddr();
+        case SclPackage.DAI__VAL_IMPORT:
+            return isSetValImport();
+        case SclPackage.DAI__VAL_KIND:
+            return isSetValKind();
+        case SclPackage.DAI__VAL:
+            return isSetVal();
+        case SclPackage.DAI__PARENT_DOI:
+            return getParentDOI() != null;
+        case SclPackage.DAI__PARENT_SDI:
+            return getParentSDI() != null;
+        case SclPackage.DAI__NAME:
+            return isSetName();
+        case SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            return isSetRefersToAbstractDataAttribute();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -943,20 +976,35 @@ public class DAIImpl extends UnNamingImpl implements DAI {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (ix: ");
-        if (ixESet) result.append(ix); else result.append("<unset>");
-        result.append(", sAddr: ");
-        if (sAddrESet) result.append(sAddr); else result.append("<unset>");
-        result.append(", valImport: ");
-        if (valImportESet) result.append(valImport); else result.append("<unset>");
-        result.append(", valKind: ");
-        if (valKindESet) result.append(valKind); else result.append("<unset>");
-        result.append(", name: ");
-        if (nameESet) result.append(name); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (ix: " );
+        if( ixESet )
+            result.append( ix );
+        else
+            result.append( "<unset>" );
+        result.append( ", sAddr: " );
+        if( sAddrESet )
+            result.append( sAddr );
+        else
+            result.append( "<unset>" );
+        result.append( ", valImport: " );
+        if( valImportESet )
+            result.append( valImport );
+        else
+            result.append( "<unset>" );
+        result.append( ", valKind: " );
+        if( valKindESet )
+            result.append( valKind );
+        else
+            result.append( "<unset>" );
+        result.append( ", name: " );
+        if( nameESet )
+            result.append( name );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -964,14 +1012,14 @@ public class DAIImpl extends UnNamingImpl implements DAI {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         String messagePrefix = "[SCL links] while resolving link from DAI on line " + getLineNumber() + ": ";
-        
-        if(( getName() == null ) || getName().isEmpty() ) {
+
+        if( ( getName() == null ) || getName().isEmpty() ) {
             console.warning( messagePrefix, "name is missing" );
             return;
         }
-        
+
         if( getParentDOI() != null ) {
             doBuildExplicitLinkWithParentDOI( console, messagePrefix );
         }
@@ -982,7 +1030,7 @@ public class DAIImpl extends UnNamingImpl implements DAI {
             // Unexpected
         }
     }
-        
+
     private void doBuildExplicitLinkWithParentDOI( IRiseClipseConsole console, String messagePrefix ) {
         // No error or warning messages here: if this happens, error should have been detected before
         DO do_ = getParentDOI().getRefersToDO();
@@ -994,12 +1042,11 @@ public class DAIImpl extends UnNamingImpl implements DAI {
         // No error or warning message here: if this happens, error should have been detected before
         if( dot == null ) return;
         console.verbose( messagePrefix, "found DOType on line ", dot.getLineNumber() );
-        
-        List< DA > res =
-                dot
+
+        List< DA > res = dot
                 .getDA()
                 .stream()
-                .filter( d -> getName().equals( d.getName() ))
+                .filter( d -> getName().equals( d.getName() ) )
                 .collect( Collectors.toList() );
 
         String mess = "DA( name = " + getName() + " )";
@@ -1008,26 +1055,26 @@ public class DAIImpl extends UnNamingImpl implements DAI {
             return;
         }
         setRefersToAbstractDataAttribute( res.get( 0 ) );
-        console.info( "[SCL links] DAI on line ", getLineNumber(), " refers to ", mess, " on line ", getRefersToAbstractDataAttribute().getLineNumber() );
+        console.info( "[SCL links] DAI on line ", getLineNumber(), " refers to ", mess, " on line ",
+                getRefersToAbstractDataAttribute().getLineNumber() );
     }
-        
+
     private void doBuildExplicitLinkWithParentSDI( IRiseClipseConsole console, String messagePrefix ) {
         // No error or warning messages here: if this happens, error should have been detected before
         AbstractDataAttribute att = getParentSDI().getRefersToAbstractDataAttribute();
         if( att == null ) return;
         att.buildExplicitLinks( console, false );
         console.verbose( messagePrefix, "found AbstractDataAttribute on line ", att.getLineNumber() );
-        
+
         DAType dat = att.getRefersToDAType();
         // No error or warning message here: if this happens, error should have been detected before
         if( dat == null ) return;
         console.verbose( messagePrefix, "found DAType on line ", dat.getLineNumber() );
-        
-        List< BDA > res =
-                dat
+
+        List< BDA > res = dat
                 .getBDA()
                 .stream()
-                .filter( b -> getName().equals( b.getName() ))
+                .filter( b -> getName().equals( b.getName() ) )
                 .collect( Collectors.toList() );
 
         String mess = "BDA( name = " + getName() + " )";
@@ -1035,8 +1082,9 @@ public class DAIImpl extends UnNamingImpl implements DAI {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess, res.size() );
             return;
         }
-        setRefersToAbstractDataAttribute( res.get( 0 ));
-        console.info( "[SCL links] DAI on line ", getLineNumber(), " refers to ", mess, " on line ", getRefersToAbstractDataAttribute().getLineNumber() );
+        setRefersToAbstractDataAttribute( res.get( 0 ) );
+        console.info( "[SCL links] DAI on line ", getLineNumber(), " refers to ", mess, " on line ",
+                getRefersToAbstractDataAttribute().getLineNumber() );
     }
 
 } //DAIImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DAImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DAImpl.java
index 2ee5deb..5a10ba9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DAImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DAImpl.java
@@ -180,7 +180,7 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      * @generated
      * @ordered
      */
-    protected EList<ProtNs> protNs;
+    protected EList< ProtNs > protNs;
 
     /**
      * <!-- begin-user-doc -->
@@ -222,8 +222,9 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
         dchg = newDchg;
         boolean oldDchgESet = dchgESet;
         dchgESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DA__DCHG, oldDchg, dchg, !oldDchgESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DA__DCHG, oldDchg, dchg,
+                    !oldDchgESet ) );
     }
 
     /**
@@ -237,8 +238,9 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
         boolean oldDchgESet = dchgESet;
         dchg = DCHG_EDEFAULT;
         dchgESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DA__DCHG, oldDchg, DCHG_EDEFAULT, oldDchgESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DA__DCHG, oldDchg, DCHG_EDEFAULT,
+                    oldDchgESet ) );
     }
 
     /**
@@ -272,8 +274,9 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
         dupd = newDupd;
         boolean oldDupdESet = dupdESet;
         dupdESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DA__DUPD, oldDupd, dupd, !oldDupdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DA__DUPD, oldDupd, dupd,
+                    !oldDupdESet ) );
     }
 
     /**
@@ -287,8 +290,9 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
         boolean oldDupdESet = dupdESet;
         dupd = DUPD_EDEFAULT;
         dupdESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DA__DUPD, oldDupd, DUPD_EDEFAULT, oldDupdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DA__DUPD, oldDupd, DUPD_EDEFAULT,
+                    oldDupdESet ) );
     }
 
     /**
@@ -322,8 +326,8 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
         fc = newFc == null ? FC_EDEFAULT : newFc;
         boolean oldFcESet = fcESet;
         fcESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DA__FC, oldFc, fc, !oldFcESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DA__FC, oldFc, fc, !oldFcESet ) );
     }
 
     /**
@@ -337,8 +341,9 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
         boolean oldFcESet = fcESet;
         fc = FC_EDEFAULT;
         fcESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DA__FC, oldFc, FC_EDEFAULT, oldFcESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DA__FC, oldFc, FC_EDEFAULT,
+                    oldFcESet ) );
     }
 
     /**
@@ -358,8 +363,8 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      */
     @Override
     public DOType getParentDOType() {
-        if (eContainerFeatureID() != SclPackage.DA__PARENT_DO_TYPE) return null;
-        return (DOType)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.DA__PARENT_DO_TYPE ) return null;
+        return ( DOType ) eInternalContainer();
     }
 
     /**
@@ -367,8 +372,8 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentDOType(DOType newParentDOType, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentDOType, SclPackage.DA__PARENT_DO_TYPE, msgs);
+    public NotificationChain basicSetParentDOType( DOType newParentDOType, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentDOType, SclPackage.DA__PARENT_DO_TYPE, msgs );
         return msgs;
     }
 
@@ -378,20 +383,23 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      * @generated
      */
     @Override
-    public void setParentDOType(DOType newParentDOType) {
-        if (newParentDOType != eInternalContainer() || (eContainerFeatureID() != SclPackage.DA__PARENT_DO_TYPE && newParentDOType != null)) {
-            if (EcoreUtil.isAncestor(this, newParentDOType))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentDOType( DOType newParentDOType ) {
+        if( newParentDOType != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.DA__PARENT_DO_TYPE && newParentDOType != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentDOType ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentDOType != null)
-                msgs = ((InternalEObject)newParentDOType).eInverseAdd(this, SclPackage.DO_TYPE__DA, DOType.class, msgs);
-            msgs = basicSetParentDOType(newParentDOType, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentDOType != null )
+                msgs = ( ( InternalEObject ) newParentDOType ).eInverseAdd( this, SclPackage.DO_TYPE__DA, DOType.class,
+                        msgs );
+            msgs = basicSetParentDOType( newParentDOType, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DA__PARENT_DO_TYPE, newParentDOType, newParentDOType));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DA__PARENT_DO_TYPE, newParentDOType,
+                    newParentDOType ) );
     }
 
     /**
@@ -415,8 +423,9 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
         qchg = newQchg;
         boolean oldQchgESet = qchgESet;
         qchgESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DA__QCHG, oldQchg, qchg, !oldQchgESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DA__QCHG, oldQchg, qchg,
+                    !oldQchgESet ) );
     }
 
     /**
@@ -430,8 +439,9 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
         boolean oldQchgESet = qchgESet;
         qchg = QCHG_EDEFAULT;
         qchgESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DA__QCHG, oldQchg, QCHG_EDEFAULT, oldQchgESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DA__QCHG, oldQchg, QCHG_EDEFAULT,
+                    oldQchgESet ) );
     }
 
     /**
@@ -444,6 +454,7 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
         return qchgESet;
     }
 
+    @Override
     public boolean isSetType() {
         return isSetRefersToDAType();
     }
@@ -454,9 +465,10 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      * @generated
      */
     @Override
-    public EList<ProtNs> getProtNs() {
-        if (protNs == null) {
-            protNs = new EObjectContainmentWithInverseEList.Unsettable<ProtNs>(ProtNs.class, this, SclPackage.DA__PROT_NS, SclPackage.PROT_NS__PARENT_DA);
+    public EList< ProtNs > getProtNs() {
+        if( protNs == null ) {
+            protNs = new EObjectContainmentWithInverseEList.Unsettable< ProtNs >( ProtNs.class, this,
+                    SclPackage.DA__PROT_NS, SclPackage.PROT_NS__PARENT_DA );
         }
         return protNs;
     }
@@ -468,7 +480,7 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      */
     @Override
     public void unsetProtNs() {
-        if (protNs != null) ((InternalEList.Unsettable<?>)protNs).unset();
+        if( protNs != null ) ( ( InternalEList.Unsettable< ? > ) protNs ).unset();
     }
 
     /**
@@ -478,7 +490,7 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      */
     @Override
     public boolean isSetProtNs() {
-        return protNs != null && ((InternalEList.Unsettable<?>)protNs).isSet();
+        return protNs != null && ( ( InternalEList.Unsettable< ? > ) protNs ).isSet();
     }
 
     /**
@@ -489,15 +501,16 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DA__PARENT_DO_TYPE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentDOType((DOType)otherEnd, msgs);
-            case SclPackage.DA__PROT_NS:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getProtNs()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DA__PARENT_DO_TYPE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentDOType( ( DOType ) otherEnd, msgs );
+        case SclPackage.DA__PROT_NS:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getProtNs() ).basicAdd( otherEnd,
+                    msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -507,13 +520,13 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DA__PARENT_DO_TYPE:
-                return basicSetParentDOType(null, msgs);
-            case SclPackage.DA__PROT_NS:
-                return ((InternalEList<?>)getProtNs()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DA__PARENT_DO_TYPE:
+            return basicSetParentDOType( null, msgs );
+        case SclPackage.DA__PROT_NS:
+            return ( ( InternalEList< ? > ) getProtNs() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -523,11 +536,11 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.DA__PARENT_DO_TYPE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.DO_TYPE__DA, DOType.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.DA__PARENT_DO_TYPE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.DO_TYPE__DA, DOType.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -537,21 +550,21 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.DA__DCHG:
-                return getDchg();
-            case SclPackage.DA__DUPD:
-                return getDupd();
-            case SclPackage.DA__QCHG:
-                return getQchg();
-            case SclPackage.DA__FC:
-                return getFc();
-            case SclPackage.DA__PARENT_DO_TYPE:
-                return getParentDOType();
-            case SclPackage.DA__PROT_NS:
-                return getProtNs();
+        switch( featureID ) {
+        case SclPackage.DA__DCHG:
+            return getDchg();
+        case SclPackage.DA__DUPD:
+            return getDupd();
+        case SclPackage.DA__QCHG:
+            return getQchg();
+        case SclPackage.DA__FC:
+            return getFc();
+        case SclPackage.DA__PARENT_DO_TYPE:
+            return getParentDOType();
+        case SclPackage.DA__PROT_NS:
+            return getProtNs();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -562,28 +575,28 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.DA__DCHG:
-                setDchg((Boolean)newValue);
-                return;
-            case SclPackage.DA__DUPD:
-                setDupd((Boolean)newValue);
-                return;
-            case SclPackage.DA__QCHG:
-                setQchg((Boolean)newValue);
-                return;
-            case SclPackage.DA__FC:
-                setFc((FCEnum)newValue);
-                return;
-            case SclPackage.DA__PARENT_DO_TYPE:
-                setParentDOType((DOType)newValue);
-                return;
-            case SclPackage.DA__PROT_NS:
-                getProtNs().clear();
-                getProtNs().addAll((Collection<? extends ProtNs>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.DA__DCHG:
+            setDchg( ( Boolean ) newValue );
+            return;
+        case SclPackage.DA__DUPD:
+            setDupd( ( Boolean ) newValue );
+            return;
+        case SclPackage.DA__QCHG:
+            setQchg( ( Boolean ) newValue );
+            return;
+        case SclPackage.DA__FC:
+            setFc( ( FCEnum ) newValue );
+            return;
+        case SclPackage.DA__PARENT_DO_TYPE:
+            setParentDOType( ( DOType ) newValue );
+            return;
+        case SclPackage.DA__PROT_NS:
+            getProtNs().clear();
+            getProtNs().addAll( ( Collection< ? extends ProtNs > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -593,27 +606,27 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DA__DCHG:
-                unsetDchg();
-                return;
-            case SclPackage.DA__DUPD:
-                unsetDupd();
-                return;
-            case SclPackage.DA__QCHG:
-                unsetQchg();
-                return;
-            case SclPackage.DA__FC:
-                unsetFc();
-                return;
-            case SclPackage.DA__PARENT_DO_TYPE:
-                setParentDOType((DOType)null);
-                return;
-            case SclPackage.DA__PROT_NS:
-                unsetProtNs();
-                return;
+        switch( featureID ) {
+        case SclPackage.DA__DCHG:
+            unsetDchg();
+            return;
+        case SclPackage.DA__DUPD:
+            unsetDupd();
+            return;
+        case SclPackage.DA__QCHG:
+            unsetQchg();
+            return;
+        case SclPackage.DA__FC:
+            unsetFc();
+            return;
+        case SclPackage.DA__PARENT_DO_TYPE:
+            setParentDOType( ( DOType ) null );
+            return;
+        case SclPackage.DA__PROT_NS:
+            unsetProtNs();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -623,21 +636,21 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DA__DCHG:
-                return isSetDchg();
-            case SclPackage.DA__DUPD:
-                return isSetDupd();
-            case SclPackage.DA__QCHG:
-                return isSetQchg();
-            case SclPackage.DA__FC:
-                return isSetFc();
-            case SclPackage.DA__PARENT_DO_TYPE:
-                return getParentDOType() != null;
-            case SclPackage.DA__PROT_NS:
-                return isSetProtNs();
+        switch( featureID ) {
+        case SclPackage.DA__DCHG:
+            return isSetDchg();
+        case SclPackage.DA__DUPD:
+            return isSetDupd();
+        case SclPackage.DA__QCHG:
+            return isSetQchg();
+        case SclPackage.DA__FC:
+            return isSetFc();
+        case SclPackage.DA__PARENT_DO_TYPE:
+            return getParentDOType() != null;
+        case SclPackage.DA__PROT_NS:
+            return isSetProtNs();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -646,16 +659,20 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      * @generated
      */
     @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDATrgOp.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.DA__DCHG: return SclPackage.AG_DA_TRG_OP__DCHG;
-                case SclPackage.DA__DUPD: return SclPackage.AG_DA_TRG_OP__DUPD;
-                case SclPackage.DA__QCHG: return SclPackage.AG_DA_TRG_OP__QCHG;
-                default: return -1;
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDATrgOp.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.DA__DCHG:
+                return SclPackage.AG_DA_TRG_OP__DCHG;
+            case SclPackage.DA__DUPD:
+                return SclPackage.AG_DA_TRG_OP__DUPD;
+            case SclPackage.DA__QCHG:
+                return SclPackage.AG_DA_TRG_OP__QCHG;
+            default:
+                return -1;
             }
         }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
     }
 
     /**
@@ -664,16 +681,20 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      * @generated
      */
     @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDATrgOp.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_DA_TRG_OP__DCHG: return SclPackage.DA__DCHG;
-                case SclPackage.AG_DA_TRG_OP__DUPD: return SclPackage.DA__DUPD;
-                case SclPackage.AG_DA_TRG_OP__QCHG: return SclPackage.DA__QCHG;
-                default: return -1;
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDATrgOp.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_DA_TRG_OP__DCHG:
+                return SclPackage.DA__DCHG;
+            case SclPackage.AG_DA_TRG_OP__DUPD:
+                return SclPackage.DA__DUPD;
+            case SclPackage.AG_DA_TRG_OP__QCHG:
+                return SclPackage.DA__QCHG;
+            default:
+                return -1;
             }
         }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
     }
 
     @Override
@@ -693,18 +714,30 @@ public class DAImpl extends AbstractDataAttributeImpl implements DA {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (dchg: ");
-        if (dchgESet) result.append(dchg); else result.append("<unset>");
-        result.append(", dupd: ");
-        if (dupdESet) result.append(dupd); else result.append("<unset>");
-        result.append(", qchg: ");
-        if (qchgESet) result.append(qchg); else result.append("<unset>");
-        result.append(", fc: ");
-        if (fcESet) result.append(fc); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (dchg: " );
+        if( dchgESet )
+            result.append( dchg );
+        else
+            result.append( "<unset>" );
+        result.append( ", dupd: " );
+        if( dupdESet )
+            result.append( dupd );
+        else
+            result.append( "<unset>" );
+        result.append( ", qchg: " );
+        if( qchgESet )
+            result.append( qchg );
+        else
+            result.append( "<unset>" );
+        result.append( ", fc: " );
+        if( fcESet )
+            result.append( fc );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DATypeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DATypeImpl.java
index 3bc2d26..da50ecb 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DATypeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DATypeImpl.java
@@ -94,7 +94,7 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      * @generated
      * @ordered
      */
-    protected EList<BDA> bda;
+    protected EList< BDA > bda;
 
     /**
      * The cached value of the '{@link #getReferredByAbstractDataAttribute() <em>Referred By Abstract Data Attribute</em>}' reference list.
@@ -104,7 +104,7 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      * @generated
      * @ordered
      */
-    protected EList<AbstractDataAttribute> referredByAbstractDataAttribute;
+    protected EList< AbstractDataAttribute > referredByAbstractDataAttribute;
 
     /**
      * The cached value of the '{@link #getProtNs() <em>Prot Ns</em>}' containment reference list.
@@ -114,7 +114,7 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      * @generated
      * @ordered
      */
-    protected EList<ProtNs> protNs;
+    protected EList< ProtNs > protNs;
 
     /**
      * <!-- begin-user-doc -->
@@ -156,8 +156,9 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
         iedType = newIedType;
         boolean oldIedTypeESet = iedTypeESet;
         iedTypeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DA_TYPE__IED_TYPE, oldIedType, iedType, !oldIedTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DA_TYPE__IED_TYPE, oldIedType, iedType,
+                    !oldIedTypeESet ) );
     }
 
     /**
@@ -171,8 +172,9 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
         boolean oldIedTypeESet = iedTypeESet;
         iedType = IED_TYPE_EDEFAULT;
         iedTypeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DA_TYPE__IED_TYPE, oldIedType, IED_TYPE_EDEFAULT, oldIedTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DA_TYPE__IED_TYPE, oldIedType,
+                    IED_TYPE_EDEFAULT, oldIedTypeESet ) );
     }
 
     /**
@@ -191,9 +193,10 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      * @generated
      */
     @Override
-    public EList<BDA> getBDA() {
-        if (bda == null) {
-            bda = new EObjectContainmentWithInverseEList.Unsettable<BDA>(BDA.class, this, SclPackage.DA_TYPE__BDA, SclPackage.BDA__PARENT_DA_TYPE);
+    public EList< BDA > getBDA() {
+        if( bda == null ) {
+            bda = new EObjectContainmentWithInverseEList.Unsettable< BDA >( BDA.class, this, SclPackage.DA_TYPE__BDA,
+                    SclPackage.BDA__PARENT_DA_TYPE );
         }
         return bda;
     }
@@ -205,7 +208,7 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      */
     @Override
     public void unsetBDA() {
-        if (bda != null) ((InternalEList.Unsettable<?>)bda).unset();
+        if( bda != null ) ( ( InternalEList.Unsettable< ? > ) bda ).unset();
     }
 
     /**
@@ -215,7 +218,7 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      */
     @Override
     public boolean isSetBDA() {
-        return bda != null && ((InternalEList.Unsettable<?>)bda).isSet();
+        return bda != null && ( ( InternalEList.Unsettable< ? > ) bda ).isSet();
     }
 
     /**
@@ -224,9 +227,11 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      * @generated
      */
     @Override
-    public EList<AbstractDataAttribute> getReferredByAbstractDataAttribute() {
-        if (referredByAbstractDataAttribute == null) {
-            referredByAbstractDataAttribute = new EObjectWithInverseEList.Unsettable<AbstractDataAttribute>(AbstractDataAttribute.class, this, SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE);
+    public EList< AbstractDataAttribute > getReferredByAbstractDataAttribute() {
+        if( referredByAbstractDataAttribute == null ) {
+            referredByAbstractDataAttribute = new EObjectWithInverseEList.Unsettable< AbstractDataAttribute >(
+                    AbstractDataAttribute.class, this, SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE );
         }
         return referredByAbstractDataAttribute;
     }
@@ -238,7 +243,8 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      */
     @Override
     public void unsetReferredByAbstractDataAttribute() {
-        if (referredByAbstractDataAttribute != null) ((InternalEList.Unsettable<?>)referredByAbstractDataAttribute).unset();
+        if( referredByAbstractDataAttribute != null )
+            ( ( InternalEList.Unsettable< ? > ) referredByAbstractDataAttribute ).unset();
     }
 
     /**
@@ -248,7 +254,8 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      */
     @Override
     public boolean isSetReferredByAbstractDataAttribute() {
-        return referredByAbstractDataAttribute != null && ((InternalEList.Unsettable<?>)referredByAbstractDataAttribute).isSet();
+        return referredByAbstractDataAttribute != null
+                && ( ( InternalEList.Unsettable< ? > ) referredByAbstractDataAttribute ).isSet();
     }
 
     /**
@@ -258,8 +265,8 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      */
     @Override
     public DataTypeTemplates getParentDataTypeTemplates() {
-        if (eContainerFeatureID() != SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES) return null;
-        return (DataTypeTemplates)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES ) return null;
+        return ( DataTypeTemplates ) eInternalContainer();
     }
 
     /**
@@ -267,8 +274,10 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentDataTypeTemplates(DataTypeTemplates newParentDataTypeTemplates, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentDataTypeTemplates, SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES, msgs);
+    public NotificationChain basicSetParentDataTypeTemplates( DataTypeTemplates newParentDataTypeTemplates,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentDataTypeTemplates,
+                SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES, msgs );
         return msgs;
     }
 
@@ -278,20 +287,24 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      * @generated
      */
     @Override
-    public void setParentDataTypeTemplates(DataTypeTemplates newParentDataTypeTemplates) {
-        if (newParentDataTypeTemplates != eInternalContainer() || (eContainerFeatureID() != SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES && newParentDataTypeTemplates != null)) {
-            if (EcoreUtil.isAncestor(this, newParentDataTypeTemplates))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentDataTypeTemplates( DataTypeTemplates newParentDataTypeTemplates ) {
+        if( newParentDataTypeTemplates != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES
+                        && newParentDataTypeTemplates != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentDataTypeTemplates ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentDataTypeTemplates != null)
-                msgs = ((InternalEObject)newParentDataTypeTemplates).eInverseAdd(this, SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE, DataTypeTemplates.class, msgs);
-            msgs = basicSetParentDataTypeTemplates(newParentDataTypeTemplates, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentDataTypeTemplates != null )
+                msgs = ( ( InternalEObject ) newParentDataTypeTemplates ).eInverseAdd( this,
+                        SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE, DataTypeTemplates.class, msgs );
+            msgs = basicSetParentDataTypeTemplates( newParentDataTypeTemplates, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES, newParentDataTypeTemplates, newParentDataTypeTemplates));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES,
+                    newParentDataTypeTemplates, newParentDataTypeTemplates ) );
     }
 
     /**
@@ -300,9 +313,10 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      * @generated
      */
     @Override
-    public EList<ProtNs> getProtNs() {
-        if (protNs == null) {
-            protNs = new EObjectContainmentWithInverseEList.Unsettable<ProtNs>(ProtNs.class, this, SclPackage.DA_TYPE__PROT_NS, SclPackage.PROT_NS__PARENT_DA_TYPE);
+    public EList< ProtNs > getProtNs() {
+        if( protNs == null ) {
+            protNs = new EObjectContainmentWithInverseEList.Unsettable< ProtNs >( ProtNs.class, this,
+                    SclPackage.DA_TYPE__PROT_NS, SclPackage.PROT_NS__PARENT_DA_TYPE );
         }
         return protNs;
     }
@@ -314,7 +328,7 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      */
     @Override
     public void unsetProtNs() {
-        if (protNs != null) ((InternalEList.Unsettable<?>)protNs).unset();
+        if( protNs != null ) ( ( InternalEList.Unsettable< ? > ) protNs ).unset();
     }
 
     /**
@@ -324,7 +338,7 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      */
     @Override
     public boolean isSetProtNs() {
-        return protNs != null && ((InternalEList.Unsettable<?>)protNs).isSet();
+        return protNs != null && ( ( InternalEList.Unsettable< ? > ) protNs ).isSet();
     }
 
     /**
@@ -335,19 +349,21 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DA_TYPE__BDA:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getBDA()).basicAdd(otherEnd, msgs);
-            case SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByAbstractDataAttribute()).basicAdd(otherEnd, msgs);
-            case SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentDataTypeTemplates((DataTypeTemplates)otherEnd, msgs);
-            case SclPackage.DA_TYPE__PROT_NS:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getProtNs()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DA_TYPE__BDA:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getBDA() ).basicAdd( otherEnd, msgs );
+        case SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByAbstractDataAttribute() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentDataTypeTemplates( ( DataTypeTemplates ) otherEnd, msgs );
+        case SclPackage.DA_TYPE__PROT_NS:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getProtNs() ).basicAdd( otherEnd,
+                    msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -357,17 +373,17 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DA_TYPE__BDA:
-                return ((InternalEList<?>)getBDA()).basicRemove(otherEnd, msgs);
-            case SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
-                return ((InternalEList<?>)getReferredByAbstractDataAttribute()).basicRemove(otherEnd, msgs);
-            case SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return basicSetParentDataTypeTemplates(null, msgs);
-            case SclPackage.DA_TYPE__PROT_NS:
-                return ((InternalEList<?>)getProtNs()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DA_TYPE__BDA:
+            return ( ( InternalEList< ? > ) getBDA() ).basicRemove( otherEnd, msgs );
+        case SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
+            return ( ( InternalEList< ? > ) getReferredByAbstractDataAttribute() ).basicRemove( otherEnd, msgs );
+        case SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return basicSetParentDataTypeTemplates( null, msgs );
+        case SclPackage.DA_TYPE__PROT_NS:
+            return ( ( InternalEList< ? > ) getProtNs() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -377,11 +393,12 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE, DataTypeTemplates.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE,
+                    DataTypeTemplates.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -391,19 +408,19 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.DA_TYPE__IED_TYPE:
-                return getIedType();
-            case SclPackage.DA_TYPE__BDA:
-                return getBDA();
-            case SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
-                return getReferredByAbstractDataAttribute();
-            case SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return getParentDataTypeTemplates();
-            case SclPackage.DA_TYPE__PROT_NS:
-                return getProtNs();
+        switch( featureID ) {
+        case SclPackage.DA_TYPE__IED_TYPE:
+            return getIedType();
+        case SclPackage.DA_TYPE__BDA:
+            return getBDA();
+        case SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
+            return getReferredByAbstractDataAttribute();
+        case SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return getParentDataTypeTemplates();
+        case SclPackage.DA_TYPE__PROT_NS:
+            return getProtNs();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -414,27 +431,27 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.DA_TYPE__IED_TYPE:
-                setIedType((String)newValue);
-                return;
-            case SclPackage.DA_TYPE__BDA:
-                getBDA().clear();
-                getBDA().addAll((Collection<? extends BDA>)newValue);
-                return;
-            case SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
-                getReferredByAbstractDataAttribute().clear();
-                getReferredByAbstractDataAttribute().addAll((Collection<? extends AbstractDataAttribute>)newValue);
-                return;
-            case SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                setParentDataTypeTemplates((DataTypeTemplates)newValue);
-                return;
-            case SclPackage.DA_TYPE__PROT_NS:
-                getProtNs().clear();
-                getProtNs().addAll((Collection<? extends ProtNs>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.DA_TYPE__IED_TYPE:
+            setIedType( ( String ) newValue );
+            return;
+        case SclPackage.DA_TYPE__BDA:
+            getBDA().clear();
+            getBDA().addAll( ( Collection< ? extends BDA > ) newValue );
+            return;
+        case SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
+            getReferredByAbstractDataAttribute().clear();
+            getReferredByAbstractDataAttribute().addAll( ( Collection< ? extends AbstractDataAttribute > ) newValue );
+            return;
+        case SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            setParentDataTypeTemplates( ( DataTypeTemplates ) newValue );
+            return;
+        case SclPackage.DA_TYPE__PROT_NS:
+            getProtNs().clear();
+            getProtNs().addAll( ( Collection< ? extends ProtNs > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -444,24 +461,24 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DA_TYPE__IED_TYPE:
-                unsetIedType();
-                return;
-            case SclPackage.DA_TYPE__BDA:
-                unsetBDA();
-                return;
-            case SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
-                unsetReferredByAbstractDataAttribute();
-                return;
-            case SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                setParentDataTypeTemplates((DataTypeTemplates)null);
-                return;
-            case SclPackage.DA_TYPE__PROT_NS:
-                unsetProtNs();
-                return;
+        switch( featureID ) {
+        case SclPackage.DA_TYPE__IED_TYPE:
+            unsetIedType();
+            return;
+        case SclPackage.DA_TYPE__BDA:
+            unsetBDA();
+            return;
+        case SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
+            unsetReferredByAbstractDataAttribute();
+            return;
+        case SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            setParentDataTypeTemplates( ( DataTypeTemplates ) null );
+            return;
+        case SclPackage.DA_TYPE__PROT_NS:
+            unsetProtNs();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -471,19 +488,19 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DA_TYPE__IED_TYPE:
-                return isSetIedType();
-            case SclPackage.DA_TYPE__BDA:
-                return isSetBDA();
-            case SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
-                return isSetReferredByAbstractDataAttribute();
-            case SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return getParentDataTypeTemplates() != null;
-            case SclPackage.DA_TYPE__PROT_NS:
-                return isSetProtNs();
+        switch( featureID ) {
+        case SclPackage.DA_TYPE__IED_TYPE:
+            return isSetIedType();
+        case SclPackage.DA_TYPE__BDA:
+            return isSetBDA();
+        case SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
+            return isSetReferredByAbstractDataAttribute();
+        case SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return getParentDataTypeTemplates() != null;
+        case SclPackage.DA_TYPE__PROT_NS:
+            return isSetProtNs();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -493,12 +510,15 @@ public class DATypeImpl extends IDNamingImpl implements DAType {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (iedType: ");
-        if (iedTypeESet) result.append(iedType); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (iedType: " );
+        if( iedTypeESet )
+            result.append( iedType );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOIImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOIImpl.java
index 21df31a..2d4b678 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOIImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOIImpl.java
@@ -35,7 +35,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN;
-import fr.centralesupelec.edf.riseclipse.iec61850.scl.DA;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.DAI;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.DO;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.DOI;
@@ -102,7 +101,7 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      * @generated
      * @ordered
      */
-    protected EList<DAI> dai;
+    protected EList< DAI > dai;
 
     /**
      * The cached value of the '{@link #getSDI() <em>SDI</em>}' containment reference list.
@@ -112,7 +111,7 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      * @generated
      * @ordered
      */
-    protected EList<SDI> sdi;
+    protected EList< SDI > sdi;
 
     /**
      * The default value of the '{@link #getAccessControl() <em>Access Control</em>}' attribute.
@@ -231,8 +230,8 @@ public class DOIImpl extends UnNamingImpl implements DOI {
         ix = newIx;
         boolean oldIxESet = ixESet;
         ixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DOI__IX, oldIx, ix, !oldIxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DOI__IX, oldIx, ix, !oldIxESet ) );
     }
 
     /**
@@ -246,8 +245,9 @@ public class DOIImpl extends UnNamingImpl implements DOI {
         boolean oldIxESet = ixESet;
         ix = IX_EDEFAULT;
         ixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DOI__IX, oldIx, IX_EDEFAULT, oldIxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DOI__IX, oldIx, IX_EDEFAULT,
+                    oldIxESet ) );
     }
 
     /**
@@ -267,8 +267,8 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      */
     @Override
     public AnyLN getParentAnyLN() {
-        if (eContainerFeatureID() != SclPackage.DOI__PARENT_ANY_LN) return null;
-        return (AnyLN)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.DOI__PARENT_ANY_LN ) return null;
+        return ( AnyLN ) eInternalContainer();
     }
 
     /**
@@ -276,8 +276,8 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAnyLN(AnyLN newParentAnyLN, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAnyLN, SclPackage.DOI__PARENT_ANY_LN, msgs);
+    public NotificationChain basicSetParentAnyLN( AnyLN newParentAnyLN, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAnyLN, SclPackage.DOI__PARENT_ANY_LN, msgs );
         return msgs;
     }
 
@@ -287,20 +287,23 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      * @generated
      */
     @Override
-    public void setParentAnyLN(AnyLN newParentAnyLN) {
-        if (newParentAnyLN != eInternalContainer() || (eContainerFeatureID() != SclPackage.DOI__PARENT_ANY_LN && newParentAnyLN != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAnyLN))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAnyLN( AnyLN newParentAnyLN ) {
+        if( newParentAnyLN != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.DOI__PARENT_ANY_LN && newParentAnyLN != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAnyLN ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAnyLN != null)
-                msgs = ((InternalEObject)newParentAnyLN).eInverseAdd(this, SclPackage.ANY_LN__DOI, AnyLN.class, msgs);
-            msgs = basicSetParentAnyLN(newParentAnyLN, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAnyLN != null )
+                msgs = ( ( InternalEObject ) newParentAnyLN ).eInverseAdd( this, SclPackage.ANY_LN__DOI, AnyLN.class,
+                        msgs );
+            msgs = basicSetParentAnyLN( newParentAnyLN, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DOI__PARENT_ANY_LN, newParentAnyLN, newParentAnyLN));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DOI__PARENT_ANY_LN, newParentAnyLN,
+                    newParentAnyLN ) );
     }
 
     /**
@@ -309,9 +312,10 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      * @generated
      */
     @Override
-    public EList<DAI> getDAI() {
-        if (dai == null) {
-            dai = new EObjectContainmentWithInverseEList.Unsettable<DAI>(DAI.class, this, SclPackage.DOI__DAI, SclPackage.DAI__PARENT_DOI);
+    public EList< DAI > getDAI() {
+        if( dai == null ) {
+            dai = new EObjectContainmentWithInverseEList.Unsettable< DAI >( DAI.class, this, SclPackage.DOI__DAI,
+                    SclPackage.DAI__PARENT_DOI );
         }
         return dai;
     }
@@ -323,7 +327,7 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      */
     @Override
     public void unsetDAI() {
-        if (dai != null) ((InternalEList.Unsettable<?>)dai).unset();
+        if( dai != null ) ( ( InternalEList.Unsettable< ? > ) dai ).unset();
     }
 
     /**
@@ -333,7 +337,7 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      */
     @Override
     public boolean isSetDAI() {
-        return dai != null && ((InternalEList.Unsettable<?>)dai).isSet();
+        return dai != null && ( ( InternalEList.Unsettable< ? > ) dai ).isSet();
     }
 
     /**
@@ -342,9 +346,10 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      * @generated
      */
     @Override
-    public EList<SDI> getSDI() {
-        if (sdi == null) {
-            sdi = new EObjectContainmentWithInverseEList.Unsettable<SDI>(SDI.class, this, SclPackage.DOI__SDI, SclPackage.SDI__PARENT_DOI);
+    public EList< SDI > getSDI() {
+        if( sdi == null ) {
+            sdi = new EObjectContainmentWithInverseEList.Unsettable< SDI >( SDI.class, this, SclPackage.DOI__SDI,
+                    SclPackage.SDI__PARENT_DOI );
         }
         return sdi;
     }
@@ -356,7 +361,7 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      */
     @Override
     public void unsetSDI() {
-        if (sdi != null) ((InternalEList.Unsettable<?>)sdi).unset();
+        if( sdi != null ) ( ( InternalEList.Unsettable< ? > ) sdi ).unset();
     }
 
     /**
@@ -366,7 +371,7 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      */
     @Override
     public boolean isSetSDI() {
-        return sdi != null && ((InternalEList.Unsettable<?>)sdi).isSet();
+        return sdi != null && ( ( InternalEList.Unsettable< ? > ) sdi ).isSet();
     }
 
     /**
@@ -385,13 +390,14 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      * @generated
      */
     @Override
-    public void setAccessControl(String newAccessControl) {
+    public void setAccessControl( String newAccessControl ) {
         String oldAccessControl = accessControl;
         accessControl = newAccessControl;
         boolean oldAccessControlESet = accessControlESet;
         accessControlESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DOI__ACCESS_CONTROL, oldAccessControl, accessControl, !oldAccessControlESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DOI__ACCESS_CONTROL, oldAccessControl,
+                    accessControl, !oldAccessControlESet ) );
     }
 
     /**
@@ -405,8 +411,9 @@ public class DOIImpl extends UnNamingImpl implements DOI {
         boolean oldAccessControlESet = accessControlESet;
         accessControl = ACCESS_CONTROL_EDEFAULT;
         accessControlESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DOI__ACCESS_CONTROL, oldAccessControl, ACCESS_CONTROL_EDEFAULT, oldAccessControlESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DOI__ACCESS_CONTROL, oldAccessControl,
+                    ACCESS_CONTROL_EDEFAULT, oldAccessControlESet ) );
     }
 
     /**
@@ -435,13 +442,14 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      * @generated
      */
     @Override
-    public void setName(String newName) {
+    public void setName( String newName ) {
         String oldName = name;
         name = newName;
         boolean oldNameESet = nameESet;
         nameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DOI__NAME, oldName, name, !oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DOI__NAME, oldName, name,
+                    !oldNameESet ) );
     }
 
     /**
@@ -455,8 +463,9 @@ public class DOIImpl extends UnNamingImpl implements DOI {
         boolean oldNameESet = nameESet;
         name = NAME_EDEFAULT;
         nameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DOI__NAME, oldName, NAME_EDEFAULT, oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DOI__NAME, oldName, NAME_EDEFAULT,
+                    oldNameESet ) );
     }
 
     /**
@@ -484,14 +493,18 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToDO(DO newRefersToDO, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToDO( DO newRefersToDO, NotificationChain msgs ) {
         DO oldRefersToDO = refersToDO;
         refersToDO = newRefersToDO;
         boolean oldRefersToDOESet = refersToDOESet;
         refersToDOESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.DOI__REFERS_TO_DO, oldRefersToDO, newRefersToDO, !oldRefersToDOESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.DOI__REFERS_TO_DO, oldRefersToDO, newRefersToDO, !oldRefersToDOESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -502,21 +515,24 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      * @generated
      */
     @Override
-    public void setRefersToDO(DO newRefersToDO) {
-        if (newRefersToDO != refersToDO) {
+    public void setRefersToDO( DO newRefersToDO ) {
+        if( newRefersToDO != refersToDO ) {
             NotificationChain msgs = null;
-            if (refersToDO != null)
-                msgs = ((InternalEObject)refersToDO).eInverseRemove(this, SclPackage.DO__REFERRED_BY_DOI, DO.class, msgs);
-            if (newRefersToDO != null)
-                msgs = ((InternalEObject)newRefersToDO).eInverseAdd(this, SclPackage.DO__REFERRED_BY_DOI, DO.class, msgs);
-            msgs = basicSetRefersToDO(newRefersToDO, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToDO != null )
+                msgs = ( ( InternalEObject ) refersToDO ).eInverseRemove( this, SclPackage.DO__REFERRED_BY_DOI,
+                        DO.class, msgs );
+            if( newRefersToDO != null )
+                msgs = ( ( InternalEObject ) newRefersToDO ).eInverseAdd( this, SclPackage.DO__REFERRED_BY_DOI,
+                        DO.class, msgs );
+            msgs = basicSetRefersToDO( newRefersToDO, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToDOESet = refersToDOESet;
             refersToDOESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DOI__REFERS_TO_DO, newRefersToDO, newRefersToDO, !oldRefersToDOESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DOI__REFERS_TO_DO, newRefersToDO,
+                        newRefersToDO, !oldRefersToDOESet ) );
         }
     }
 
@@ -525,14 +541,18 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToDO(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToDO( NotificationChain msgs ) {
         DO oldRefersToDO = refersToDO;
         refersToDO = null;
         boolean oldRefersToDOESet = refersToDOESet;
         refersToDOESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.DOI__REFERS_TO_DO, oldRefersToDO, null, oldRefersToDOESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.DOI__REFERS_TO_DO, oldRefersToDO, null, oldRefersToDOESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -544,17 +564,19 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      */
     @Override
     public void unsetRefersToDO() {
-        if (refersToDO != null) {
+        if( refersToDO != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToDO).eInverseRemove(this, SclPackage.DO__REFERRED_BY_DOI, DO.class, msgs);
-            msgs = basicUnsetRefersToDO(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToDO ).eInverseRemove( this, SclPackage.DO__REFERRED_BY_DOI, DO.class,
+                    msgs );
+            msgs = basicUnsetRefersToDO( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToDOESet = refersToDOESet;
             refersToDOESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DOI__REFERS_TO_DO, null, null, oldRefersToDOESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DOI__REFERS_TO_DO, null, null,
+                        oldRefersToDOESet ) );
         }
     }
 
@@ -575,44 +597,9 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      */
     @Override
     public String getNamespace() {
-        List< DAI > ldNsDai =
-                getDAI()
-                .stream()
-                .filter( dai -> "dataNs".equals(  dai.getName() ))
-                .collect( Collectors.toList() );
-        if( ldNsDai.size() == 1 ) {
-            if((         ldNsDai.get( 0 ).getVal().size() == 1 )
-                    && ( ldNsDai.get( 0 ).getVal().get( 0 ).getValue() != null )
-                    && ( ldNsDai.get( 0 ).getVal().get( 0 ).getValue().length() != 0 )) {
-                return ldNsDai.get( 0 ).getVal().get( 0 ).getValue();
-            }
-            if((         ldNsDai.get( 0 ).getRefersToAbstractDataAttribute() != null )
-                    && ( ldNsDai.get( 0 ).getRefersToAbstractDataAttribute().getVal().size() == 1 )
-                    && ( ldNsDai.get( 0 ).getRefersToAbstractDataAttribute().getVal().get( 0 ).getValue() != null )
-                    && ( ldNsDai.get( 0 ).getRefersToAbstractDataAttribute().getVal().get( 0 ).getValue().length() != 0 )) {
-                return ldNsDai.get( 0 ).getRefersToAbstractDataAttribute().getVal().get( 0 ).getValue();
-            }
-        }
-        
-        if( getRefersToDO() != null ) {
-            List< DA > lnNsDa =
-                    getRefersToDO()
-                    .getRefersToDOType()
-                    .getDA()
-                    .stream()
-                    .filter( da -> "dataNs".equals(  da.getName() ))
-                    .collect( Collectors.toList() );
-            if( lnNsDa.size() == 1 ) {
-                if((         lnNsDa.get( 0 ).getVal().size() == 1 )
-                        && ( lnNsDa.get( 0 ).getVal().get( 0 ).getValue() != null )
-                        && ( lnNsDa.get( 0 ).getVal().get( 0 ).getValue().length() != 0 )) {
-                    return lnNsDa.get( 0 ).getVal().get( 0 ).getValue();
-                }
-            }
-        }
-        
-        if( getParentAnyLN() == null ) return null;
-        return getParentAnyLN().getNamespace();
+        // TODO: implement this method
+        // Ensure that you remove @generated or mark it @generated NOT
+        throw new UnsupportedOperationException();
     }
 
     /**
@@ -623,21 +610,22 @@ public class DOIImpl extends UnNamingImpl implements DOI {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DOI__PARENT_ANY_LN:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAnyLN((AnyLN)otherEnd, msgs);
-            case SclPackage.DOI__DAI:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getDAI()).basicAdd(otherEnd, msgs);
-            case SclPackage.DOI__SDI:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSDI()).basicAdd(otherEnd, msgs);
-            case SclPackage.DOI__REFERS_TO_DO:
-                if (refersToDO != null)
-                    msgs = ((InternalEObject)refersToDO).eInverseRemove(this, SclPackage.DO__REFERRED_BY_DOI, DO.class, msgs);
-                return basicSetRefersToDO((DO)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DOI__PARENT_ANY_LN:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAnyLN( ( AnyLN ) otherEnd, msgs );
+        case SclPackage.DOI__DAI:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getDAI() ).basicAdd( otherEnd, msgs );
+        case SclPackage.DOI__SDI:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSDI() ).basicAdd( otherEnd, msgs );
+        case SclPackage.DOI__REFERS_TO_DO:
+            if( refersToDO != null )
+                msgs = ( ( InternalEObject ) refersToDO ).eInverseRemove( this, SclPackage.DO__REFERRED_BY_DOI,
+                        DO.class, msgs );
+            return basicSetRefersToDO( ( DO ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -647,17 +635,17 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DOI__PARENT_ANY_LN:
-                return basicSetParentAnyLN(null, msgs);
-            case SclPackage.DOI__DAI:
-                return ((InternalEList<?>)getDAI()).basicRemove(otherEnd, msgs);
-            case SclPackage.DOI__SDI:
-                return ((InternalEList<?>)getSDI()).basicRemove(otherEnd, msgs);
-            case SclPackage.DOI__REFERS_TO_DO:
-                return basicUnsetRefersToDO(msgs);
+        switch( featureID ) {
+        case SclPackage.DOI__PARENT_ANY_LN:
+            return basicSetParentAnyLN( null, msgs );
+        case SclPackage.DOI__DAI:
+            return ( ( InternalEList< ? > ) getDAI() ).basicRemove( otherEnd, msgs );
+        case SclPackage.DOI__SDI:
+            return ( ( InternalEList< ? > ) getSDI() ).basicRemove( otherEnd, msgs );
+        case SclPackage.DOI__REFERS_TO_DO:
+            return basicUnsetRefersToDO( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -667,11 +655,11 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.DOI__PARENT_ANY_LN:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ANY_LN__DOI, AnyLN.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.DOI__PARENT_ANY_LN:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ANY_LN__DOI, AnyLN.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -681,23 +669,23 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.DOI__IX:
-                return getIx();
-            case SclPackage.DOI__PARENT_ANY_LN:
-                return getParentAnyLN();
-            case SclPackage.DOI__DAI:
-                return getDAI();
-            case SclPackage.DOI__SDI:
-                return getSDI();
-            case SclPackage.DOI__ACCESS_CONTROL:
-                return getAccessControl();
-            case SclPackage.DOI__NAME:
-                return getName();
-            case SclPackage.DOI__REFERS_TO_DO:
-                return getRefersToDO();
+        switch( featureID ) {
+        case SclPackage.DOI__IX:
+            return getIx();
+        case SclPackage.DOI__PARENT_ANY_LN:
+            return getParentAnyLN();
+        case SclPackage.DOI__DAI:
+            return getDAI();
+        case SclPackage.DOI__SDI:
+            return getSDI();
+        case SclPackage.DOI__ACCESS_CONTROL:
+            return getAccessControl();
+        case SclPackage.DOI__NAME:
+            return getName();
+        case SclPackage.DOI__REFERS_TO_DO:
+            return getRefersToDO();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -708,32 +696,32 @@ public class DOIImpl extends UnNamingImpl implements DOI {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.DOI__IX:
-                setIx((Integer)newValue);
-                return;
-            case SclPackage.DOI__PARENT_ANY_LN:
-                setParentAnyLN((AnyLN)newValue);
-                return;
-            case SclPackage.DOI__DAI:
-                getDAI().clear();
-                getDAI().addAll((Collection<? extends DAI>)newValue);
-                return;
-            case SclPackage.DOI__SDI:
-                getSDI().clear();
-                getSDI().addAll((Collection<? extends SDI>)newValue);
-                return;
-            case SclPackage.DOI__ACCESS_CONTROL:
-                setAccessControl((String)newValue);
-                return;
-            case SclPackage.DOI__NAME:
-                setName((String)newValue);
-                return;
-            case SclPackage.DOI__REFERS_TO_DO:
-                setRefersToDO((DO)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.DOI__IX:
+            setIx( ( Integer ) newValue );
+            return;
+        case SclPackage.DOI__PARENT_ANY_LN:
+            setParentAnyLN( ( AnyLN ) newValue );
+            return;
+        case SclPackage.DOI__DAI:
+            getDAI().clear();
+            getDAI().addAll( ( Collection< ? extends DAI > ) newValue );
+            return;
+        case SclPackage.DOI__SDI:
+            getSDI().clear();
+            getSDI().addAll( ( Collection< ? extends SDI > ) newValue );
+            return;
+        case SclPackage.DOI__ACCESS_CONTROL:
+            setAccessControl( ( String ) newValue );
+            return;
+        case SclPackage.DOI__NAME:
+            setName( ( String ) newValue );
+            return;
+        case SclPackage.DOI__REFERS_TO_DO:
+            setRefersToDO( ( DO ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -743,30 +731,30 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DOI__IX:
-                unsetIx();
-                return;
-            case SclPackage.DOI__PARENT_ANY_LN:
-                setParentAnyLN((AnyLN)null);
-                return;
-            case SclPackage.DOI__DAI:
-                unsetDAI();
-                return;
-            case SclPackage.DOI__SDI:
-                unsetSDI();
-                return;
-            case SclPackage.DOI__ACCESS_CONTROL:
-                unsetAccessControl();
-                return;
-            case SclPackage.DOI__NAME:
-                unsetName();
-                return;
-            case SclPackage.DOI__REFERS_TO_DO:
-                unsetRefersToDO();
-                return;
+        switch( featureID ) {
+        case SclPackage.DOI__IX:
+            unsetIx();
+            return;
+        case SclPackage.DOI__PARENT_ANY_LN:
+            setParentAnyLN( ( AnyLN ) null );
+            return;
+        case SclPackage.DOI__DAI:
+            unsetDAI();
+            return;
+        case SclPackage.DOI__SDI:
+            unsetSDI();
+            return;
+        case SclPackage.DOI__ACCESS_CONTROL:
+            unsetAccessControl();
+            return;
+        case SclPackage.DOI__NAME:
+            unsetName();
+            return;
+        case SclPackage.DOI__REFERS_TO_DO:
+            unsetRefersToDO();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -776,23 +764,23 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DOI__IX:
-                return isSetIx();
-            case SclPackage.DOI__PARENT_ANY_LN:
-                return getParentAnyLN() != null;
-            case SclPackage.DOI__DAI:
-                return isSetDAI();
-            case SclPackage.DOI__SDI:
-                return isSetSDI();
-            case SclPackage.DOI__ACCESS_CONTROL:
-                return isSetAccessControl();
-            case SclPackage.DOI__NAME:
-                return isSetName();
-            case SclPackage.DOI__REFERS_TO_DO:
-                return isSetRefersToDO();
+        switch( featureID ) {
+        case SclPackage.DOI__IX:
+            return isSetIx();
+        case SclPackage.DOI__PARENT_ANY_LN:
+            return getParentAnyLN() != null;
+        case SclPackage.DOI__DAI:
+            return isSetDAI();
+        case SclPackage.DOI__SDI:
+            return isSetSDI();
+        case SclPackage.DOI__ACCESS_CONTROL:
+            return isSetAccessControl();
+        case SclPackage.DOI__NAME:
+            return isSetName();
+        case SclPackage.DOI__REFERS_TO_DO:
+            return isSetRefersToDO();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -801,12 +789,12 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      * @generated
      */
     @Override
-    public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-        switch (operationID) {
-            case SclPackage.DOI___GET_NAMESPACE:
-                return getNamespace();
+    public Object eInvoke( int operationID, EList< ? > arguments ) throws InvocationTargetException {
+        switch( operationID ) {
+        case SclPackage.DOI___GET_NAMESPACE:
+            return getNamespace();
         }
-        return super.eInvoke(operationID, arguments);
+        return super.eInvoke( operationID, arguments );
     }
 
     /**
@@ -816,16 +804,25 @@ public class DOIImpl extends UnNamingImpl implements DOI {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (ix: ");
-        if (ixESet) result.append(ix); else result.append("<unset>");
-        result.append(", accessControl: ");
-        if (accessControlESet) result.append(accessControl); else result.append("<unset>");
-        result.append(", name: ");
-        if (nameESet) result.append(name); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (ix: " );
+        if( ixESet )
+            result.append( ix );
+        else
+            result.append( "<unset>" );
+        result.append( ", accessControl: " );
+        if( accessControlESet )
+            result.append( accessControl );
+        else
+            result.append( "<unset>" );
+        result.append( ", name: " );
+        if( nameESet )
+            result.append( name );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -833,25 +830,25 @@ public class DOIImpl extends UnNamingImpl implements DOI {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         String messagePrefix = "[SCL links] while resolving link from DOI on line " + getLineNumber() + ": ";
-        
-        if(( getName() == null ) || getName().isEmpty() ) {
+
+        if( ( getName() == null ) || getName().isEmpty() ) {
             console.warning( messagePrefix, "name is missing" );
             return;
         }
-        
+
         // No error or warning message here: if this happens, error should have been detected before
         if( getParentAnyLN() == null ) return;
         if( getParentAnyLN().getRefersToLNodeType() == null ) return;
-        console.verbose( messagePrefix, "found LNodeType on line ", getParentAnyLN().getRefersToLNodeType().getLineNumber() );
+        console.verbose( messagePrefix, "found LNodeType on line ",
+                getParentAnyLN().getRefersToLNodeType().getLineNumber() );
 
-        List< DO > res =
-                getParentAnyLN()
+        List< DO > res = getParentAnyLN()
                 .getRefersToLNodeType()
                 .getDO()
                 .stream()
-                .filter( d -> getName().equals( d.getName() ))
+                .filter( d -> getName().equals( d.getName() ) )
                 .collect( Collectors.toList() );
 
         String mess = "DO( name = " + getName() + " )";
@@ -860,7 +857,8 @@ public class DOIImpl extends UnNamingImpl implements DOI {
             return;
         }
         setRefersToDO( res.get( 0 ) );
-        console.info( "[SCL links] DOI on line ", getLineNumber(), " refers to ", mess, " on line ", getRefersToDO().getLineNumber() );
+        console.info( "[SCL links] DOI on line ", getLineNumber(), " refers to ", mess, " on line ",
+                getRefersToDO().getLineNumber() );
     }
 
 } //DOIImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOImpl.java
index 1ecf76f..0cef6a2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOImpl.java
@@ -126,7 +126,7 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      * @generated
      * @ordered
      */
-    protected EList<DOI> referredByDOI;
+    protected EList< DOI > referredByDOI;
 
     /**
      * <!-- begin-user-doc -->
@@ -168,8 +168,9 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
         transient_ = newTransient;
         boolean oldTransientESet = transientESet;
         transientESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DO__TRANSIENT, oldTransient, transient_, !oldTransientESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DO__TRANSIENT, oldTransient, transient_,
+                    !oldTransientESet ) );
     }
 
     /**
@@ -183,8 +184,9 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
         boolean oldTransientESet = transientESet;
         transient_ = TRANSIENT_EDEFAULT;
         transientESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DO__TRANSIENT, oldTransient, TRANSIENT_EDEFAULT, oldTransientESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DO__TRANSIENT, oldTransient,
+                    TRANSIENT_EDEFAULT, oldTransientESet ) );
     }
 
     /**
@@ -204,8 +206,8 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      */
     @Override
     public LNodeType getParentLNodeType() {
-        if (eContainerFeatureID() != SclPackage.DO__PARENT_LNODE_TYPE) return null;
-        return (LNodeType)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.DO__PARENT_LNODE_TYPE ) return null;
+        return ( LNodeType ) eInternalContainer();
     }
 
     /**
@@ -213,8 +215,8 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentLNodeType(LNodeType newParentLNodeType, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentLNodeType, SclPackage.DO__PARENT_LNODE_TYPE, msgs);
+    public NotificationChain basicSetParentLNodeType( LNodeType newParentLNodeType, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentLNodeType, SclPackage.DO__PARENT_LNODE_TYPE, msgs );
         return msgs;
     }
 
@@ -224,20 +226,23 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      * @generated
      */
     @Override
-    public void setParentLNodeType(LNodeType newParentLNodeType) {
-        if (newParentLNodeType != eInternalContainer() || (eContainerFeatureID() != SclPackage.DO__PARENT_LNODE_TYPE && newParentLNodeType != null)) {
-            if (EcoreUtil.isAncestor(this, newParentLNodeType))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentLNodeType( LNodeType newParentLNodeType ) {
+        if( newParentLNodeType != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.DO__PARENT_LNODE_TYPE && newParentLNodeType != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentLNodeType ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentLNodeType != null)
-                msgs = ((InternalEObject)newParentLNodeType).eInverseAdd(this, SclPackage.LNODE_TYPE__DO, LNodeType.class, msgs);
-            msgs = basicSetParentLNodeType(newParentLNodeType, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentLNodeType != null )
+                msgs = ( ( InternalEObject ) newParentLNodeType ).eInverseAdd( this, SclPackage.LNODE_TYPE__DO,
+                        LNodeType.class, msgs );
+            msgs = basicSetParentLNodeType( newParentLNodeType, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DO__PARENT_LNODE_TYPE, newParentLNodeType, newParentLNodeType));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DO__PARENT_LNODE_TYPE,
+                    newParentLNodeType, newParentLNodeType ) );
     }
 
     /**
@@ -256,13 +261,14 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      * @generated
      */
     @Override
-    public void setAccessControl(String newAccessControl) {
+    public void setAccessControl( String newAccessControl ) {
         String oldAccessControl = accessControl;
         accessControl = newAccessControl;
         boolean oldAccessControlESet = accessControlESet;
         accessControlESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DO__ACCESS_CONTROL, oldAccessControl, accessControl, !oldAccessControlESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DO__ACCESS_CONTROL, oldAccessControl,
+                    accessControl, !oldAccessControlESet ) );
     }
 
     /**
@@ -276,8 +282,9 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
         boolean oldAccessControlESet = accessControlESet;
         accessControl = ACCESS_CONTROL_EDEFAULT;
         accessControlESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DO__ACCESS_CONTROL, oldAccessControl, ACCESS_CONTROL_EDEFAULT, oldAccessControlESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DO__ACCESS_CONTROL, oldAccessControl,
+                    ACCESS_CONTROL_EDEFAULT, oldAccessControlESet ) );
     }
 
     /**
@@ -296,9 +303,10 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      * @generated
      */
     @Override
-    public EList<DOI> getReferredByDOI() {
-        if (referredByDOI == null) {
-            referredByDOI = new EObjectWithInverseEList.Unsettable<DOI>(DOI.class, this, SclPackage.DO__REFERRED_BY_DOI, SclPackage.DOI__REFERS_TO_DO);
+    public EList< DOI > getReferredByDOI() {
+        if( referredByDOI == null ) {
+            referredByDOI = new EObjectWithInverseEList.Unsettable< DOI >( DOI.class, this,
+                    SclPackage.DO__REFERRED_BY_DOI, SclPackage.DOI__REFERS_TO_DO );
         }
         return referredByDOI;
     }
@@ -310,7 +318,7 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      */
     @Override
     public void unsetReferredByDOI() {
-        if (referredByDOI != null) ((InternalEList.Unsettable<?>)referredByDOI).unset();
+        if( referredByDOI != null ) ( ( InternalEList.Unsettable< ? > ) referredByDOI ).unset();
     }
 
     /**
@@ -320,7 +328,7 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      */
     @Override
     public boolean isSetReferredByDOI() {
-        return referredByDOI != null && ((InternalEList.Unsettable<?>)referredByDOI).isSet();
+        return referredByDOI != null && ( ( InternalEList.Unsettable< ? > ) referredByDOI ).isSet();
     }
 
     /**
@@ -328,18 +336,19 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DO__PARENT_LNODE_TYPE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentLNodeType((LNodeType)otherEnd, msgs);
-            case SclPackage.DO__REFERRED_BY_DOI:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByDOI()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DO__PARENT_LNODE_TYPE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentLNodeType( ( LNodeType ) otherEnd, msgs );
+        case SclPackage.DO__REFERRED_BY_DOI:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByDOI() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -349,13 +358,13 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DO__PARENT_LNODE_TYPE:
-                return basicSetParentLNodeType(null, msgs);
-            case SclPackage.DO__REFERRED_BY_DOI:
-                return ((InternalEList<?>)getReferredByDOI()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DO__PARENT_LNODE_TYPE:
+            return basicSetParentLNodeType( null, msgs );
+        case SclPackage.DO__REFERRED_BY_DOI:
+            return ( ( InternalEList< ? > ) getReferredByDOI() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -365,11 +374,11 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.DO__PARENT_LNODE_TYPE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.LNODE_TYPE__DO, LNodeType.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.DO__PARENT_LNODE_TYPE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.LNODE_TYPE__DO, LNodeType.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -379,17 +388,17 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.DO__TRANSIENT:
-                return getTransient();
-            case SclPackage.DO__PARENT_LNODE_TYPE:
-                return getParentLNodeType();
-            case SclPackage.DO__ACCESS_CONTROL:
-                return getAccessControl();
-            case SclPackage.DO__REFERRED_BY_DOI:
-                return getReferredByDOI();
+        switch( featureID ) {
+        case SclPackage.DO__TRANSIENT:
+            return getTransient();
+        case SclPackage.DO__PARENT_LNODE_TYPE:
+            return getParentLNodeType();
+        case SclPackage.DO__ACCESS_CONTROL:
+            return getAccessControl();
+        case SclPackage.DO__REFERRED_BY_DOI:
+            return getReferredByDOI();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -397,25 +406,25 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.DO__TRANSIENT:
-                setTransient((Boolean)newValue);
-                return;
-            case SclPackage.DO__PARENT_LNODE_TYPE:
-                setParentLNodeType((LNodeType)newValue);
-                return;
-            case SclPackage.DO__ACCESS_CONTROL:
-                setAccessControl((String)newValue);
-                return;
-            case SclPackage.DO__REFERRED_BY_DOI:
-                getReferredByDOI().clear();
-                getReferredByDOI().addAll((Collection<? extends DOI>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.DO__TRANSIENT:
+            setTransient( ( Boolean ) newValue );
+            return;
+        case SclPackage.DO__PARENT_LNODE_TYPE:
+            setParentLNodeType( ( LNodeType ) newValue );
+            return;
+        case SclPackage.DO__ACCESS_CONTROL:
+            setAccessControl( ( String ) newValue );
+            return;
+        case SclPackage.DO__REFERRED_BY_DOI:
+            getReferredByDOI().clear();
+            getReferredByDOI().addAll( ( Collection< ? extends DOI > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -425,21 +434,21 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DO__TRANSIENT:
-                unsetTransient();
-                return;
-            case SclPackage.DO__PARENT_LNODE_TYPE:
-                setParentLNodeType((LNodeType)null);
-                return;
-            case SclPackage.DO__ACCESS_CONTROL:
-                unsetAccessControl();
-                return;
-            case SclPackage.DO__REFERRED_BY_DOI:
-                unsetReferredByDOI();
-                return;
+        switch( featureID ) {
+        case SclPackage.DO__TRANSIENT:
+            unsetTransient();
+            return;
+        case SclPackage.DO__PARENT_LNODE_TYPE:
+            setParentLNodeType( ( LNodeType ) null );
+            return;
+        case SclPackage.DO__ACCESS_CONTROL:
+            unsetAccessControl();
+            return;
+        case SclPackage.DO__REFERRED_BY_DOI:
+            unsetReferredByDOI();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -449,17 +458,17 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DO__TRANSIENT:
-                return isSetTransient();
-            case SclPackage.DO__PARENT_LNODE_TYPE:
-                return getParentLNodeType() != null;
-            case SclPackage.DO__ACCESS_CONTROL:
-                return isSetAccessControl();
-            case SclPackage.DO__REFERRED_BY_DOI:
-                return isSetReferredByDOI();
+        switch( featureID ) {
+        case SclPackage.DO__TRANSIENT:
+            return isSetTransient();
+        case SclPackage.DO__PARENT_LNODE_TYPE:
+            return getParentLNodeType() != null;
+        case SclPackage.DO__ACCESS_CONTROL:
+            return isSetAccessControl();
+        case SclPackage.DO__REFERRED_BY_DOI:
+            return isSetReferredByDOI();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -469,14 +478,20 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (transient: ");
-        if (transientESet) result.append(transient_); else result.append("<unset>");
-        result.append(", accessControl: ");
-        if (accessControlESet) result.append(accessControl); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (transient: " );
+        if( transientESet )
+            result.append( transient_ );
+        else
+            result.append( "<unset>" );
+        result.append( ", accessControl: " );
+        if( accessControlESet )
+            result.append( accessControl );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -484,7 +499,7 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         // name             The data object name as specified for example in IEC 61850-7-4
         // type             The type references the id of a DOType definition
         // accessControl    Access control definition for this DO. If it is missing then any higher-level
@@ -493,7 +508,7 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
 
         String messagePrefix = "[SCL links] while resolving link from DO on line " + getLineNumber() + ": ";
 
-        if(( getType() == null ) || getType().isEmpty() ) {
+        if( ( getType() == null ) || getType().isEmpty() ) {
             console.warning( messagePrefix, "type is missing" );
             return;
         }
@@ -501,20 +516,20 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
         DataTypeTemplates dtt = SclUtilities.getSCL( this ).getDataTypeTemplates();
         if( dtt == null ) return;
 
-        List< DOType > res = 
-                dtt
+        List< DOType > res = dtt
                 .getDOType()
                 .stream()
-                .filter(  d -> getType().equals( d.getId() ))
+                .filter( d -> getType().equals( d.getId() ) )
                 .collect( Collectors.toList() );
-                
+
         String mess = "DOType( id = " + getType() + " )";
         if( res.size() != 1 ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess, res.size() );
             return;
         }
-        setRefersToDOType( res.get( 0 ));
-        console.info( "[SCL links] DO on line ", getLineNumber(), " refers to ", mess, " on line ", getRefersToDOType().getLineNumber() );
+        setRefersToDOType( res.get( 0 ) );
+        console.info( "[SCL links] DO on line ", getLineNumber(), " refers to ", mess, " on line ",
+                getRefersToDOType().getLineNumber() );
     }
 
 } //DOImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOTypeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOTypeImpl.java
index ec1e947..ae0169f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOTypeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOTypeImpl.java
@@ -124,7 +124,7 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      * @generated
      * @ordered
      */
-    protected EList<DA> da;
+    protected EList< DA > da;
 
     /**
      * The cached value of the '{@link #getReferredByAbstractDataObject() <em>Referred By Abstract Data Object</em>}' reference list.
@@ -134,7 +134,7 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      * @generated
      * @ordered
      */
-    protected EList<AbstractDataObject> referredByAbstractDataObject;
+    protected EList< AbstractDataObject > referredByAbstractDataObject;
 
     /**
      * The cached value of the '{@link #getSDO() <em>SDO</em>}' containment reference list.
@@ -144,7 +144,7 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      * @generated
      * @ordered
      */
-    protected EList<SDO> sdo;
+    protected EList< SDO > sdo;
 
     /**
      * <!-- begin-user-doc -->
@@ -186,8 +186,9 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
         cdc = newCdc;
         boolean oldCdcESet = cdcESet;
         cdcESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DO_TYPE__CDC, oldCdc, cdc, !oldCdcESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DO_TYPE__CDC, oldCdc, cdc,
+                    !oldCdcESet ) );
     }
 
     /**
@@ -201,8 +202,9 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
         boolean oldCdcESet = cdcESet;
         cdc = CDC_EDEFAULT;
         cdcESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DO_TYPE__CDC, oldCdc, CDC_EDEFAULT, oldCdcESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DO_TYPE__CDC, oldCdc, CDC_EDEFAULT,
+                    oldCdcESet ) );
     }
 
     /**
@@ -236,8 +238,9 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
         iedType = newIedType;
         boolean oldIedTypeESet = iedTypeESet;
         iedTypeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DO_TYPE__IED_TYPE, oldIedType, iedType, !oldIedTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DO_TYPE__IED_TYPE, oldIedType, iedType,
+                    !oldIedTypeESet ) );
     }
 
     /**
@@ -251,8 +254,9 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
         boolean oldIedTypeESet = iedTypeESet;
         iedType = IED_TYPE_EDEFAULT;
         iedTypeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DO_TYPE__IED_TYPE, oldIedType, IED_TYPE_EDEFAULT, oldIedTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DO_TYPE__IED_TYPE, oldIedType,
+                    IED_TYPE_EDEFAULT, oldIedTypeESet ) );
     }
 
     /**
@@ -271,9 +275,10 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      * @generated
      */
     @Override
-    public EList<DA> getDA() {
-        if (da == null) {
-            da = new EObjectContainmentWithInverseEList.Unsettable<DA>(DA.class, this, SclPackage.DO_TYPE__DA, SclPackage.DA__PARENT_DO_TYPE);
+    public EList< DA > getDA() {
+        if( da == null ) {
+            da = new EObjectContainmentWithInverseEList.Unsettable< DA >( DA.class, this, SclPackage.DO_TYPE__DA,
+                    SclPackage.DA__PARENT_DO_TYPE );
         }
         return da;
     }
@@ -285,7 +290,7 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      */
     @Override
     public void unsetDA() {
-        if (da != null) ((InternalEList.Unsettable<?>)da).unset();
+        if( da != null ) ( ( InternalEList.Unsettable< ? > ) da ).unset();
     }
 
     /**
@@ -295,7 +300,7 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      */
     @Override
     public boolean isSetDA() {
-        return da != null && ((InternalEList.Unsettable<?>)da).isSet();
+        return da != null && ( ( InternalEList.Unsettable< ? > ) da ).isSet();
     }
 
     /**
@@ -304,9 +309,11 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      * @generated
      */
     @Override
-    public EList<AbstractDataObject> getReferredByAbstractDataObject() {
-        if (referredByAbstractDataObject == null) {
-            referredByAbstractDataObject = new EObjectWithInverseEList.Unsettable<AbstractDataObject>(AbstractDataObject.class, this, SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT, SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE);
+    public EList< AbstractDataObject > getReferredByAbstractDataObject() {
+        if( referredByAbstractDataObject == null ) {
+            referredByAbstractDataObject = new EObjectWithInverseEList.Unsettable< AbstractDataObject >(
+                    AbstractDataObject.class, this, SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT,
+                    SclPackage.ABSTRACT_DATA_OBJECT__REFERS_TO_DO_TYPE );
         }
         return referredByAbstractDataObject;
     }
@@ -318,7 +325,8 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      */
     @Override
     public void unsetReferredByAbstractDataObject() {
-        if (referredByAbstractDataObject != null) ((InternalEList.Unsettable<?>)referredByAbstractDataObject).unset();
+        if( referredByAbstractDataObject != null )
+            ( ( InternalEList.Unsettable< ? > ) referredByAbstractDataObject ).unset();
     }
 
     /**
@@ -328,7 +336,8 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      */
     @Override
     public boolean isSetReferredByAbstractDataObject() {
-        return referredByAbstractDataObject != null && ((InternalEList.Unsettable<?>)referredByAbstractDataObject).isSet();
+        return referredByAbstractDataObject != null
+                && ( ( InternalEList.Unsettable< ? > ) referredByAbstractDataObject ).isSet();
     }
 
     /**
@@ -338,8 +347,8 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      */
     @Override
     public DataTypeTemplates getParentDataTypeTemplates() {
-        if (eContainerFeatureID() != SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES) return null;
-        return (DataTypeTemplates)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES ) return null;
+        return ( DataTypeTemplates ) eInternalContainer();
     }
 
     /**
@@ -347,8 +356,10 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentDataTypeTemplates(DataTypeTemplates newParentDataTypeTemplates, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentDataTypeTemplates, SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES, msgs);
+    public NotificationChain basicSetParentDataTypeTemplates( DataTypeTemplates newParentDataTypeTemplates,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentDataTypeTemplates,
+                SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES, msgs );
         return msgs;
     }
 
@@ -358,20 +369,24 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      * @generated
      */
     @Override
-    public void setParentDataTypeTemplates(DataTypeTemplates newParentDataTypeTemplates) {
-        if (newParentDataTypeTemplates != eInternalContainer() || (eContainerFeatureID() != SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES && newParentDataTypeTemplates != null)) {
-            if (EcoreUtil.isAncestor(this, newParentDataTypeTemplates))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentDataTypeTemplates( DataTypeTemplates newParentDataTypeTemplates ) {
+        if( newParentDataTypeTemplates != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES
+                        && newParentDataTypeTemplates != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentDataTypeTemplates ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentDataTypeTemplates != null)
-                msgs = ((InternalEObject)newParentDataTypeTemplates).eInverseAdd(this, SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE, DataTypeTemplates.class, msgs);
-            msgs = basicSetParentDataTypeTemplates(newParentDataTypeTemplates, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentDataTypeTemplates != null )
+                msgs = ( ( InternalEObject ) newParentDataTypeTemplates ).eInverseAdd( this,
+                        SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE, DataTypeTemplates.class, msgs );
+            msgs = basicSetParentDataTypeTemplates( newParentDataTypeTemplates, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES, newParentDataTypeTemplates, newParentDataTypeTemplates));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES,
+                    newParentDataTypeTemplates, newParentDataTypeTemplates ) );
     }
 
     /**
@@ -380,9 +395,10 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      * @generated
      */
     @Override
-    public EList<SDO> getSDO() {
-        if (sdo == null) {
-            sdo = new EObjectContainmentWithInverseEList.Unsettable<SDO>(SDO.class, this, SclPackage.DO_TYPE__SDO, SclPackage.SDO__PARENT_DO_TYPE);
+    public EList< SDO > getSDO() {
+        if( sdo == null ) {
+            sdo = new EObjectContainmentWithInverseEList.Unsettable< SDO >( SDO.class, this, SclPackage.DO_TYPE__SDO,
+                    SclPackage.SDO__PARENT_DO_TYPE );
         }
         return sdo;
     }
@@ -394,7 +410,7 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      */
     @Override
     public void unsetSDO() {
-        if (sdo != null) ((InternalEList.Unsettable<?>)sdo).unset();
+        if( sdo != null ) ( ( InternalEList.Unsettable< ? > ) sdo ).unset();
     }
 
     /**
@@ -404,7 +420,7 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      */
     @Override
     public boolean isSetSDO() {
-        return sdo != null && ((InternalEList.Unsettable<?>)sdo).isSet();
+        return sdo != null && ( ( InternalEList.Unsettable< ? > ) sdo ).isSet();
     }
 
     /**
@@ -415,19 +431,20 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DO_TYPE__DA:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getDA()).basicAdd(otherEnd, msgs);
-            case SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByAbstractDataObject()).basicAdd(otherEnd, msgs);
-            case SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentDataTypeTemplates((DataTypeTemplates)otherEnd, msgs);
-            case SclPackage.DO_TYPE__SDO:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSDO()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DO_TYPE__DA:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getDA() ).basicAdd( otherEnd, msgs );
+        case SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByAbstractDataObject() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentDataTypeTemplates( ( DataTypeTemplates ) otherEnd, msgs );
+        case SclPackage.DO_TYPE__SDO:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSDO() ).basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -437,17 +454,17 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DO_TYPE__DA:
-                return ((InternalEList<?>)getDA()).basicRemove(otherEnd, msgs);
-            case SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT:
-                return ((InternalEList<?>)getReferredByAbstractDataObject()).basicRemove(otherEnd, msgs);
-            case SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return basicSetParentDataTypeTemplates(null, msgs);
-            case SclPackage.DO_TYPE__SDO:
-                return ((InternalEList<?>)getSDO()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DO_TYPE__DA:
+            return ( ( InternalEList< ? > ) getDA() ).basicRemove( otherEnd, msgs );
+        case SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT:
+            return ( ( InternalEList< ? > ) getReferredByAbstractDataObject() ).basicRemove( otherEnd, msgs );
+        case SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return basicSetParentDataTypeTemplates( null, msgs );
+        case SclPackage.DO_TYPE__SDO:
+            return ( ( InternalEList< ? > ) getSDO() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -457,11 +474,12 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE, DataTypeTemplates.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE,
+                    DataTypeTemplates.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -471,21 +489,21 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.DO_TYPE__CDC:
-                return getCdc();
-            case SclPackage.DO_TYPE__IED_TYPE:
-                return getIedType();
-            case SclPackage.DO_TYPE__DA:
-                return getDA();
-            case SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT:
-                return getReferredByAbstractDataObject();
-            case SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return getParentDataTypeTemplates();
-            case SclPackage.DO_TYPE__SDO:
-                return getSDO();
+        switch( featureID ) {
+        case SclPackage.DO_TYPE__CDC:
+            return getCdc();
+        case SclPackage.DO_TYPE__IED_TYPE:
+            return getIedType();
+        case SclPackage.DO_TYPE__DA:
+            return getDA();
+        case SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT:
+            return getReferredByAbstractDataObject();
+        case SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return getParentDataTypeTemplates();
+        case SclPackage.DO_TYPE__SDO:
+            return getSDO();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -496,30 +514,30 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.DO_TYPE__CDC:
-                setCdc((String)newValue);
-                return;
-            case SclPackage.DO_TYPE__IED_TYPE:
-                setIedType((String)newValue);
-                return;
-            case SclPackage.DO_TYPE__DA:
-                getDA().clear();
-                getDA().addAll((Collection<? extends DA>)newValue);
-                return;
-            case SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT:
-                getReferredByAbstractDataObject().clear();
-                getReferredByAbstractDataObject().addAll((Collection<? extends AbstractDataObject>)newValue);
-                return;
-            case SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                setParentDataTypeTemplates((DataTypeTemplates)newValue);
-                return;
-            case SclPackage.DO_TYPE__SDO:
-                getSDO().clear();
-                getSDO().addAll((Collection<? extends SDO>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.DO_TYPE__CDC:
+            setCdc( ( String ) newValue );
+            return;
+        case SclPackage.DO_TYPE__IED_TYPE:
+            setIedType( ( String ) newValue );
+            return;
+        case SclPackage.DO_TYPE__DA:
+            getDA().clear();
+            getDA().addAll( ( Collection< ? extends DA > ) newValue );
+            return;
+        case SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT:
+            getReferredByAbstractDataObject().clear();
+            getReferredByAbstractDataObject().addAll( ( Collection< ? extends AbstractDataObject > ) newValue );
+            return;
+        case SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            setParentDataTypeTemplates( ( DataTypeTemplates ) newValue );
+            return;
+        case SclPackage.DO_TYPE__SDO:
+            getSDO().clear();
+            getSDO().addAll( ( Collection< ? extends SDO > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -529,27 +547,27 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DO_TYPE__CDC:
-                unsetCdc();
-                return;
-            case SclPackage.DO_TYPE__IED_TYPE:
-                unsetIedType();
-                return;
-            case SclPackage.DO_TYPE__DA:
-                unsetDA();
-                return;
-            case SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT:
-                unsetReferredByAbstractDataObject();
-                return;
-            case SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                setParentDataTypeTemplates((DataTypeTemplates)null);
-                return;
-            case SclPackage.DO_TYPE__SDO:
-                unsetSDO();
-                return;
+        switch( featureID ) {
+        case SclPackage.DO_TYPE__CDC:
+            unsetCdc();
+            return;
+        case SclPackage.DO_TYPE__IED_TYPE:
+            unsetIedType();
+            return;
+        case SclPackage.DO_TYPE__DA:
+            unsetDA();
+            return;
+        case SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT:
+            unsetReferredByAbstractDataObject();
+            return;
+        case SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            setParentDataTypeTemplates( ( DataTypeTemplates ) null );
+            return;
+        case SclPackage.DO_TYPE__SDO:
+            unsetSDO();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -559,21 +577,21 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DO_TYPE__CDC:
-                return isSetCdc();
-            case SclPackage.DO_TYPE__IED_TYPE:
-                return isSetIedType();
-            case SclPackage.DO_TYPE__DA:
-                return isSetDA();
-            case SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT:
-                return isSetReferredByAbstractDataObject();
-            case SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return getParentDataTypeTemplates() != null;
-            case SclPackage.DO_TYPE__SDO:
-                return isSetSDO();
+        switch( featureID ) {
+        case SclPackage.DO_TYPE__CDC:
+            return isSetCdc();
+        case SclPackage.DO_TYPE__IED_TYPE:
+            return isSetIedType();
+        case SclPackage.DO_TYPE__DA:
+            return isSetDA();
+        case SclPackage.DO_TYPE__REFERRED_BY_ABSTRACT_DATA_OBJECT:
+            return isSetReferredByAbstractDataObject();
+        case SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return getParentDataTypeTemplates() != null;
+        case SclPackage.DO_TYPE__SDO:
+            return isSetSDO();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -583,14 +601,20 @@ public class DOTypeImpl extends IDNamingImpl implements DOType {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (cdc: ");
-        if (cdcESet) result.append(cdc); else result.append("<unset>");
-        result.append(", iedType: ");
-        if (iedTypeESet) result.append(iedType); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (cdc: " );
+        if( cdcESet )
+            result.append( cdc );
+        else
+            result.append( "<unset>" );
+        result.append( ", iedType: " );
+        if( iedTypeESet )
+            result.append( iedType );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataObjectDirectoryImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataObjectDirectoryImpl.java
index ab4b62c..563077a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataObjectDirectoryImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataObjectDirectoryImpl.java
@@ -71,8 +71,8 @@ public class DataObjectDirectoryImpl extends ServiceYesNoImpl implements DataObj
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class DataObjectDirectoryImpl extends ServiceYesNoImpl implements DataObj
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices,
+                SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class DataObjectDirectoryImpl extends ServiceYesNoImpl implements DataObj
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__DATA_OBJECT_DIRECTORY, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this,
+                        SclPackage.SERVICES__DATA_OBJECT_DIRECTORY, Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class DataObjectDirectoryImpl extends ServiceYesNoImpl implements DataObj
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class DataObjectDirectoryImpl extends ServiceYesNoImpl implements DataObj
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class DataObjectDirectoryImpl extends ServiceYesNoImpl implements DataObj
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__DATA_OBJECT_DIRECTORY, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__DATA_OBJECT_DIRECTORY,
+                    Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class DataObjectDirectoryImpl extends ServiceYesNoImpl implements DataObj
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class DataObjectDirectoryImpl extends ServiceYesNoImpl implements DataObj
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class DataObjectDirectoryImpl extends ServiceYesNoImpl implements DataObj
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class DataObjectDirectoryImpl extends ServiceYesNoImpl implements DataObj
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //DataObjectDirectoryImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataSetDirectoryImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataSetDirectoryImpl.java
index bd06d90..cc7cb2b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataSetDirectoryImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataSetDirectoryImpl.java
@@ -71,8 +71,8 @@ public class DataSetDirectoryImpl extends ServiceYesNoImpl implements DataSetDir
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class DataSetDirectoryImpl extends ServiceYesNoImpl implements DataSetDir
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices,
+                SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class DataSetDirectoryImpl extends ServiceYesNoImpl implements DataSetDir
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__DATA_SET_DIRECTORY, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this,
+                        SclPackage.SERVICES__DATA_SET_DIRECTORY, Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class DataSetDirectoryImpl extends ServiceYesNoImpl implements DataSetDir
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class DataSetDirectoryImpl extends ServiceYesNoImpl implements DataSetDir
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class DataSetDirectoryImpl extends ServiceYesNoImpl implements DataSetDir
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__DATA_SET_DIRECTORY, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__DATA_SET_DIRECTORY, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class DataSetDirectoryImpl extends ServiceYesNoImpl implements DataSetDir
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class DataSetDirectoryImpl extends ServiceYesNoImpl implements DataSetDir
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class DataSetDirectoryImpl extends ServiceYesNoImpl implements DataSetDir
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class DataSetDirectoryImpl extends ServiceYesNoImpl implements DataSetDir
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //DataSetDirectoryImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataSetImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataSetImpl.java
index 69b68c3..6a34468 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataSetImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataSetImpl.java
@@ -63,7 +63,7 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      * @generated
      * @ordered
      */
-    protected EList<Control> referredByControl;
+    protected EList< Control > referredByControl;
 
     /**
      * The cached value of the '{@link #getFCDA() <em>FCDA</em>}' containment reference list.
@@ -73,7 +73,7 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      * @generated
      * @ordered
      */
-    protected EList<FCDA> fcda;
+    protected EList< FCDA > fcda;
 
     /**
      * The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -130,8 +130,8 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      */
     @Override
     public AnyLN getParentAnyLN() {
-        if (eContainerFeatureID() != SclPackage.DATA_SET__PARENT_ANY_LN) return null;
-        return (AnyLN)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.DATA_SET__PARENT_ANY_LN ) return null;
+        return ( AnyLN ) eInternalContainer();
     }
 
     /**
@@ -139,8 +139,8 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAnyLN(AnyLN newParentAnyLN, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAnyLN, SclPackage.DATA_SET__PARENT_ANY_LN, msgs);
+    public NotificationChain basicSetParentAnyLN( AnyLN newParentAnyLN, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAnyLN, SclPackage.DATA_SET__PARENT_ANY_LN, msgs );
         return msgs;
     }
 
@@ -150,20 +150,23 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      * @generated
      */
     @Override
-    public void setParentAnyLN(AnyLN newParentAnyLN) {
-        if (newParentAnyLN != eInternalContainer() || (eContainerFeatureID() != SclPackage.DATA_SET__PARENT_ANY_LN && newParentAnyLN != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAnyLN))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAnyLN( AnyLN newParentAnyLN ) {
+        if( newParentAnyLN != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.DATA_SET__PARENT_ANY_LN && newParentAnyLN != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAnyLN ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAnyLN != null)
-                msgs = ((InternalEObject)newParentAnyLN).eInverseAdd(this, SclPackage.ANY_LN__DATA_SET, AnyLN.class, msgs);
-            msgs = basicSetParentAnyLN(newParentAnyLN, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAnyLN != null )
+                msgs = ( ( InternalEObject ) newParentAnyLN ).eInverseAdd( this, SclPackage.ANY_LN__DATA_SET,
+                        AnyLN.class, msgs );
+            msgs = basicSetParentAnyLN( newParentAnyLN, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DATA_SET__PARENT_ANY_LN, newParentAnyLN, newParentAnyLN));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DATA_SET__PARENT_ANY_LN, newParentAnyLN,
+                    newParentAnyLN ) );
     }
 
     /**
@@ -172,9 +175,10 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      * @generated
      */
     @Override
-    public EList<Control> getReferredByControl() {
-        if (referredByControl == null) {
-            referredByControl = new EObjectWithInverseEList.Unsettable<Control>(Control.class, this, SclPackage.DATA_SET__REFERRED_BY_CONTROL, SclPackage.CONTROL__REFERS_TO_DATA_SET);
+    public EList< Control > getReferredByControl() {
+        if( referredByControl == null ) {
+            referredByControl = new EObjectWithInverseEList.Unsettable< Control >( Control.class, this,
+                    SclPackage.DATA_SET__REFERRED_BY_CONTROL, SclPackage.CONTROL__REFERS_TO_DATA_SET );
         }
         return referredByControl;
     }
@@ -186,7 +190,7 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      */
     @Override
     public void unsetReferredByControl() {
-        if (referredByControl != null) ((InternalEList.Unsettable<?>)referredByControl).unset();
+        if( referredByControl != null ) ( ( InternalEList.Unsettable< ? > ) referredByControl ).unset();
     }
 
     /**
@@ -196,7 +200,7 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      */
     @Override
     public boolean isSetReferredByControl() {
-        return referredByControl != null && ((InternalEList.Unsettable<?>)referredByControl).isSet();
+        return referredByControl != null && ( ( InternalEList.Unsettable< ? > ) referredByControl ).isSet();
     }
 
     /**
@@ -205,9 +209,10 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      * @generated
      */
     @Override
-    public EList<FCDA> getFCDA() {
-        if (fcda == null) {
-            fcda = new EObjectContainmentWithInverseEList.Unsettable<FCDA>(FCDA.class, this, SclPackage.DATA_SET__FCDA, SclPackage.FCDA__PARENT_DATA_SET);
+    public EList< FCDA > getFCDA() {
+        if( fcda == null ) {
+            fcda = new EObjectContainmentWithInverseEList.Unsettable< FCDA >( FCDA.class, this,
+                    SclPackage.DATA_SET__FCDA, SclPackage.FCDA__PARENT_DATA_SET );
         }
         return fcda;
     }
@@ -219,7 +224,7 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      */
     @Override
     public void unsetFCDA() {
-        if (fcda != null) ((InternalEList.Unsettable<?>)fcda).unset();
+        if( fcda != null ) ( ( InternalEList.Unsettable< ? > ) fcda ).unset();
     }
 
     /**
@@ -229,7 +234,7 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      */
     @Override
     public boolean isSetFCDA() {
-        return fcda != null && ((InternalEList.Unsettable<?>)fcda).isSet();
+        return fcda != null && ( ( InternalEList.Unsettable< ? > ) fcda ).isSet();
     }
 
     /**
@@ -248,13 +253,14 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      * @generated
      */
     @Override
-    public void setName(String newName) {
+    public void setName( String newName ) {
         String oldName = name;
         name = newName;
         boolean oldNameESet = nameESet;
         nameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DATA_SET__NAME, oldName, name, !oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DATA_SET__NAME, oldName, name,
+                    !oldNameESet ) );
     }
 
     /**
@@ -268,8 +274,9 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
         boolean oldNameESet = nameESet;
         name = NAME_EDEFAULT;
         nameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DATA_SET__NAME, oldName, NAME_EDEFAULT, oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DATA_SET__NAME, oldName, NAME_EDEFAULT,
+                    oldNameESet ) );
     }
 
     /**
@@ -290,17 +297,18 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DATA_SET__PARENT_ANY_LN:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAnyLN((AnyLN)otherEnd, msgs);
-            case SclPackage.DATA_SET__REFERRED_BY_CONTROL:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByControl()).basicAdd(otherEnd, msgs);
-            case SclPackage.DATA_SET__FCDA:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getFCDA()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DATA_SET__PARENT_ANY_LN:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAnyLN( ( AnyLN ) otherEnd, msgs );
+        case SclPackage.DATA_SET__REFERRED_BY_CONTROL:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByControl() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.DATA_SET__FCDA:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getFCDA() ).basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -310,15 +318,15 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DATA_SET__PARENT_ANY_LN:
-                return basicSetParentAnyLN(null, msgs);
-            case SclPackage.DATA_SET__REFERRED_BY_CONTROL:
-                return ((InternalEList<?>)getReferredByControl()).basicRemove(otherEnd, msgs);
-            case SclPackage.DATA_SET__FCDA:
-                return ((InternalEList<?>)getFCDA()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DATA_SET__PARENT_ANY_LN:
+            return basicSetParentAnyLN( null, msgs );
+        case SclPackage.DATA_SET__REFERRED_BY_CONTROL:
+            return ( ( InternalEList< ? > ) getReferredByControl() ).basicRemove( otherEnd, msgs );
+        case SclPackage.DATA_SET__FCDA:
+            return ( ( InternalEList< ? > ) getFCDA() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -328,11 +336,11 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.DATA_SET__PARENT_ANY_LN:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ANY_LN__DATA_SET, AnyLN.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.DATA_SET__PARENT_ANY_LN:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ANY_LN__DATA_SET, AnyLN.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -342,17 +350,17 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.DATA_SET__PARENT_ANY_LN:
-                return getParentAnyLN();
-            case SclPackage.DATA_SET__REFERRED_BY_CONTROL:
-                return getReferredByControl();
-            case SclPackage.DATA_SET__FCDA:
-                return getFCDA();
-            case SclPackage.DATA_SET__NAME:
-                return getName();
+        switch( featureID ) {
+        case SclPackage.DATA_SET__PARENT_ANY_LN:
+            return getParentAnyLN();
+        case SclPackage.DATA_SET__REFERRED_BY_CONTROL:
+            return getReferredByControl();
+        case SclPackage.DATA_SET__FCDA:
+            return getFCDA();
+        case SclPackage.DATA_SET__NAME:
+            return getName();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -363,23 +371,23 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.DATA_SET__PARENT_ANY_LN:
-                setParentAnyLN((AnyLN)newValue);
-                return;
-            case SclPackage.DATA_SET__REFERRED_BY_CONTROL:
-                getReferredByControl().clear();
-                getReferredByControl().addAll((Collection<? extends Control>)newValue);
-                return;
-            case SclPackage.DATA_SET__FCDA:
-                getFCDA().clear();
-                getFCDA().addAll((Collection<? extends FCDA>)newValue);
-                return;
-            case SclPackage.DATA_SET__NAME:
-                setName((String)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.DATA_SET__PARENT_ANY_LN:
+            setParentAnyLN( ( AnyLN ) newValue );
+            return;
+        case SclPackage.DATA_SET__REFERRED_BY_CONTROL:
+            getReferredByControl().clear();
+            getReferredByControl().addAll( ( Collection< ? extends Control > ) newValue );
+            return;
+        case SclPackage.DATA_SET__FCDA:
+            getFCDA().clear();
+            getFCDA().addAll( ( Collection< ? extends FCDA > ) newValue );
+            return;
+        case SclPackage.DATA_SET__NAME:
+            setName( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -389,21 +397,21 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DATA_SET__PARENT_ANY_LN:
-                setParentAnyLN((AnyLN)null);
-                return;
-            case SclPackage.DATA_SET__REFERRED_BY_CONTROL:
-                unsetReferredByControl();
-                return;
-            case SclPackage.DATA_SET__FCDA:
-                unsetFCDA();
-                return;
-            case SclPackage.DATA_SET__NAME:
-                unsetName();
-                return;
+        switch( featureID ) {
+        case SclPackage.DATA_SET__PARENT_ANY_LN:
+            setParentAnyLN( ( AnyLN ) null );
+            return;
+        case SclPackage.DATA_SET__REFERRED_BY_CONTROL:
+            unsetReferredByControl();
+            return;
+        case SclPackage.DATA_SET__FCDA:
+            unsetFCDA();
+            return;
+        case SclPackage.DATA_SET__NAME:
+            unsetName();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -413,17 +421,17 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DATA_SET__PARENT_ANY_LN:
-                return getParentAnyLN() != null;
-            case SclPackage.DATA_SET__REFERRED_BY_CONTROL:
-                return isSetReferredByControl();
-            case SclPackage.DATA_SET__FCDA:
-                return isSetFCDA();
-            case SclPackage.DATA_SET__NAME:
-                return isSetName();
+        switch( featureID ) {
+        case SclPackage.DATA_SET__PARENT_ANY_LN:
+            return getParentAnyLN() != null;
+        case SclPackage.DATA_SET__REFERRED_BY_CONTROL:
+            return isSetReferredByControl();
+        case SclPackage.DATA_SET__FCDA:
+            return isSetFCDA();
+        case SclPackage.DATA_SET__NAME:
+            return isSetName();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -433,12 +441,15 @@ public class DataSetImpl extends UnNamingImpl implements DataSet {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (name: ");
-        if (nameESet) result.append(name); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (name: " );
+        if( nameESet )
+            result.append( name );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataTypeTemplatesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataTypeTemplatesImpl.java
index 4322268..751f302 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataTypeTemplatesImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DataTypeTemplatesImpl.java
@@ -65,7 +65,7 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      * @generated
      * @ordered
      */
-    protected EList<DAType> daType;
+    protected EList< DAType > daType;
 
     /**
      * The cached value of the '{@link #getDOType() <em>DO Type</em>}' containment reference list.
@@ -75,7 +75,7 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      * @generated
      * @ordered
      */
-    protected EList<DOType> doType;
+    protected EList< DOType > doType;
 
     /**
      * The cached value of the '{@link #getEnumType() <em>Enum Type</em>}' containment reference list.
@@ -85,7 +85,7 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      * @generated
      * @ordered
      */
-    protected EList<EnumType> enumType;
+    protected EList< EnumType > enumType;
 
     /**
      * The cached value of the '{@link #getLNodeType() <em>LNode Type</em>}' containment reference list.
@@ -95,7 +95,7 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      * @generated
      * @ordered
      */
-    protected EList<LNodeType> lNodeType;
+    protected EList< LNodeType > lNodeType;
 
     /**
      * <!-- begin-user-doc -->
@@ -122,9 +122,10 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      * @generated
      */
     @Override
-    public EList<DAType> getDAType() {
-        if (daType == null) {
-            daType = new EObjectContainmentWithInverseEList.Unsettable<DAType>(DAType.class, this, SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE, SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES);
+    public EList< DAType > getDAType() {
+        if( daType == null ) {
+            daType = new EObjectContainmentWithInverseEList.Unsettable< DAType >( DAType.class, this,
+                    SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE, SclPackage.DA_TYPE__PARENT_DATA_TYPE_TEMPLATES );
         }
         return daType;
     }
@@ -136,7 +137,7 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      */
     @Override
     public void unsetDAType() {
-        if (daType != null) ((InternalEList.Unsettable<?>)daType).unset();
+        if( daType != null ) ( ( InternalEList.Unsettable< ? > ) daType ).unset();
     }
 
     /**
@@ -146,7 +147,7 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      */
     @Override
     public boolean isSetDAType() {
-        return daType != null && ((InternalEList.Unsettable<?>)daType).isSet();
+        return daType != null && ( ( InternalEList.Unsettable< ? > ) daType ).isSet();
     }
 
     /**
@@ -155,9 +156,10 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      * @generated
      */
     @Override
-    public EList<DOType> getDOType() {
-        if (doType == null) {
-            doType = new EObjectContainmentWithInverseEList.Unsettable<DOType>(DOType.class, this, SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE, SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES);
+    public EList< DOType > getDOType() {
+        if( doType == null ) {
+            doType = new EObjectContainmentWithInverseEList.Unsettable< DOType >( DOType.class, this,
+                    SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE, SclPackage.DO_TYPE__PARENT_DATA_TYPE_TEMPLATES );
         }
         return doType;
     }
@@ -169,7 +171,7 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      */
     @Override
     public void unsetDOType() {
-        if (doType != null) ((InternalEList.Unsettable<?>)doType).unset();
+        if( doType != null ) ( ( InternalEList.Unsettable< ? > ) doType ).unset();
     }
 
     /**
@@ -179,7 +181,7 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      */
     @Override
     public boolean isSetDOType() {
-        return doType != null && ((InternalEList.Unsettable<?>)doType).isSet();
+        return doType != null && ( ( InternalEList.Unsettable< ? > ) doType ).isSet();
     }
 
     /**
@@ -188,9 +190,10 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      * @generated
      */
     @Override
-    public EList<EnumType> getEnumType() {
-        if (enumType == null) {
-            enumType = new EObjectContainmentWithInverseEList.Unsettable<EnumType>(EnumType.class, this, SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE, SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES);
+    public EList< EnumType > getEnumType() {
+        if( enumType == null ) {
+            enumType = new EObjectContainmentWithInverseEList.Unsettable< EnumType >( EnumType.class, this,
+                    SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE, SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES );
         }
         return enumType;
     }
@@ -202,7 +205,7 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      */
     @Override
     public void unsetEnumType() {
-        if (enumType != null) ((InternalEList.Unsettable<?>)enumType).unset();
+        if( enumType != null ) ( ( InternalEList.Unsettable< ? > ) enumType ).unset();
     }
 
     /**
@@ -212,7 +215,7 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      */
     @Override
     public boolean isSetEnumType() {
-        return enumType != null && ((InternalEList.Unsettable<?>)enumType).isSet();
+        return enumType != null && ( ( InternalEList.Unsettable< ? > ) enumType ).isSet();
     }
 
     /**
@@ -221,9 +224,10 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      * @generated
      */
     @Override
-    public EList<LNodeType> getLNodeType() {
-        if (lNodeType == null) {
-            lNodeType = new EObjectContainmentWithInverseEList.Unsettable<LNodeType>(LNodeType.class, this, SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE, SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES);
+    public EList< LNodeType > getLNodeType() {
+        if( lNodeType == null ) {
+            lNodeType = new EObjectContainmentWithInverseEList.Unsettable< LNodeType >( LNodeType.class, this,
+                    SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE, SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES );
         }
         return lNodeType;
     }
@@ -235,7 +239,7 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      */
     @Override
     public void unsetLNodeType() {
-        if (lNodeType != null) ((InternalEList.Unsettable<?>)lNodeType).unset();
+        if( lNodeType != null ) ( ( InternalEList.Unsettable< ? > ) lNodeType ).unset();
     }
 
     /**
@@ -245,7 +249,7 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      */
     @Override
     public boolean isSetLNodeType() {
-        return lNodeType != null && ((InternalEList.Unsettable<?>)lNodeType).isSet();
+        return lNodeType != null && ( ( InternalEList.Unsettable< ? > ) lNodeType ).isSet();
     }
 
     /**
@@ -255,8 +259,8 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      */
     @Override
     public SCL getParentSCL() {
-        if (eContainerFeatureID() != SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL) return null;
-        return (SCL)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL ) return null;
+        return ( SCL ) eInternalContainer();
     }
 
     /**
@@ -264,8 +268,8 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSCL(SCL newParentSCL, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSCL, SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL, msgs);
+    public NotificationChain basicSetParentSCL( SCL newParentSCL, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSCL, SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL, msgs );
         return msgs;
     }
 
@@ -275,20 +279,23 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      * @generated
      */
     @Override
-    public void setParentSCL(SCL newParentSCL) {
-        if (newParentSCL != eInternalContainer() || (eContainerFeatureID() != SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL && newParentSCL != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSCL))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSCL( SCL newParentSCL ) {
+        if( newParentSCL != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL && newParentSCL != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSCL ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSCL != null)
-                msgs = ((InternalEObject)newParentSCL).eInverseAdd(this, SclPackage.SCL__DATA_TYPE_TEMPLATES, SCL.class, msgs);
-            msgs = basicSetParentSCL(newParentSCL, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSCL != null )
+                msgs = ( ( InternalEObject ) newParentSCL ).eInverseAdd( this, SclPackage.SCL__DATA_TYPE_TEMPLATES,
+                        SCL.class, msgs );
+            msgs = basicSetParentSCL( newParentSCL, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL, newParentSCL, newParentSCL));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL,
+                    newParentSCL, newParentSCL ) );
     }
 
     /**
@@ -299,21 +306,25 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getDAType()).basicAdd(otherEnd, msgs);
-            case SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getDOType()).basicAdd(otherEnd, msgs);
-            case SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getEnumType()).basicAdd(otherEnd, msgs);
-            case SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getLNodeType()).basicAdd(otherEnd, msgs);
-            case SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSCL((SCL)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getDAType() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getDOType() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getEnumType() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getLNodeType() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSCL( ( SCL ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -323,19 +334,19 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE:
-                return ((InternalEList<?>)getDAType()).basicRemove(otherEnd, msgs);
-            case SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE:
-                return ((InternalEList<?>)getDOType()).basicRemove(otherEnd, msgs);
-            case SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE:
-                return ((InternalEList<?>)getEnumType()).basicRemove(otherEnd, msgs);
-            case SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE:
-                return ((InternalEList<?>)getLNodeType()).basicRemove(otherEnd, msgs);
-            case SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL:
-                return basicSetParentSCL(null, msgs);
+        switch( featureID ) {
+        case SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE:
+            return ( ( InternalEList< ? > ) getDAType() ).basicRemove( otherEnd, msgs );
+        case SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE:
+            return ( ( InternalEList< ? > ) getDOType() ).basicRemove( otherEnd, msgs );
+        case SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE:
+            return ( ( InternalEList< ? > ) getEnumType() ).basicRemove( otherEnd, msgs );
+        case SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE:
+            return ( ( InternalEList< ? > ) getLNodeType() ).basicRemove( otherEnd, msgs );
+        case SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL:
+            return basicSetParentSCL( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -345,11 +356,11 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SCL__DATA_TYPE_TEMPLATES, SCL.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SCL__DATA_TYPE_TEMPLATES, SCL.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -359,19 +370,19 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE:
-                return getDAType();
-            case SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE:
-                return getDOType();
-            case SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE:
-                return getEnumType();
-            case SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE:
-                return getLNodeType();
-            case SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL:
-                return getParentSCL();
+        switch( featureID ) {
+        case SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE:
+            return getDAType();
+        case SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE:
+            return getDOType();
+        case SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE:
+            return getEnumType();
+        case SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE:
+            return getLNodeType();
+        case SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL:
+            return getParentSCL();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -382,28 +393,28 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE:
-                getDAType().clear();
-                getDAType().addAll((Collection<? extends DAType>)newValue);
-                return;
-            case SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE:
-                getDOType().clear();
-                getDOType().addAll((Collection<? extends DOType>)newValue);
-                return;
-            case SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE:
-                getEnumType().clear();
-                getEnumType().addAll((Collection<? extends EnumType>)newValue);
-                return;
-            case SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE:
-                getLNodeType().clear();
-                getLNodeType().addAll((Collection<? extends LNodeType>)newValue);
-                return;
-            case SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL:
-                setParentSCL((SCL)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE:
+            getDAType().clear();
+            getDAType().addAll( ( Collection< ? extends DAType > ) newValue );
+            return;
+        case SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE:
+            getDOType().clear();
+            getDOType().addAll( ( Collection< ? extends DOType > ) newValue );
+            return;
+        case SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE:
+            getEnumType().clear();
+            getEnumType().addAll( ( Collection< ? extends EnumType > ) newValue );
+            return;
+        case SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE:
+            getLNodeType().clear();
+            getLNodeType().addAll( ( Collection< ? extends LNodeType > ) newValue );
+            return;
+        case SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL:
+            setParentSCL( ( SCL ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -413,24 +424,24 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE:
-                unsetDAType();
-                return;
-            case SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE:
-                unsetDOType();
-                return;
-            case SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE:
-                unsetEnumType();
-                return;
-            case SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE:
-                unsetLNodeType();
-                return;
-            case SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL:
-                setParentSCL((SCL)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE:
+            unsetDAType();
+            return;
+        case SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE:
+            unsetDOType();
+            return;
+        case SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE:
+            unsetEnumType();
+            return;
+        case SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE:
+            unsetLNodeType();
+            return;
+        case SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL:
+            setParentSCL( ( SCL ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -440,19 +451,19 @@ public class DataTypeTemplatesImpl extends SclObjectImpl implements DataTypeTemp
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE:
-                return isSetDAType();
-            case SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE:
-                return isSetDOType();
-            case SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE:
-                return isSetEnumType();
-            case SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE:
-                return isSetLNodeType();
-            case SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL:
-                return getParentSCL() != null;
+        switch( featureID ) {
+        case SclPackage.DATA_TYPE_TEMPLATES__DA_TYPE:
+            return isSetDAType();
+        case SclPackage.DATA_TYPE_TEMPLATES__DO_TYPE:
+            return isSetDOType();
+        case SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE:
+            return isSetEnumType();
+        case SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE:
+            return isSetLNodeType();
+        case SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL:
+            return getParentSCL() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //DataTypeTemplatesImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DurationInMilliSecImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DurationInMilliSecImpl.java
index d5067af..672dc9e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DurationInMilliSecImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DurationInMilliSecImpl.java
@@ -152,11 +152,12 @@ public class DurationInMilliSecImpl extends SclObjectImpl implements DurationInM
      * @generated
      */
     @Override
-    public void setValue(BigDecimal newValue) {
+    public void setValue( BigDecimal newValue ) {
         BigDecimal oldValue = value;
         value = newValue;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DURATION_IN_MILLI_SEC__VALUE, oldValue, value));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DURATION_IN_MILLI_SEC__VALUE, oldValue,
+                    value ) );
     }
 
     /**
@@ -175,13 +176,14 @@ public class DurationInMilliSecImpl extends SclObjectImpl implements DurationInM
      * @generated
      */
     @Override
-    public void setMultiplier(UnitMultiplierEnum newMultiplier) {
+    public void setMultiplier( UnitMultiplierEnum newMultiplier ) {
         UnitMultiplierEnum oldMultiplier = multiplier;
         multiplier = newMultiplier == null ? MULTIPLIER_EDEFAULT : newMultiplier;
         boolean oldMultiplierESet = multiplierESet;
         multiplierESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DURATION_IN_MILLI_SEC__MULTIPLIER, oldMultiplier, multiplier, !oldMultiplierESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DURATION_IN_MILLI_SEC__MULTIPLIER,
+                    oldMultiplier, multiplier, !oldMultiplierESet ) );
     }
 
     /**
@@ -195,8 +197,9 @@ public class DurationInMilliSecImpl extends SclObjectImpl implements DurationInM
         boolean oldMultiplierESet = multiplierESet;
         multiplier = MULTIPLIER_EDEFAULT;
         multiplierESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DURATION_IN_MILLI_SEC__MULTIPLIER, oldMultiplier, MULTIPLIER_EDEFAULT, oldMultiplierESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DURATION_IN_MILLI_SEC__MULTIPLIER,
+                    oldMultiplier, MULTIPLIER_EDEFAULT, oldMultiplierESet ) );
     }
 
     /**
@@ -225,13 +228,14 @@ public class DurationInMilliSecImpl extends SclObjectImpl implements DurationInM
      * @generated
      */
     @Override
-    public void setUnit(String newUnit) {
+    public void setUnit( String newUnit ) {
         String oldUnit = unit;
         unit = newUnit;
         boolean oldUnitESet = unitESet;
         unitESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DURATION_IN_MILLI_SEC__UNIT, oldUnit, unit, !oldUnitESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DURATION_IN_MILLI_SEC__UNIT, oldUnit,
+                    unit, !oldUnitESet ) );
     }
 
     /**
@@ -245,8 +249,9 @@ public class DurationInMilliSecImpl extends SclObjectImpl implements DurationInM
         boolean oldUnitESet = unitESet;
         unit = UNIT_EDEFAULT;
         unitESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.DURATION_IN_MILLI_SEC__UNIT, oldUnit, UNIT_EDEFAULT, oldUnitESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DURATION_IN_MILLI_SEC__UNIT, oldUnit,
+                    UNIT_EDEFAULT, oldUnitESet ) );
     }
 
     /**
@@ -265,16 +270,16 @@ public class DurationInMilliSecImpl extends SclObjectImpl implements DurationInM
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.DURATION_IN_MILLI_SEC__VALUE:
-                return getValue();
-            case SclPackage.DURATION_IN_MILLI_SEC__MULTIPLIER:
-                return getMultiplier();
-            case SclPackage.DURATION_IN_MILLI_SEC__UNIT:
-                return getUnit();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.DURATION_IN_MILLI_SEC__VALUE:
+            return getValue();
+        case SclPackage.DURATION_IN_MILLI_SEC__MULTIPLIER:
+            return getMultiplier();
+        case SclPackage.DURATION_IN_MILLI_SEC__UNIT:
+            return getUnit();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -283,19 +288,19 @@ public class DurationInMilliSecImpl extends SclObjectImpl implements DurationInM
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.DURATION_IN_MILLI_SEC__VALUE:
-                setValue((BigDecimal)newValue);
-                return;
-            case SclPackage.DURATION_IN_MILLI_SEC__MULTIPLIER:
-                setMultiplier((UnitMultiplierEnum)newValue);
-                return;
-            case SclPackage.DURATION_IN_MILLI_SEC__UNIT:
-                setUnit((String)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.DURATION_IN_MILLI_SEC__VALUE:
+            setValue( ( BigDecimal ) newValue );
+            return;
+        case SclPackage.DURATION_IN_MILLI_SEC__MULTIPLIER:
+            setMultiplier( ( UnitMultiplierEnum ) newValue );
+            return;
+        case SclPackage.DURATION_IN_MILLI_SEC__UNIT:
+            setUnit( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -304,19 +309,19 @@ public class DurationInMilliSecImpl extends SclObjectImpl implements DurationInM
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.DURATION_IN_MILLI_SEC__VALUE:
-                setValue(VALUE_EDEFAULT);
-                return;
-            case SclPackage.DURATION_IN_MILLI_SEC__MULTIPLIER:
-                unsetMultiplier();
-                return;
-            case SclPackage.DURATION_IN_MILLI_SEC__UNIT:
-                unsetUnit();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.DURATION_IN_MILLI_SEC__VALUE:
+            setValue( VALUE_EDEFAULT );
+            return;
+        case SclPackage.DURATION_IN_MILLI_SEC__MULTIPLIER:
+            unsetMultiplier();
+            return;
+        case SclPackage.DURATION_IN_MILLI_SEC__UNIT:
+            unsetUnit();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -325,16 +330,16 @@ public class DurationInMilliSecImpl extends SclObjectImpl implements DurationInM
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.DURATION_IN_MILLI_SEC__VALUE:
-                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-            case SclPackage.DURATION_IN_MILLI_SEC__MULTIPLIER:
-                return isSetMultiplier();
-            case SclPackage.DURATION_IN_MILLI_SEC__UNIT:
-                return isSetUnit();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.DURATION_IN_MILLI_SEC__VALUE:
+            return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals( value );
+        case SclPackage.DURATION_IN_MILLI_SEC__MULTIPLIER:
+            return isSetMultiplier();
+        case SclPackage.DURATION_IN_MILLI_SEC__UNIT:
+            return isSetUnit();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -344,16 +349,22 @@ public class DurationInMilliSecImpl extends SclObjectImpl implements DurationInM
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (value: ");
-        result.append(value);
-        result.append(", multiplier: ");
-        if (multiplierESet) result.append(multiplier); else result.append("<unset>");
-        result.append(", unit: ");
-        if (unitESet) result.append(unit); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (value: " );
+        result.append( value );
+        result.append( ", multiplier: " );
+        if( multiplierESet )
+            result.append( multiplier );
+        else
+            result.append( "<unset>" );
+        result.append( ", unit: " );
+        if( unitESet )
+            result.append( unit );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DynAssociationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DynAssociationImpl.java
index 70f02bf..4b50c7f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DynAssociationImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DynAssociationImpl.java
@@ -71,8 +71,8 @@ public class DynAssociationImpl extends ServiceWithOptionalMaxImpl implements Dy
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.DYN_ASSOCIATION__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.DYN_ASSOCIATION__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class DynAssociationImpl extends ServiceWithOptionalMaxImpl implements Dy
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.DYN_ASSOCIATION__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.DYN_ASSOCIATION__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class DynAssociationImpl extends ServiceWithOptionalMaxImpl implements Dy
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.DYN_ASSOCIATION__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.DYN_ASSOCIATION__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__DYN_ASSOCIATION, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this,
+                        SclPackage.SERVICES__DYN_ASSOCIATION, Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DYN_ASSOCIATION__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DYN_ASSOCIATION__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class DynAssociationImpl extends ServiceWithOptionalMaxImpl implements Dy
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DYN_ASSOCIATION__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DYN_ASSOCIATION__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class DynAssociationImpl extends ServiceWithOptionalMaxImpl implements Dy
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DYN_ASSOCIATION__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.DYN_ASSOCIATION__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class DynAssociationImpl extends ServiceWithOptionalMaxImpl implements Dy
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.DYN_ASSOCIATION__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__DYN_ASSOCIATION, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.DYN_ASSOCIATION__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__DYN_ASSOCIATION, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class DynAssociationImpl extends ServiceWithOptionalMaxImpl implements Dy
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.DYN_ASSOCIATION__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.DYN_ASSOCIATION__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class DynAssociationImpl extends ServiceWithOptionalMaxImpl implements Dy
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.DYN_ASSOCIATION__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.DYN_ASSOCIATION__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class DynAssociationImpl extends ServiceWithOptionalMaxImpl implements Dy
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DYN_ASSOCIATION__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.DYN_ASSOCIATION__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class DynAssociationImpl extends ServiceWithOptionalMaxImpl implements Dy
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DYN_ASSOCIATION__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.DYN_ASSOCIATION__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //DynAssociationImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DynDataSetImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DynDataSetImpl.java
index 594c41b..153cd0d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DynDataSetImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DynDataSetImpl.java
@@ -71,8 +71,8 @@ public class DynDataSetImpl extends ServiceWithMaxAndMaxAttributesImpl implement
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.DYN_DATA_SET__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.DYN_DATA_SET__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class DynDataSetImpl extends ServiceWithMaxAndMaxAttributesImpl implement
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.DYN_DATA_SET__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.DYN_DATA_SET__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class DynDataSetImpl extends ServiceWithMaxAndMaxAttributesImpl implement
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.DYN_DATA_SET__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.DYN_DATA_SET__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__DYN_DATA_SET, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__DYN_DATA_SET,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.DYN_DATA_SET__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DYN_DATA_SET__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class DynDataSetImpl extends ServiceWithMaxAndMaxAttributesImpl implement
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DYN_DATA_SET__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.DYN_DATA_SET__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class DynDataSetImpl extends ServiceWithMaxAndMaxAttributesImpl implement
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.DYN_DATA_SET__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.DYN_DATA_SET__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,11 @@ public class DynDataSetImpl extends ServiceWithMaxAndMaxAttributesImpl implement
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.DYN_DATA_SET__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__DYN_DATA_SET, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.DYN_DATA_SET__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__DYN_DATA_SET, Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +163,11 @@ public class DynDataSetImpl extends ServiceWithMaxAndMaxAttributesImpl implement
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.DYN_DATA_SET__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.DYN_DATA_SET__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +177,12 @@ public class DynDataSetImpl extends ServiceWithMaxAndMaxAttributesImpl implement
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.DYN_DATA_SET__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.DYN_DATA_SET__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +192,12 @@ public class DynDataSetImpl extends ServiceWithMaxAndMaxAttributesImpl implement
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DYN_DATA_SET__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.DYN_DATA_SET__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +207,11 @@ public class DynDataSetImpl extends ServiceWithMaxAndMaxAttributesImpl implement
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.DYN_DATA_SET__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.DYN_DATA_SET__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //DynDataSetImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EnumTypeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EnumTypeImpl.java
index 0a729d5..1b01efb 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EnumTypeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EnumTypeImpl.java
@@ -62,7 +62,7 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      * @generated
      * @ordered
      */
-    protected EList<AbstractDataAttribute> referredByAbstractDataAttribute;
+    protected EList< AbstractDataAttribute > referredByAbstractDataAttribute;
 
     /**
      * The cached value of the '{@link #getEnumVal() <em>Enum Val</em>}' containment reference list.
@@ -72,7 +72,7 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      * @generated
      * @ordered
      */
-    protected EList<EnumVal> enumVal;
+    protected EList< EnumVal > enumVal;
 
     /**
      * <!-- begin-user-doc -->
@@ -99,9 +99,11 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      * @generated
      */
     @Override
-    public EList<AbstractDataAttribute> getReferredByAbstractDataAttribute() {
-        if (referredByAbstractDataAttribute == null) {
-            referredByAbstractDataAttribute = new EObjectWithInverseEList.Unsettable<AbstractDataAttribute>(AbstractDataAttribute.class, this, SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE);
+    public EList< AbstractDataAttribute > getReferredByAbstractDataAttribute() {
+        if( referredByAbstractDataAttribute == null ) {
+            referredByAbstractDataAttribute = new EObjectWithInverseEList.Unsettable< AbstractDataAttribute >(
+                    AbstractDataAttribute.class, this, SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE );
         }
         return referredByAbstractDataAttribute;
     }
@@ -113,7 +115,8 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      */
     @Override
     public void unsetReferredByAbstractDataAttribute() {
-        if (referredByAbstractDataAttribute != null) ((InternalEList.Unsettable<?>)referredByAbstractDataAttribute).unset();
+        if( referredByAbstractDataAttribute != null )
+            ( ( InternalEList.Unsettable< ? > ) referredByAbstractDataAttribute ).unset();
     }
 
     /**
@@ -123,7 +126,8 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      */
     @Override
     public boolean isSetReferredByAbstractDataAttribute() {
-        return referredByAbstractDataAttribute != null && ((InternalEList.Unsettable<?>)referredByAbstractDataAttribute).isSet();
+        return referredByAbstractDataAttribute != null
+                && ( ( InternalEList.Unsettable< ? > ) referredByAbstractDataAttribute ).isSet();
     }
 
     /**
@@ -133,8 +137,8 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      */
     @Override
     public DataTypeTemplates getParentDataTypeTemplates() {
-        if (eContainerFeatureID() != SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES) return null;
-        return (DataTypeTemplates)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES ) return null;
+        return ( DataTypeTemplates ) eInternalContainer();
     }
 
     /**
@@ -142,8 +146,10 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentDataTypeTemplates(DataTypeTemplates newParentDataTypeTemplates, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentDataTypeTemplates, SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES, msgs);
+    public NotificationChain basicSetParentDataTypeTemplates( DataTypeTemplates newParentDataTypeTemplates,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentDataTypeTemplates,
+                SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES, msgs );
         return msgs;
     }
 
@@ -153,20 +159,24 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      * @generated
      */
     @Override
-    public void setParentDataTypeTemplates(DataTypeTemplates newParentDataTypeTemplates) {
-        if (newParentDataTypeTemplates != eInternalContainer() || (eContainerFeatureID() != SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES && newParentDataTypeTemplates != null)) {
-            if (EcoreUtil.isAncestor(this, newParentDataTypeTemplates))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentDataTypeTemplates( DataTypeTemplates newParentDataTypeTemplates ) {
+        if( newParentDataTypeTemplates != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES
+                        && newParentDataTypeTemplates != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentDataTypeTemplates ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentDataTypeTemplates != null)
-                msgs = ((InternalEObject)newParentDataTypeTemplates).eInverseAdd(this, SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE, DataTypeTemplates.class, msgs);
-            msgs = basicSetParentDataTypeTemplates(newParentDataTypeTemplates, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentDataTypeTemplates != null )
+                msgs = ( ( InternalEObject ) newParentDataTypeTemplates ).eInverseAdd( this,
+                        SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE, DataTypeTemplates.class, msgs );
+            msgs = basicSetParentDataTypeTemplates( newParentDataTypeTemplates, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES, newParentDataTypeTemplates, newParentDataTypeTemplates));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES,
+                    newParentDataTypeTemplates, newParentDataTypeTemplates ) );
     }
 
     /**
@@ -175,9 +185,10 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      * @generated
      */
     @Override
-    public EList<EnumVal> getEnumVal() {
-        if (enumVal == null) {
-            enumVal = new EObjectContainmentWithInverseEList.Unsettable<EnumVal>(EnumVal.class, this, SclPackage.ENUM_TYPE__ENUM_VAL, SclPackage.ENUM_VAL__PARENT_ENUM_TYPE);
+    public EList< EnumVal > getEnumVal() {
+        if( enumVal == null ) {
+            enumVal = new EObjectContainmentWithInverseEList.Unsettable< EnumVal >( EnumVal.class, this,
+                    SclPackage.ENUM_TYPE__ENUM_VAL, SclPackage.ENUM_VAL__PARENT_ENUM_TYPE );
         }
         return enumVal;
     }
@@ -189,7 +200,7 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      */
     @Override
     public void unsetEnumVal() {
-        if (enumVal != null) ((InternalEList.Unsettable<?>)enumVal).unset();
+        if( enumVal != null ) ( ( InternalEList.Unsettable< ? > ) enumVal ).unset();
     }
 
     /**
@@ -199,7 +210,7 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      */
     @Override
     public boolean isSetEnumVal() {
-        return enumVal != null && ((InternalEList.Unsettable<?>)enumVal).isSet();
+        return enumVal != null && ( ( InternalEList.Unsettable< ? > ) enumVal ).isSet();
     }
 
     /**
@@ -210,17 +221,19 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByAbstractDataAttribute()).basicAdd(otherEnd, msgs);
-            case SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentDataTypeTemplates((DataTypeTemplates)otherEnd, msgs);
-            case SclPackage.ENUM_TYPE__ENUM_VAL:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getEnumVal()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByAbstractDataAttribute() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentDataTypeTemplates( ( DataTypeTemplates ) otherEnd, msgs );
+        case SclPackage.ENUM_TYPE__ENUM_VAL:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getEnumVal() ).basicAdd( otherEnd,
+                    msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -230,15 +243,15 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
-                return ((InternalEList<?>)getReferredByAbstractDataAttribute()).basicRemove(otherEnd, msgs);
-            case SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return basicSetParentDataTypeTemplates(null, msgs);
-            case SclPackage.ENUM_TYPE__ENUM_VAL:
-                return ((InternalEList<?>)getEnumVal()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
+            return ( ( InternalEList< ? > ) getReferredByAbstractDataAttribute() ).basicRemove( otherEnd, msgs );
+        case SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return basicSetParentDataTypeTemplates( null, msgs );
+        case SclPackage.ENUM_TYPE__ENUM_VAL:
+            return ( ( InternalEList< ? > ) getEnumVal() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -248,11 +261,12 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE, DataTypeTemplates.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.DATA_TYPE_TEMPLATES__ENUM_TYPE,
+                    DataTypeTemplates.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -262,15 +276,15 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
-                return getReferredByAbstractDataAttribute();
-            case SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return getParentDataTypeTemplates();
-            case SclPackage.ENUM_TYPE__ENUM_VAL:
-                return getEnumVal();
+        switch( featureID ) {
+        case SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
+            return getReferredByAbstractDataAttribute();
+        case SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return getParentDataTypeTemplates();
+        case SclPackage.ENUM_TYPE__ENUM_VAL:
+            return getEnumVal();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -281,20 +295,20 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
-                getReferredByAbstractDataAttribute().clear();
-                getReferredByAbstractDataAttribute().addAll((Collection<? extends AbstractDataAttribute>)newValue);
-                return;
-            case SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                setParentDataTypeTemplates((DataTypeTemplates)newValue);
-                return;
-            case SclPackage.ENUM_TYPE__ENUM_VAL:
-                getEnumVal().clear();
-                getEnumVal().addAll((Collection<? extends EnumVal>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
+            getReferredByAbstractDataAttribute().clear();
+            getReferredByAbstractDataAttribute().addAll( ( Collection< ? extends AbstractDataAttribute > ) newValue );
+            return;
+        case SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            setParentDataTypeTemplates( ( DataTypeTemplates ) newValue );
+            return;
+        case SclPackage.ENUM_TYPE__ENUM_VAL:
+            getEnumVal().clear();
+            getEnumVal().addAll( ( Collection< ? extends EnumVal > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -304,18 +318,18 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
-                unsetReferredByAbstractDataAttribute();
-                return;
-            case SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                setParentDataTypeTemplates((DataTypeTemplates)null);
-                return;
-            case SclPackage.ENUM_TYPE__ENUM_VAL:
-                unsetEnumVal();
-                return;
+        switch( featureID ) {
+        case SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
+            unsetReferredByAbstractDataAttribute();
+            return;
+        case SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            setParentDataTypeTemplates( ( DataTypeTemplates ) null );
+            return;
+        case SclPackage.ENUM_TYPE__ENUM_VAL:
+            unsetEnumVal();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -325,15 +339,15 @@ public class EnumTypeImpl extends IDNamingImpl implements EnumType {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
-                return isSetReferredByAbstractDataAttribute();
-            case SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return getParentDataTypeTemplates() != null;
-            case SclPackage.ENUM_TYPE__ENUM_VAL:
-                return isSetEnumVal();
+        switch( featureID ) {
+        case SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE:
+            return isSetReferredByAbstractDataAttribute();
+        case SclPackage.ENUM_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return getParentDataTypeTemplates() != null;
+        case SclPackage.ENUM_TYPE__ENUM_VAL:
+            return isSetEnumVal();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //EnumTypeImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EnumValImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EnumValImpl.java
index 0f290e1..b6a8280 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EnumValImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EnumValImpl.java
@@ -167,8 +167,9 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
         ord = newOrd;
         boolean oldOrdESet = ordESet;
         ordESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ENUM_VAL__ORD, oldOrd, ord, !oldOrdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ENUM_VAL__ORD, oldOrd, ord,
+                    !oldOrdESet ) );
     }
 
     /**
@@ -182,8 +183,9 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
         boolean oldOrdESet = ordESet;
         ord = ORD_EDEFAULT;
         ordESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ENUM_VAL__ORD, oldOrd, ORD_EDEFAULT, oldOrdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ENUM_VAL__ORD, oldOrd, ORD_EDEFAULT,
+                    oldOrdESet ) );
     }
 
     /**
@@ -203,8 +205,8 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
      */
     @Override
     public EnumType getParentEnumType() {
-        if (eContainerFeatureID() != SclPackage.ENUM_VAL__PARENT_ENUM_TYPE) return null;
-        return (EnumType)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.ENUM_VAL__PARENT_ENUM_TYPE ) return null;
+        return ( EnumType ) eInternalContainer();
     }
 
     /**
@@ -212,8 +214,8 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentEnumType(EnumType newParentEnumType, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentEnumType, SclPackage.ENUM_VAL__PARENT_ENUM_TYPE, msgs);
+    public NotificationChain basicSetParentEnumType( EnumType newParentEnumType, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentEnumType, SclPackage.ENUM_VAL__PARENT_ENUM_TYPE, msgs );
         return msgs;
     }
 
@@ -223,20 +225,23 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
      * @generated
      */
     @Override
-    public void setParentEnumType(EnumType newParentEnumType) {
-        if (newParentEnumType != eInternalContainer() || (eContainerFeatureID() != SclPackage.ENUM_VAL__PARENT_ENUM_TYPE && newParentEnumType != null)) {
-            if (EcoreUtil.isAncestor(this, newParentEnumType))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentEnumType( EnumType newParentEnumType ) {
+        if( newParentEnumType != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.ENUM_VAL__PARENT_ENUM_TYPE && newParentEnumType != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentEnumType ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentEnumType != null)
-                msgs = ((InternalEObject)newParentEnumType).eInverseAdd(this, SclPackage.ENUM_TYPE__ENUM_VAL, EnumType.class, msgs);
-            msgs = basicSetParentEnumType(newParentEnumType, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentEnumType != null )
+                msgs = ( ( InternalEObject ) newParentEnumType ).eInverseAdd( this, SclPackage.ENUM_TYPE__ENUM_VAL,
+                        EnumType.class, msgs );
+            msgs = basicSetParentEnumType( newParentEnumType, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ENUM_VAL__PARENT_ENUM_TYPE, newParentEnumType, newParentEnumType));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ENUM_VAL__PARENT_ENUM_TYPE,
+                    newParentEnumType, newParentEnumType ) );
     }
 
     /**
@@ -258,8 +263,8 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
     public void setValue( String newValue ) {
         String oldValue = value;
         value = newValue;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ENUM_VAL__VALUE, oldValue, value));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ENUM_VAL__VALUE, oldValue, value ) );
     }
 
     /**
@@ -278,13 +283,14 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
      * @generated
      */
     @Override
-    public void setDesc(String newDesc) {
+    public void setDesc( String newDesc ) {
         String oldDesc = desc;
         desc = newDesc;
         boolean oldDescESet = descESet;
         descESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ENUM_VAL__DESC, oldDesc, desc, !oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ENUM_VAL__DESC, oldDesc, desc,
+                    !oldDescESet ) );
     }
 
     /**
@@ -298,8 +304,9 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
         boolean oldDescESet = descESet;
         desc = DESC_EDEFAULT;
         descESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ENUM_VAL__DESC, oldDesc, DESC_EDEFAULT, oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ENUM_VAL__DESC, oldDesc, DESC_EDEFAULT,
+                    oldDescESet ) );
     }
 
     /**
@@ -319,13 +326,13 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ENUM_VAL__PARENT_ENUM_TYPE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentEnumType((EnumType)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ENUM_VAL__PARENT_ENUM_TYPE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentEnumType( ( EnumType ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -335,11 +342,11 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ENUM_VAL__PARENT_ENUM_TYPE:
-                return basicSetParentEnumType(null, msgs);
+        switch( featureID ) {
+        case SclPackage.ENUM_VAL__PARENT_ENUM_TYPE:
+            return basicSetParentEnumType( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -349,11 +356,11 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.ENUM_VAL__PARENT_ENUM_TYPE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ENUM_TYPE__ENUM_VAL, EnumType.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.ENUM_VAL__PARENT_ENUM_TYPE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ENUM_TYPE__ENUM_VAL, EnumType.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -363,17 +370,17 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.ENUM_VAL__DESC:
-                return getDesc();
-            case SclPackage.ENUM_VAL__ORD:
-                return getOrd();
-            case SclPackage.ENUM_VAL__PARENT_ENUM_TYPE:
-                return getParentEnumType();
-            case SclPackage.ENUM_VAL__VALUE:
-                return getValue();
+        switch( featureID ) {
+        case SclPackage.ENUM_VAL__DESC:
+            return getDesc();
+        case SclPackage.ENUM_VAL__ORD:
+            return getOrd();
+        case SclPackage.ENUM_VAL__PARENT_ENUM_TYPE:
+            return getParentEnumType();
+        case SclPackage.ENUM_VAL__VALUE:
+            return getValue();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -383,21 +390,21 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.ENUM_VAL__DESC:
-                setDesc((String)newValue);
-                return;
-            case SclPackage.ENUM_VAL__ORD:
-                setOrd((Integer)newValue);
-                return;
-            case SclPackage.ENUM_VAL__PARENT_ENUM_TYPE:
-                setParentEnumType((EnumType)newValue);
-                return;
-            case SclPackage.ENUM_VAL__VALUE:
-                setValue((String)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.ENUM_VAL__DESC:
+            setDesc( ( String ) newValue );
+            return;
+        case SclPackage.ENUM_VAL__ORD:
+            setOrd( ( Integer ) newValue );
+            return;
+        case SclPackage.ENUM_VAL__PARENT_ENUM_TYPE:
+            setParentEnumType( ( EnumType ) newValue );
+            return;
+        case SclPackage.ENUM_VAL__VALUE:
+            setValue( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -407,21 +414,21 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ENUM_VAL__DESC:
-                unsetDesc();
-                return;
-            case SclPackage.ENUM_VAL__ORD:
-                unsetOrd();
-                return;
-            case SclPackage.ENUM_VAL__PARENT_ENUM_TYPE:
-                setParentEnumType((EnumType)null);
-                return;
-            case SclPackage.ENUM_VAL__VALUE:
-                setValue(VALUE_EDEFAULT);
-                return;
+        switch( featureID ) {
+        case SclPackage.ENUM_VAL__DESC:
+            unsetDesc();
+            return;
+        case SclPackage.ENUM_VAL__ORD:
+            unsetOrd();
+            return;
+        case SclPackage.ENUM_VAL__PARENT_ENUM_TYPE:
+            setParentEnumType( ( EnumType ) null );
+            return;
+        case SclPackage.ENUM_VAL__VALUE:
+            setValue( VALUE_EDEFAULT );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -431,17 +438,17 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ENUM_VAL__DESC:
-                return isSetDesc();
-            case SclPackage.ENUM_VAL__ORD:
-                return isSetOrd();
-            case SclPackage.ENUM_VAL__PARENT_ENUM_TYPE:
-                return getParentEnumType() != null;
-            case SclPackage.ENUM_VAL__VALUE:
-                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+        switch( featureID ) {
+        case SclPackage.ENUM_VAL__DESC:
+            return isSetDesc();
+        case SclPackage.ENUM_VAL__ORD:
+            return isSetOrd();
+        case SclPackage.ENUM_VAL__PARENT_ENUM_TYPE:
+            return getParentEnumType() != null;
+        case SclPackage.ENUM_VAL__VALUE:
+            return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals( value );
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -450,14 +457,16 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
      * @generated
      */
     @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDesc.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.ENUM_VAL__DESC: return SclPackage.AG_DESC__DESC;
-                default: return -1;
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDesc.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.ENUM_VAL__DESC:
+                return SclPackage.AG_DESC__DESC;
+            default:
+                return -1;
             }
         }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
     }
 
     /**
@@ -466,14 +475,16 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
      * @generated
      */
     @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDesc.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_DESC__DESC: return SclPackage.ENUM_VAL__DESC;
-                default: return -1;
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDesc.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_DESC__DESC:
+                return SclPackage.ENUM_VAL__DESC;
+            default:
+                return -1;
             }
         }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
     }
 
     /**
@@ -483,16 +494,22 @@ public class EnumValImpl extends SclObjectImpl implements EnumVal {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (desc: ");
-        if (descESet) result.append(desc); else result.append("<unset>");
-        result.append(", ord: ");
-        if (ordESet) result.append(ord); else result.append("<unset>");
-        result.append(", value: ");
-        result.append(value);
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (desc: " );
+        if( descESet )
+            result.append( desc );
+        else
+            result.append( "<unset>" );
+        result.append( ", ord: " );
+        if( ordESet )
+            result.append( ord );
+        else
+            result.append( "<unset>" );
+        result.append( ", value: " );
+        result.append( value );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EqFunctionImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EqFunctionImpl.java
index c103596..c5f4f52 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EqFunctionImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EqFunctionImpl.java
@@ -81,8 +81,8 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      */
     @Override
     public ConductingEquipment getParentConductingEquipment() {
-        if (eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT) return null;
-        return (ConductingEquipment)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT ) return null;
+        return ( ConductingEquipment ) eInternalContainer();
     }
 
     /**
@@ -90,8 +90,10 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentConductingEquipment(ConductingEquipment newParentConductingEquipment, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentConductingEquipment, SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT, msgs);
+    public NotificationChain basicSetParentConductingEquipment( ConductingEquipment newParentConductingEquipment,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentConductingEquipment,
+                SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT, msgs );
         return msgs;
     }
 
@@ -101,20 +103,24 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      * @generated
      */
     @Override
-    public void setParentConductingEquipment(ConductingEquipment newParentConductingEquipment) {
-        if (newParentConductingEquipment != eInternalContainer() || (eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT && newParentConductingEquipment != null)) {
-            if (EcoreUtil.isAncestor(this, newParentConductingEquipment))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentConductingEquipment( ConductingEquipment newParentConductingEquipment ) {
+        if( newParentConductingEquipment != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT
+                        && newParentConductingEquipment != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentConductingEquipment ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentConductingEquipment != null)
-                msgs = ((InternalEObject)newParentConductingEquipment).eInverseAdd(this, SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION, ConductingEquipment.class, msgs);
-            msgs = basicSetParentConductingEquipment(newParentConductingEquipment, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentConductingEquipment != null )
+                msgs = ( ( InternalEObject ) newParentConductingEquipment ).eInverseAdd( this,
+                        SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION, ConductingEquipment.class, msgs );
+            msgs = basicSetParentConductingEquipment( newParentConductingEquipment, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT, newParentConductingEquipment, newParentConductingEquipment));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT,
+                    newParentConductingEquipment, newParentConductingEquipment ) );
     }
 
     /**
@@ -124,8 +130,8 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      */
     @Override
     public GeneralEquipment getParentGeneralEquipment() {
-        if (eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT) return null;
-        return (GeneralEquipment)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT ) return null;
+        return ( GeneralEquipment ) eInternalContainer();
     }
 
     /**
@@ -133,8 +139,10 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentGeneralEquipment(GeneralEquipment newParentGeneralEquipment, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentGeneralEquipment, SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT, msgs);
+    public NotificationChain basicSetParentGeneralEquipment( GeneralEquipment newParentGeneralEquipment,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentGeneralEquipment,
+                SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT, msgs );
         return msgs;
     }
 
@@ -144,20 +152,24 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      * @generated
      */
     @Override
-    public void setParentGeneralEquipment(GeneralEquipment newParentGeneralEquipment) {
-        if (newParentGeneralEquipment != eInternalContainer() || (eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT && newParentGeneralEquipment != null)) {
-            if (EcoreUtil.isAncestor(this, newParentGeneralEquipment))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentGeneralEquipment( GeneralEquipment newParentGeneralEquipment ) {
+        if( newParentGeneralEquipment != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT
+                        && newParentGeneralEquipment != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentGeneralEquipment ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentGeneralEquipment != null)
-                msgs = ((InternalEObject)newParentGeneralEquipment).eInverseAdd(this, SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION, GeneralEquipment.class, msgs);
-            msgs = basicSetParentGeneralEquipment(newParentGeneralEquipment, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentGeneralEquipment != null )
+                msgs = ( ( InternalEObject ) newParentGeneralEquipment ).eInverseAdd( this,
+                        SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION, GeneralEquipment.class, msgs );
+            msgs = basicSetParentGeneralEquipment( newParentGeneralEquipment, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT, newParentGeneralEquipment, newParentGeneralEquipment));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT,
+                    newParentGeneralEquipment, newParentGeneralEquipment ) );
     }
 
     /**
@@ -167,8 +179,8 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      */
     @Override
     public PowerTransformer getParentPowerTransformer() {
-        if (eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER) return null;
-        return (PowerTransformer)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER ) return null;
+        return ( PowerTransformer ) eInternalContainer();
     }
 
     /**
@@ -176,8 +188,10 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentPowerTransformer(PowerTransformer newParentPowerTransformer, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentPowerTransformer, SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER, msgs);
+    public NotificationChain basicSetParentPowerTransformer( PowerTransformer newParentPowerTransformer,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentPowerTransformer,
+                SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER, msgs );
         return msgs;
     }
 
@@ -187,20 +201,24 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      * @generated
      */
     @Override
-    public void setParentPowerTransformer(PowerTransformer newParentPowerTransformer) {
-        if (newParentPowerTransformer != eInternalContainer() || (eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER && newParentPowerTransformer != null)) {
-            if (EcoreUtil.isAncestor(this, newParentPowerTransformer))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentPowerTransformer( PowerTransformer newParentPowerTransformer ) {
+        if( newParentPowerTransformer != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER
+                        && newParentPowerTransformer != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentPowerTransformer ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentPowerTransformer != null)
-                msgs = ((InternalEObject)newParentPowerTransformer).eInverseAdd(this, SclPackage.POWER_TRANSFORMER__EQ_FUNCTION, PowerTransformer.class, msgs);
-            msgs = basicSetParentPowerTransformer(newParentPowerTransformer, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentPowerTransformer != null )
+                msgs = ( ( InternalEObject ) newParentPowerTransformer ).eInverseAdd( this,
+                        SclPackage.POWER_TRANSFORMER__EQ_FUNCTION, PowerTransformer.class, msgs );
+            msgs = basicSetParentPowerTransformer( newParentPowerTransformer, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER, newParentPowerTransformer, newParentPowerTransformer));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER,
+                    newParentPowerTransformer, newParentPowerTransformer ) );
     }
 
     /**
@@ -210,8 +228,8 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      */
     @Override
     public SubEquipment getParentSubEquipment() {
-        if (eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT) return null;
-        return (SubEquipment)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT ) return null;
+        return ( SubEquipment ) eInternalContainer();
     }
 
     /**
@@ -219,8 +237,9 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSubEquipment(SubEquipment newParentSubEquipment, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSubEquipment, SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT, msgs);
+    public NotificationChain basicSetParentSubEquipment( SubEquipment newParentSubEquipment, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSubEquipment,
+                SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT, msgs );
         return msgs;
     }
 
@@ -230,20 +249,24 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      * @generated
      */
     @Override
-    public void setParentSubEquipment(SubEquipment newParentSubEquipment) {
-        if (newParentSubEquipment != eInternalContainer() || (eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT && newParentSubEquipment != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSubEquipment))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSubEquipment( SubEquipment newParentSubEquipment ) {
+        if( newParentSubEquipment != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT
+                        && newParentSubEquipment != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSubEquipment ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSubEquipment != null)
-                msgs = ((InternalEObject)newParentSubEquipment).eInverseAdd(this, SclPackage.SUB_EQUIPMENT__EQ_FUNCTION, SubEquipment.class, msgs);
-            msgs = basicSetParentSubEquipment(newParentSubEquipment, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSubEquipment != null )
+                msgs = ( ( InternalEObject ) newParentSubEquipment ).eInverseAdd( this,
+                        SclPackage.SUB_EQUIPMENT__EQ_FUNCTION, SubEquipment.class, msgs );
+            msgs = basicSetParentSubEquipment( newParentSubEquipment, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT, newParentSubEquipment, newParentSubEquipment));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT,
+                    newParentSubEquipment, newParentSubEquipment ) );
     }
 
     /**
@@ -253,8 +276,8 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      */
     @Override
     public TransformerWinding getParentTransformerWinding() {
-        if (eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING) return null;
-        return (TransformerWinding)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING ) return null;
+        return ( TransformerWinding ) eInternalContainer();
     }
 
     /**
@@ -262,8 +285,10 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentTransformerWinding(TransformerWinding newParentTransformerWinding, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentTransformerWinding, SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING, msgs);
+    public NotificationChain basicSetParentTransformerWinding( TransformerWinding newParentTransformerWinding,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentTransformerWinding,
+                SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING, msgs );
         return msgs;
     }
 
@@ -273,20 +298,24 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      * @generated
      */
     @Override
-    public void setParentTransformerWinding(TransformerWinding newParentTransformerWinding) {
-        if (newParentTransformerWinding != eInternalContainer() || (eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING && newParentTransformerWinding != null)) {
-            if (EcoreUtil.isAncestor(this, newParentTransformerWinding))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentTransformerWinding( TransformerWinding newParentTransformerWinding ) {
+        if( newParentTransformerWinding != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING
+                        && newParentTransformerWinding != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentTransformerWinding ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentTransformerWinding != null)
-                msgs = ((InternalEObject)newParentTransformerWinding).eInverseAdd(this, SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION, TransformerWinding.class, msgs);
-            msgs = basicSetParentTransformerWinding(newParentTransformerWinding, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentTransformerWinding != null )
+                msgs = ( ( InternalEObject ) newParentTransformerWinding ).eInverseAdd( this,
+                        SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION, TransformerWinding.class, msgs );
+            msgs = basicSetParentTransformerWinding( newParentTransformerWinding, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING, newParentTransformerWinding, newParentTransformerWinding));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING,
+                    newParentTransformerWinding, newParentTransformerWinding ) );
     }
 
     /**
@@ -296,8 +325,8 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      */
     @Override
     public TapChanger getParentTapChanger() {
-        if (eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER) return null;
-        return (TapChanger)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER ) return null;
+        return ( TapChanger ) eInternalContainer();
     }
 
     /**
@@ -305,8 +334,9 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentTapChanger(TapChanger newParentTapChanger, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentTapChanger, SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER, msgs);
+    public NotificationChain basicSetParentTapChanger( TapChanger newParentTapChanger, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentTapChanger, SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER,
+                msgs );
         return msgs;
     }
 
@@ -316,20 +346,24 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      * @generated
      */
     @Override
-    public void setParentTapChanger(TapChanger newParentTapChanger) {
-        if (newParentTapChanger != eInternalContainer() || (eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER && newParentTapChanger != null)) {
-            if (EcoreUtil.isAncestor(this, newParentTapChanger))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentTapChanger( TapChanger newParentTapChanger ) {
+        if( newParentTapChanger != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER
+                        && newParentTapChanger != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentTapChanger ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentTapChanger != null)
-                msgs = ((InternalEObject)newParentTapChanger).eInverseAdd(this, SclPackage.TAP_CHANGER__EQ_FUNCTION, TapChanger.class, msgs);
-            msgs = basicSetParentTapChanger(newParentTapChanger, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentTapChanger != null )
+                msgs = ( ( InternalEObject ) newParentTapChanger ).eInverseAdd( this,
+                        SclPackage.TAP_CHANGER__EQ_FUNCTION, TapChanger.class, msgs );
+            msgs = basicSetParentTapChanger( newParentTapChanger, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER, newParentTapChanger, newParentTapChanger));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER,
+                    newParentTapChanger, newParentTapChanger ) );
     }
 
     /**
@@ -339,33 +373,33 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentConductingEquipment((ConductingEquipment)otherEnd, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentGeneralEquipment((GeneralEquipment)otherEnd, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentPowerTransformer((PowerTransformer)otherEnd, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSubEquipment((SubEquipment)otherEnd, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentTransformerWinding((TransformerWinding)otherEnd, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentTapChanger((TapChanger)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentConductingEquipment( ( ConductingEquipment ) otherEnd, msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentGeneralEquipment( ( GeneralEquipment ) otherEnd, msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentPowerTransformer( ( PowerTransformer ) otherEnd, msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSubEquipment( ( SubEquipment ) otherEnd, msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentTransformerWinding( ( TransformerWinding ) otherEnd, msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentTapChanger( ( TapChanger ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -375,21 +409,21 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT:
-                return basicSetParentConductingEquipment(null, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT:
-                return basicSetParentGeneralEquipment(null, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER:
-                return basicSetParentPowerTransformer(null, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT:
-                return basicSetParentSubEquipment(null, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING:
-                return basicSetParentTransformerWinding(null, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER:
-                return basicSetParentTapChanger(null, msgs);
+        switch( featureID ) {
+        case SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT:
+            return basicSetParentConductingEquipment( null, msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT:
+            return basicSetParentGeneralEquipment( null, msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER:
+            return basicSetParentPowerTransformer( null, msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT:
+            return basicSetParentSubEquipment( null, msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING:
+            return basicSetParentTransformerWinding( null, msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER:
+            return basicSetParentTapChanger( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -399,21 +433,27 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT:
-                return eInternalContainer().eInverseRemove(this, SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION, ConductingEquipment.class, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT:
-                return eInternalContainer().eInverseRemove(this, SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION, GeneralEquipment.class, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.POWER_TRANSFORMER__EQ_FUNCTION, PowerTransformer.class, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SUB_EQUIPMENT__EQ_FUNCTION, SubEquipment.class, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING:
-                return eInternalContainer().eInverseRemove(this, SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION, TransformerWinding.class, msgs);
-            case SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.TAP_CHANGER__EQ_FUNCTION, TapChanger.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT:
+            return eInternalContainer().eInverseRemove( this, SclPackage.CONDUCTING_EQUIPMENT__EQ_FUNCTION,
+                    ConductingEquipment.class, msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT:
+            return eInternalContainer().eInverseRemove( this, SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION,
+                    GeneralEquipment.class, msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.POWER_TRANSFORMER__EQ_FUNCTION,
+                    PowerTransformer.class, msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SUB_EQUIPMENT__EQ_FUNCTION, SubEquipment.class,
+                    msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING:
+            return eInternalContainer().eInverseRemove( this, SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION,
+                    TransformerWinding.class, msgs );
+        case SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.TAP_CHANGER__EQ_FUNCTION, TapChanger.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -423,21 +463,21 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT:
-                return getParentConductingEquipment();
-            case SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT:
-                return getParentGeneralEquipment();
-            case SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER:
-                return getParentPowerTransformer();
-            case SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT:
-                return getParentSubEquipment();
-            case SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING:
-                return getParentTransformerWinding();
-            case SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER:
-                return getParentTapChanger();
+        switch( featureID ) {
+        case SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT:
+            return getParentConductingEquipment();
+        case SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT:
+            return getParentGeneralEquipment();
+        case SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER:
+            return getParentPowerTransformer();
+        case SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT:
+            return getParentSubEquipment();
+        case SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING:
+            return getParentTransformerWinding();
+        case SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER:
+            return getParentTapChanger();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -447,27 +487,27 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT:
-                setParentConductingEquipment((ConductingEquipment)newValue);
-                return;
-            case SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT:
-                setParentGeneralEquipment((GeneralEquipment)newValue);
-                return;
-            case SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER:
-                setParentPowerTransformer((PowerTransformer)newValue);
-                return;
-            case SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT:
-                setParentSubEquipment((SubEquipment)newValue);
-                return;
-            case SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING:
-                setParentTransformerWinding((TransformerWinding)newValue);
-                return;
-            case SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER:
-                setParentTapChanger((TapChanger)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT:
+            setParentConductingEquipment( ( ConductingEquipment ) newValue );
+            return;
+        case SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT:
+            setParentGeneralEquipment( ( GeneralEquipment ) newValue );
+            return;
+        case SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER:
+            setParentPowerTransformer( ( PowerTransformer ) newValue );
+            return;
+        case SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT:
+            setParentSubEquipment( ( SubEquipment ) newValue );
+            return;
+        case SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING:
+            setParentTransformerWinding( ( TransformerWinding ) newValue );
+            return;
+        case SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER:
+            setParentTapChanger( ( TapChanger ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -477,27 +517,27 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT:
-                setParentConductingEquipment((ConductingEquipment)null);
-                return;
-            case SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT:
-                setParentGeneralEquipment((GeneralEquipment)null);
-                return;
-            case SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER:
-                setParentPowerTransformer((PowerTransformer)null);
-                return;
-            case SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT:
-                setParentSubEquipment((SubEquipment)null);
-                return;
-            case SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING:
-                setParentTransformerWinding((TransformerWinding)null);
-                return;
-            case SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER:
-                setParentTapChanger((TapChanger)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT:
+            setParentConductingEquipment( ( ConductingEquipment ) null );
+            return;
+        case SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT:
+            setParentGeneralEquipment( ( GeneralEquipment ) null );
+            return;
+        case SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER:
+            setParentPowerTransformer( ( PowerTransformer ) null );
+            return;
+        case SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT:
+            setParentSubEquipment( ( SubEquipment ) null );
+            return;
+        case SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING:
+            setParentTransformerWinding( ( TransformerWinding ) null );
+            return;
+        case SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER:
+            setParentTapChanger( ( TapChanger ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -507,21 +547,21 @@ public class EqFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqFunct
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT:
-                return getParentConductingEquipment() != null;
-            case SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT:
-                return getParentGeneralEquipment() != null;
-            case SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER:
-                return getParentPowerTransformer() != null;
-            case SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT:
-                return getParentSubEquipment() != null;
-            case SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING:
-                return getParentTransformerWinding() != null;
-            case SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER:
-                return getParentTapChanger() != null;
+        switch( featureID ) {
+        case SclPackage.EQ_FUNCTION__PARENT_CONDUCTING_EQUIPMENT:
+            return getParentConductingEquipment() != null;
+        case SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT:
+            return getParentGeneralEquipment() != null;
+        case SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER:
+            return getParentPowerTransformer() != null;
+        case SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT:
+            return getParentSubEquipment() != null;
+        case SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING:
+            return getParentTransformerWinding() != null;
+        case SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER:
+            return getParentTapChanger() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //EqFunctionImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EqSubFunctionImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EqSubFunctionImpl.java
index 4908658..9abc207 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EqSubFunctionImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EqSubFunctionImpl.java
@@ -71,8 +71,8 @@ public class EqSubFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqSu
      */
     @Override
     public AbstractEqFuncSubFunc getParentAbstractEqFuncSubFunc() {
-        if (eContainerFeatureID() != SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC) return null;
-        return (AbstractEqFuncSubFunc)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC ) return null;
+        return ( AbstractEqFuncSubFunc ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,10 @@ public class EqSubFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqSu
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAbstractEqFuncSubFunc(AbstractEqFuncSubFunc newParentAbstractEqFuncSubFunc, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAbstractEqFuncSubFunc, SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC, msgs);
+    public NotificationChain basicSetParentAbstractEqFuncSubFunc( AbstractEqFuncSubFunc newParentAbstractEqFuncSubFunc,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAbstractEqFuncSubFunc,
+                SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC, msgs );
         return msgs;
     }
 
@@ -91,20 +93,25 @@ public class EqSubFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqSu
      * @generated
      */
     @Override
-    public void setParentAbstractEqFuncSubFunc(AbstractEqFuncSubFunc newParentAbstractEqFuncSubFunc) {
-        if (newParentAbstractEqFuncSubFunc != eInternalContainer() || (eContainerFeatureID() != SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC && newParentAbstractEqFuncSubFunc != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAbstractEqFuncSubFunc))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAbstractEqFuncSubFunc( AbstractEqFuncSubFunc newParentAbstractEqFuncSubFunc ) {
+        if( newParentAbstractEqFuncSubFunc != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC
+                        && newParentAbstractEqFuncSubFunc != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAbstractEqFuncSubFunc ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAbstractEqFuncSubFunc != null)
-                msgs = ((InternalEObject)newParentAbstractEqFuncSubFunc).eInverseAdd(this, SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION, AbstractEqFuncSubFunc.class, msgs);
-            msgs = basicSetParentAbstractEqFuncSubFunc(newParentAbstractEqFuncSubFunc, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAbstractEqFuncSubFunc != null )
+                msgs = ( ( InternalEObject ) newParentAbstractEqFuncSubFunc ).eInverseAdd( this,
+                        SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION, AbstractEqFuncSubFunc.class, msgs );
+            msgs = basicSetParentAbstractEqFuncSubFunc( newParentAbstractEqFuncSubFunc, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC, newParentAbstractEqFuncSubFunc, newParentAbstractEqFuncSubFunc));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET,
+                    SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC, newParentAbstractEqFuncSubFunc,
+                    newParentAbstractEqFuncSubFunc ) );
     }
 
     /**
@@ -114,13 +121,13 @@ public class EqSubFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqSu
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAbstractEqFuncSubFunc((AbstractEqFuncSubFunc)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAbstractEqFuncSubFunc( ( AbstractEqFuncSubFunc ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +137,11 @@ public class EqSubFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqSu
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
-                return basicSetParentAbstractEqFuncSubFunc(null, msgs);
+        switch( featureID ) {
+        case SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
+            return basicSetParentAbstractEqFuncSubFunc( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +151,12 @@ public class EqSubFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqSu
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION, AbstractEqFuncSubFunc.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__EQ_SUB_FUNCTION,
+                    AbstractEqFuncSubFunc.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +166,11 @@ public class EqSubFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqSu
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
-                return getParentAbstractEqFuncSubFunc();
+        switch( featureID ) {
+        case SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
+            return getParentAbstractEqFuncSubFunc();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +180,12 @@ public class EqSubFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqSu
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
-                setParentAbstractEqFuncSubFunc((AbstractEqFuncSubFunc)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
+            setParentAbstractEqFuncSubFunc( ( AbstractEqFuncSubFunc ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +195,12 @@ public class EqSubFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqSu
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
-                setParentAbstractEqFuncSubFunc((AbstractEqFuncSubFunc)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
+            setParentAbstractEqFuncSubFunc( ( AbstractEqFuncSubFunc ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +210,11 @@ public class EqSubFunctionImpl extends AbstractEqFuncSubFuncImpl implements EqSu
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
-                return getParentAbstractEqFuncSubFunc() != null;
+        switch( featureID ) {
+        case SclPackage.EQ_SUB_FUNCTION__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
+            return getParentAbstractEqFuncSubFunc() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //EqSubFunctionImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EquipmentContainerImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EquipmentContainerImpl.java
index 7cc7986..4df36f5 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EquipmentContainerImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EquipmentContainerImpl.java
@@ -60,7 +60,7 @@ public class EquipmentContainerImpl extends PowerSystemResourceImpl implements E
      * @generated
      * @ordered
      */
-    protected EList<PowerTransformer> powerTransformer;
+    protected EList< PowerTransformer > powerTransformer;
 
     /**
      * The cached value of the '{@link #getGeneralEquipment() <em>General Equipment</em>}' containment reference list.
@@ -70,7 +70,7 @@ public class EquipmentContainerImpl extends PowerSystemResourceImpl implements E
      * @generated
      * @ordered
      */
-    protected EList<GeneralEquipment> generalEquipment;
+    protected EList< GeneralEquipment > generalEquipment;
 
     /**
      * <!-- begin-user-doc -->
@@ -97,9 +97,11 @@ public class EquipmentContainerImpl extends PowerSystemResourceImpl implements E
      * @generated
      */
     @Override
-    public EList<PowerTransformer> getPowerTransformer() {
-        if (powerTransformer == null) {
-            powerTransformer = new EObjectContainmentWithInverseEList.Unsettable<PowerTransformer>(PowerTransformer.class, this, SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER, SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER);
+    public EList< PowerTransformer > getPowerTransformer() {
+        if( powerTransformer == null ) {
+            powerTransformer = new EObjectContainmentWithInverseEList.Unsettable< PowerTransformer >(
+                    PowerTransformer.class, this, SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER,
+                    SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER );
         }
         return powerTransformer;
     }
@@ -111,7 +113,7 @@ public class EquipmentContainerImpl extends PowerSystemResourceImpl implements E
      */
     @Override
     public void unsetPowerTransformer() {
-        if (powerTransformer != null) ((InternalEList.Unsettable<?>)powerTransformer).unset();
+        if( powerTransformer != null ) ( ( InternalEList.Unsettable< ? > ) powerTransformer ).unset();
     }
 
     /**
@@ -121,7 +123,7 @@ public class EquipmentContainerImpl extends PowerSystemResourceImpl implements E
      */
     @Override
     public boolean isSetPowerTransformer() {
-        return powerTransformer != null && ((InternalEList.Unsettable<?>)powerTransformer).isSet();
+        return powerTransformer != null && ( ( InternalEList.Unsettable< ? > ) powerTransformer ).isSet();
     }
 
     /**
@@ -130,9 +132,11 @@ public class EquipmentContainerImpl extends PowerSystemResourceImpl implements E
      * @generated
      */
     @Override
-    public EList<GeneralEquipment> getGeneralEquipment() {
-        if (generalEquipment == null) {
-            generalEquipment = new EObjectContainmentWithInverseEList.Unsettable<GeneralEquipment>(GeneralEquipment.class, this, SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT, SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER);
+    public EList< GeneralEquipment > getGeneralEquipment() {
+        if( generalEquipment == null ) {
+            generalEquipment = new EObjectContainmentWithInverseEList.Unsettable< GeneralEquipment >(
+                    GeneralEquipment.class, this, SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT,
+                    SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER );
         }
         return generalEquipment;
     }
@@ -144,7 +148,7 @@ public class EquipmentContainerImpl extends PowerSystemResourceImpl implements E
      */
     @Override
     public void unsetGeneralEquipment() {
-        if (generalEquipment != null) ((InternalEList.Unsettable<?>)generalEquipment).unset();
+        if( generalEquipment != null ) ( ( InternalEList.Unsettable< ? > ) generalEquipment ).unset();
     }
 
     /**
@@ -154,7 +158,7 @@ public class EquipmentContainerImpl extends PowerSystemResourceImpl implements E
      */
     @Override
     public boolean isSetGeneralEquipment() {
-        return generalEquipment != null && ((InternalEList.Unsettable<?>)generalEquipment).isSet();
+        return generalEquipment != null && ( ( InternalEList.Unsettable< ? > ) generalEquipment ).isSet();
     }
 
     /**
@@ -165,13 +169,15 @@ public class EquipmentContainerImpl extends PowerSystemResourceImpl implements E
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getPowerTransformer()).basicAdd(otherEnd, msgs);
-            case SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getGeneralEquipment()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getPowerTransformer() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getGeneralEquipment() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -181,13 +187,13 @@ public class EquipmentContainerImpl extends PowerSystemResourceImpl implements E
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER:
-                return ((InternalEList<?>)getPowerTransformer()).basicRemove(otherEnd, msgs);
-            case SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
-                return ((InternalEList<?>)getGeneralEquipment()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER:
+            return ( ( InternalEList< ? > ) getPowerTransformer() ).basicRemove( otherEnd, msgs );
+        case SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
+            return ( ( InternalEList< ? > ) getGeneralEquipment() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -197,13 +203,13 @@ public class EquipmentContainerImpl extends PowerSystemResourceImpl implements E
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER:
-                return getPowerTransformer();
-            case SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
-                return getGeneralEquipment();
+        switch( featureID ) {
+        case SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER:
+            return getPowerTransformer();
+        case SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
+            return getGeneralEquipment();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -214,17 +220,17 @@ public class EquipmentContainerImpl extends PowerSystemResourceImpl implements E
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER:
-                getPowerTransformer().clear();
-                getPowerTransformer().addAll((Collection<? extends PowerTransformer>)newValue);
-                return;
-            case SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
-                getGeneralEquipment().clear();
-                getGeneralEquipment().addAll((Collection<? extends GeneralEquipment>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER:
+            getPowerTransformer().clear();
+            getPowerTransformer().addAll( ( Collection< ? extends PowerTransformer > ) newValue );
+            return;
+        case SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
+            getGeneralEquipment().clear();
+            getGeneralEquipment().addAll( ( Collection< ? extends GeneralEquipment > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -234,15 +240,15 @@ public class EquipmentContainerImpl extends PowerSystemResourceImpl implements E
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER:
-                unsetPowerTransformer();
-                return;
-            case SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
-                unsetGeneralEquipment();
-                return;
+        switch( featureID ) {
+        case SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER:
+            unsetPowerTransformer();
+            return;
+        case SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
+            unsetGeneralEquipment();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -252,13 +258,13 @@ public class EquipmentContainerImpl extends PowerSystemResourceImpl implements E
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER:
-                return isSetPowerTransformer();
-            case SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
-                return isSetGeneralEquipment();
+        switch( featureID ) {
+        case SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER:
+            return isSetPowerTransformer();
+        case SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
+            return isSetGeneralEquipment();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //EquipmentContainerImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EquipmentImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EquipmentImpl.java
index 50fab18..6f65146 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EquipmentImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/EquipmentImpl.java
@@ -113,8 +113,9 @@ public class EquipmentImpl extends PowerSystemResourceImpl implements Equipment
         virtual = newVirtual;
         boolean oldVirtualESet = virtualESet;
         virtualESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EQUIPMENT__VIRTUAL, oldVirtual, virtual, !oldVirtualESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EQUIPMENT__VIRTUAL, oldVirtual, virtual,
+                    !oldVirtualESet ) );
     }
 
     /**
@@ -128,8 +129,9 @@ public class EquipmentImpl extends PowerSystemResourceImpl implements Equipment
         boolean oldVirtualESet = virtualESet;
         virtual = VIRTUAL_EDEFAULT;
         virtualESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EQUIPMENT__VIRTUAL, oldVirtual, VIRTUAL_EDEFAULT, oldVirtualESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EQUIPMENT__VIRTUAL, oldVirtual,
+                    VIRTUAL_EDEFAULT, oldVirtualESet ) );
     }
 
     /**
@@ -149,11 +151,11 @@ public class EquipmentImpl extends PowerSystemResourceImpl implements Equipment
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.EQUIPMENT__VIRTUAL:
-                return getVirtual();
+        switch( featureID ) {
+        case SclPackage.EQUIPMENT__VIRTUAL:
+            return getVirtual();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -163,12 +165,12 @@ public class EquipmentImpl extends PowerSystemResourceImpl implements Equipment
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.EQUIPMENT__VIRTUAL:
-                setVirtual((Boolean)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.EQUIPMENT__VIRTUAL:
+            setVirtual( ( Boolean ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -178,12 +180,12 @@ public class EquipmentImpl extends PowerSystemResourceImpl implements Equipment
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.EQUIPMENT__VIRTUAL:
-                unsetVirtual();
-                return;
+        switch( featureID ) {
+        case SclPackage.EQUIPMENT__VIRTUAL:
+            unsetVirtual();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -193,11 +195,11 @@ public class EquipmentImpl extends PowerSystemResourceImpl implements Equipment
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.EQUIPMENT__VIRTUAL:
-                return isSetVirtual();
+        switch( featureID ) {
+        case SclPackage.EQUIPMENT__VIRTUAL:
+            return isSetVirtual();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -206,14 +208,16 @@ public class EquipmentImpl extends PowerSystemResourceImpl implements Equipment
      * @generated
      */
     @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == AgVirtual.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.EQUIPMENT__VIRTUAL: return SclPackage.AG_VIRTUAL__VIRTUAL;
-                default: return -1;
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgVirtual.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.EQUIPMENT__VIRTUAL:
+                return SclPackage.AG_VIRTUAL__VIRTUAL;
+            default:
+                return -1;
             }
         }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
     }
 
     /**
@@ -222,14 +226,16 @@ public class EquipmentImpl extends PowerSystemResourceImpl implements Equipment
      * @generated
      */
     @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == AgVirtual.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_VIRTUAL__VIRTUAL: return SclPackage.EQUIPMENT__VIRTUAL;
-                default: return -1;
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgVirtual.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_VIRTUAL__VIRTUAL:
+                return SclPackage.EQUIPMENT__VIRTUAL;
+            default:
+                return -1;
             }
         }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
     }
 
     /**
@@ -239,12 +245,15 @@ public class EquipmentImpl extends PowerSystemResourceImpl implements Equipment
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (virtual: ");
-        if (virtualESet) result.append(virtual); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (virtual: " );
+        if( virtualESet )
+            result.append( virtual );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java
index 114f0a1..04c8255 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java
@@ -735,8 +735,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         daName = newDaName;
         boolean oldDaNameESet = daNameESet;
         daNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__DA_NAME, oldDaName, daName, !oldDaNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__DA_NAME, oldDaName, daName,
+                    !oldDaNameESet ) );
     }
 
     /**
@@ -750,8 +751,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldDaNameESet = daNameESet;
         daName = DA_NAME_EDEFAULT;
         daNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__DA_NAME, oldDaName, DA_NAME_EDEFAULT, oldDaNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__DA_NAME, oldDaName,
+                    DA_NAME_EDEFAULT, oldDaNameESet ) );
     }
 
     /**
@@ -785,8 +787,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         doName = newDoName;
         boolean oldDoNameESet = doNameESet;
         doNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__DO_NAME, oldDoName, doName, !oldDoNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__DO_NAME, oldDoName, doName,
+                    !oldDoNameESet ) );
     }
 
     /**
@@ -800,8 +803,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldDoNameESet = doNameESet;
         doName = DO_NAME_EDEFAULT;
         doNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__DO_NAME, oldDoName, DO_NAME_EDEFAULT, oldDoNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__DO_NAME, oldDoName,
+                    DO_NAME_EDEFAULT, oldDoNameESet ) );
     }
 
     /**
@@ -835,8 +839,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         iedName = newIedName;
         boolean oldIedNameESet = iedNameESet;
         iedNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__IED_NAME, oldIedName, iedName, !oldIedNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__IED_NAME, oldIedName, iedName,
+                    !oldIedNameESet ) );
     }
 
     /**
@@ -850,8 +855,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldIedNameESet = iedNameESet;
         iedName = IED_NAME_EDEFAULT;
         iedNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__IED_NAME, oldIedName, IED_NAME_EDEFAULT, oldIedNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__IED_NAME, oldIedName,
+                    IED_NAME_EDEFAULT, oldIedNameESet ) );
     }
 
     /**
@@ -885,8 +891,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         intAddr = newIntAddr;
         boolean oldIntAddrESet = intAddrESet;
         intAddrESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__INT_ADDR, oldIntAddr, intAddr, !oldIntAddrESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__INT_ADDR, oldIntAddr, intAddr,
+                    !oldIntAddrESet ) );
     }
 
     /**
@@ -900,8 +907,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldIntAddrESet = intAddrESet;
         intAddr = INT_ADDR_EDEFAULT;
         intAddrESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__INT_ADDR, oldIntAddr, INT_ADDR_EDEFAULT, oldIntAddrESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__INT_ADDR, oldIntAddr,
+                    INT_ADDR_EDEFAULT, oldIntAddrESet ) );
     }
 
     /**
@@ -935,8 +943,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         ldInst = newLdInst;
         boolean oldLdInstESet = ldInstESet;
         ldInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__LD_INST, oldLdInst, ldInst, !oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__LD_INST, oldLdInst, ldInst,
+                    !oldLdInstESet ) );
     }
 
     /**
@@ -950,8 +959,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldLdInstESet = ldInstESet;
         ldInst = LD_INST_EDEFAULT;
         ldInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__LD_INST, oldLdInst, LD_INST_EDEFAULT, oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__LD_INST, oldLdInst,
+                    LD_INST_EDEFAULT, oldLdInstESet ) );
     }
 
     /**
@@ -985,8 +995,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         lnClass = newLnClass;
         boolean oldLnClassESet = lnClassESet;
         lnClassESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__LN_CLASS, oldLnClass, lnClass, !oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__LN_CLASS, oldLnClass, lnClass,
+                    !oldLnClassESet ) );
     }
 
     /**
@@ -1000,8 +1011,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldLnClassESet = lnClassESet;
         lnClass = LN_CLASS_EDEFAULT;
         lnClassESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__LN_CLASS, oldLnClass, LN_CLASS_EDEFAULT, oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__LN_CLASS, oldLnClass,
+                    LN_CLASS_EDEFAULT, oldLnClassESet ) );
     }
 
     /**
@@ -1035,8 +1047,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         lnInst = newLnInst;
         boolean oldLnInstESet = lnInstESet;
         lnInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__LN_INST, oldLnInst, lnInst, !oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__LN_INST, oldLnInst, lnInst,
+                    !oldLnInstESet ) );
     }
 
     /**
@@ -1050,8 +1063,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldLnInstESet = lnInstESet;
         lnInst = LN_INST_EDEFAULT;
         lnInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__LN_INST, oldLnInst, LN_INST_EDEFAULT, oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__LN_INST, oldLnInst,
+                    LN_INST_EDEFAULT, oldLnInstESet ) );
     }
 
     /**
@@ -1085,8 +1099,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         prefix = newPrefix;
         boolean oldPrefixESet = prefixESet;
         prefixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__PREFIX, oldPrefix, prefix, !oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__PREFIX, oldPrefix, prefix,
+                    !oldPrefixESet ) );
     }
 
     /**
@@ -1100,8 +1115,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldPrefixESet = prefixESet;
         prefix = PREFIX_EDEFAULT;
         prefixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__PREFIX, oldPrefix, PREFIX_EDEFAULT, oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__PREFIX, oldPrefix,
+                    PREFIX_EDEFAULT, oldPrefixESet ) );
     }
 
     /**
@@ -1135,8 +1151,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         serviceType = newServiceType == null ? SERVICE_TYPE_EDEFAULT : newServiceType;
         boolean oldServiceTypeESet = serviceTypeESet;
         serviceTypeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__SERVICE_TYPE, oldServiceType, serviceType, !oldServiceTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__SERVICE_TYPE, oldServiceType,
+                    serviceType, !oldServiceTypeESet ) );
     }
 
     /**
@@ -1150,8 +1167,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldServiceTypeESet = serviceTypeESet;
         serviceType = SERVICE_TYPE_EDEFAULT;
         serviceTypeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__SERVICE_TYPE, oldServiceType, SERVICE_TYPE_EDEFAULT, oldServiceTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__SERVICE_TYPE, oldServiceType,
+                    SERVICE_TYPE_EDEFAULT, oldServiceTypeESet ) );
     }
 
     /**
@@ -1185,8 +1203,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         srcCBName = newSrcCBName;
         boolean oldSrcCBNameESet = srcCBNameESet;
         srcCBNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__SRC_CB_NAME, oldSrcCBName, srcCBName, !oldSrcCBNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__SRC_CB_NAME, oldSrcCBName,
+                    srcCBName, !oldSrcCBNameESet ) );
     }
 
     /**
@@ -1200,8 +1219,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldSrcCBNameESet = srcCBNameESet;
         srcCBName = SRC_CB_NAME_EDEFAULT;
         srcCBNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__SRC_CB_NAME, oldSrcCBName, SRC_CB_NAME_EDEFAULT, oldSrcCBNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__SRC_CB_NAME, oldSrcCBName,
+                    SRC_CB_NAME_EDEFAULT, oldSrcCBNameESet ) );
     }
 
     /**
@@ -1235,8 +1255,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         srcLDInst = newSrcLDInst;
         boolean oldSrcLDInstESet = srcLDInstESet;
         srcLDInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__SRC_LD_INST, oldSrcLDInst, srcLDInst, !oldSrcLDInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__SRC_LD_INST, oldSrcLDInst,
+                    srcLDInst, !oldSrcLDInstESet ) );
     }
 
     /**
@@ -1250,8 +1271,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldSrcLDInstESet = srcLDInstESet;
         srcLDInst = SRC_LD_INST_EDEFAULT;
         srcLDInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__SRC_LD_INST, oldSrcLDInst, SRC_LD_INST_EDEFAULT, oldSrcLDInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__SRC_LD_INST, oldSrcLDInst,
+                    SRC_LD_INST_EDEFAULT, oldSrcLDInstESet ) );
     }
 
     /**
@@ -1285,8 +1307,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         srcLNClass = newSrcLNClass;
         boolean oldSrcLNClassESet = srcLNClassESet;
         srcLNClassESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__SRC_LN_CLASS, oldSrcLNClass, srcLNClass, !oldSrcLNClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__SRC_LN_CLASS, oldSrcLNClass,
+                    srcLNClass, !oldSrcLNClassESet ) );
     }
 
     /**
@@ -1300,8 +1323,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldSrcLNClassESet = srcLNClassESet;
         srcLNClass = SRC_LN_CLASS_EDEFAULT;
         srcLNClassESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__SRC_LN_CLASS, oldSrcLNClass, SRC_LN_CLASS_EDEFAULT, oldSrcLNClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__SRC_LN_CLASS, oldSrcLNClass,
+                    SRC_LN_CLASS_EDEFAULT, oldSrcLNClassESet ) );
     }
 
     /**
@@ -1335,8 +1359,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         srcLNInst = newSrcLNInst;
         boolean oldSrcLNInstESet = srcLNInstESet;
         srcLNInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__SRC_LN_INST, oldSrcLNInst, srcLNInst, !oldSrcLNInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__SRC_LN_INST, oldSrcLNInst,
+                    srcLNInst, !oldSrcLNInstESet ) );
     }
 
     /**
@@ -1350,8 +1375,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldSrcLNInstESet = srcLNInstESet;
         srcLNInst = SRC_LN_INST_EDEFAULT;
         srcLNInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__SRC_LN_INST, oldSrcLNInst, SRC_LN_INST_EDEFAULT, oldSrcLNInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__SRC_LN_INST, oldSrcLNInst,
+                    SRC_LN_INST_EDEFAULT, oldSrcLNInstESet ) );
     }
 
     /**
@@ -1385,8 +1411,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         srcPrefix = newSrcPrefix;
         boolean oldSrcPrefixESet = srcPrefixESet;
         srcPrefixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__SRC_PREFIX, oldSrcPrefix, srcPrefix, !oldSrcPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__SRC_PREFIX, oldSrcPrefix,
+                    srcPrefix, !oldSrcPrefixESet ) );
     }
 
     /**
@@ -1400,8 +1427,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldSrcPrefixESet = srcPrefixESet;
         srcPrefix = SRC_PREFIX_EDEFAULT;
         srcPrefixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__SRC_PREFIX, oldSrcPrefix, SRC_PREFIX_EDEFAULT, oldSrcPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__SRC_PREFIX, oldSrcPrefix,
+                    SRC_PREFIX_EDEFAULT, oldSrcPrefixESet ) );
     }
 
     /**
@@ -1421,8 +1449,8 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      */
     @Override
     public Inputs getParentInputs() {
-        if (eContainerFeatureID() != SclPackage.EXT_REF__PARENT_INPUTS) return null;
-        return (Inputs)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.EXT_REF__PARENT_INPUTS ) return null;
+        return ( Inputs ) eInternalContainer();
     }
 
     /**
@@ -1430,8 +1458,8 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentInputs(Inputs newParentInputs, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentInputs, SclPackage.EXT_REF__PARENT_INPUTS, msgs);
+    public NotificationChain basicSetParentInputs( Inputs newParentInputs, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentInputs, SclPackage.EXT_REF__PARENT_INPUTS, msgs );
         return msgs;
     }
 
@@ -1441,20 +1469,23 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * @generated
      */
     @Override
-    public void setParentInputs(Inputs newParentInputs) {
-        if (newParentInputs != eInternalContainer() || (eContainerFeatureID() != SclPackage.EXT_REF__PARENT_INPUTS && newParentInputs != null)) {
-            if (EcoreUtil.isAncestor(this, newParentInputs))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentInputs( Inputs newParentInputs ) {
+        if( newParentInputs != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.EXT_REF__PARENT_INPUTS && newParentInputs != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentInputs ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentInputs != null)
-                msgs = ((InternalEObject)newParentInputs).eInverseAdd(this, SclPackage.INPUTS__EXT_REF, Inputs.class, msgs);
-            msgs = basicSetParentInputs(newParentInputs, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentInputs != null )
+                msgs = ( ( InternalEObject ) newParentInputs ).eInverseAdd( this, SclPackage.INPUTS__EXT_REF,
+                        Inputs.class, msgs );
+            msgs = basicSetParentInputs( newParentInputs, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__PARENT_INPUTS, newParentInputs, newParentInputs));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__PARENT_INPUTS, newParentInputs,
+                    newParentInputs ) );
     }
 
     /**
@@ -1472,14 +1503,20 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToAbstractDataAttribute(AbstractDataAttribute newRefersToAbstractDataAttribute, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToAbstractDataAttribute(
+            AbstractDataAttribute newRefersToAbstractDataAttribute, NotificationChain msgs ) {
         AbstractDataAttribute oldRefersToAbstractDataAttribute = refersToAbstractDataAttribute;
         refersToAbstractDataAttribute = newRefersToAbstractDataAttribute;
         boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet;
         refersToAbstractDataAttributeESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute, newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute,
+                    newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1490,21 +1527,25 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * @generated
      */
     @Override
-    public void setRefersToAbstractDataAttribute(AbstractDataAttribute newRefersToAbstractDataAttribute) {
-        if (newRefersToAbstractDataAttribute != refersToAbstractDataAttribute) {
+    public void setRefersToAbstractDataAttribute( AbstractDataAttribute newRefersToAbstractDataAttribute ) {
+        if( newRefersToAbstractDataAttribute != refersToAbstractDataAttribute ) {
             NotificationChain msgs = null;
-            if (refersToAbstractDataAttribute != null)
-                msgs = ((InternalEObject)refersToAbstractDataAttribute).eInverseRemove(this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF, AbstractDataAttribute.class, msgs);
-            if (newRefersToAbstractDataAttribute != null)
-                msgs = ((InternalEObject)newRefersToAbstractDataAttribute).eInverseAdd(this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF, AbstractDataAttribute.class, msgs);
-            msgs = basicSetRefersToAbstractDataAttribute(newRefersToAbstractDataAttribute, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToAbstractDataAttribute != null )
+                msgs = ( ( InternalEObject ) refersToAbstractDataAttribute ).eInverseRemove( this,
+                        SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF, AbstractDataAttribute.class, msgs );
+            if( newRefersToAbstractDataAttribute != null )
+                msgs = ( ( InternalEObject ) newRefersToAbstractDataAttribute ).eInverseAdd( this,
+                        SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF, AbstractDataAttribute.class, msgs );
+            msgs = basicSetRefersToAbstractDataAttribute( newRefersToAbstractDataAttribute, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet;
             refersToAbstractDataAttributeESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, newRefersToAbstractDataAttribute, newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET,
+                        SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, newRefersToAbstractDataAttribute,
+                        newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet ) );
         }
     }
 
@@ -1513,14 +1554,19 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToAbstractDataAttribute(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToAbstractDataAttribute( NotificationChain msgs ) {
         AbstractDataAttribute oldRefersToAbstractDataAttribute = refersToAbstractDataAttribute;
         refersToAbstractDataAttribute = null;
         boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet;
         refersToAbstractDataAttributeESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute, null, oldRefersToAbstractDataAttributeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute, null,
+                    oldRefersToAbstractDataAttributeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1532,17 +1578,20 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      */
     @Override
     public void unsetRefersToAbstractDataAttribute() {
-        if (refersToAbstractDataAttribute != null) {
+        if( refersToAbstractDataAttribute != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToAbstractDataAttribute).eInverseRemove(this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF, AbstractDataAttribute.class, msgs);
-            msgs = basicUnsetRefersToAbstractDataAttribute(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToAbstractDataAttribute ).eInverseRemove( this,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF, AbstractDataAttribute.class, msgs );
+            msgs = basicUnsetRefersToAbstractDataAttribute( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet;
             refersToAbstractDataAttributeESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, null, null, oldRefersToAbstractDataAttributeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET,
+                        SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, null, null,
+                        oldRefersToAbstractDataAttributeESet ) );
         }
     }
 
@@ -1571,14 +1620,20 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToAbstractDataObject(AbstractDataObject newRefersToAbstractDataObject, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToAbstractDataObject( AbstractDataObject newRefersToAbstractDataObject,
+            NotificationChain msgs ) {
         AbstractDataObject oldRefersToAbstractDataObject = refersToAbstractDataObject;
         refersToAbstractDataObject = newRefersToAbstractDataObject;
         boolean oldRefersToAbstractDataObjectESet = refersToAbstractDataObjectESet;
         refersToAbstractDataObjectESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT, oldRefersToAbstractDataObject, newRefersToAbstractDataObject, !oldRefersToAbstractDataObjectESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT, oldRefersToAbstractDataObject,
+                    newRefersToAbstractDataObject, !oldRefersToAbstractDataObjectESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1589,21 +1644,25 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * @generated
      */
     @Override
-    public void setRefersToAbstractDataObject(AbstractDataObject newRefersToAbstractDataObject) {
-        if (newRefersToAbstractDataObject != refersToAbstractDataObject) {
+    public void setRefersToAbstractDataObject( AbstractDataObject newRefersToAbstractDataObject ) {
+        if( newRefersToAbstractDataObject != refersToAbstractDataObject ) {
             NotificationChain msgs = null;
-            if (refersToAbstractDataObject != null)
-                msgs = ((InternalEObject)refersToAbstractDataObject).eInverseRemove(this, SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF, AbstractDataObject.class, msgs);
-            if (newRefersToAbstractDataObject != null)
-                msgs = ((InternalEObject)newRefersToAbstractDataObject).eInverseAdd(this, SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF, AbstractDataObject.class, msgs);
-            msgs = basicSetRefersToAbstractDataObject(newRefersToAbstractDataObject, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToAbstractDataObject != null )
+                msgs = ( ( InternalEObject ) refersToAbstractDataObject ).eInverseRemove( this,
+                        SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF, AbstractDataObject.class, msgs );
+            if( newRefersToAbstractDataObject != null )
+                msgs = ( ( InternalEObject ) newRefersToAbstractDataObject ).eInverseAdd( this,
+                        SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF, AbstractDataObject.class, msgs );
+            msgs = basicSetRefersToAbstractDataObject( newRefersToAbstractDataObject, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAbstractDataObjectESet = refersToAbstractDataObjectESet;
             refersToAbstractDataObjectESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT, newRefersToAbstractDataObject, newRefersToAbstractDataObject, !oldRefersToAbstractDataObjectESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET,
+                        SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT, newRefersToAbstractDataObject,
+                        newRefersToAbstractDataObject, !oldRefersToAbstractDataObjectESet ) );
         }
     }
 
@@ -1612,14 +1671,19 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToAbstractDataObject(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToAbstractDataObject( NotificationChain msgs ) {
         AbstractDataObject oldRefersToAbstractDataObject = refersToAbstractDataObject;
         refersToAbstractDataObject = null;
         boolean oldRefersToAbstractDataObjectESet = refersToAbstractDataObjectESet;
         refersToAbstractDataObjectESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT, oldRefersToAbstractDataObject, null, oldRefersToAbstractDataObjectESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT, oldRefersToAbstractDataObject, null,
+                    oldRefersToAbstractDataObjectESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1631,17 +1695,20 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      */
     @Override
     public void unsetRefersToAbstractDataObject() {
-        if (refersToAbstractDataObject != null) {
+        if( refersToAbstractDataObject != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToAbstractDataObject).eInverseRemove(this, SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF, AbstractDataObject.class, msgs);
-            msgs = basicUnsetRefersToAbstractDataObject(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToAbstractDataObject ).eInverseRemove( this,
+                    SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF, AbstractDataObject.class, msgs );
+            msgs = basicUnsetRefersToAbstractDataObject( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAbstractDataObjectESet = refersToAbstractDataObjectESet;
             refersToAbstractDataObjectESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT, null, null, oldRefersToAbstractDataObjectESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET,
+                        SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT, null, null,
+                        oldRefersToAbstractDataObjectESet ) );
         }
     }
 
@@ -1671,13 +1738,14 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * @generated
      */
     @Override
-    public void setDesc(String newDesc) {
+    public void setDesc( String newDesc ) {
         String oldDesc = desc;
         desc = newDesc;
         boolean oldDescESet = descESet;
         descESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__DESC, oldDesc, desc, !oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__DESC, oldDesc, desc,
+                    !oldDescESet ) );
     }
 
     /**
@@ -1691,8 +1759,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldDescESet = descESet;
         desc = DESC_EDEFAULT;
         descESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__DESC, oldDesc, DESC_EDEFAULT, oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__DESC, oldDesc, DESC_EDEFAULT,
+                    oldDescESet ) );
     }
 
     /**
@@ -1721,13 +1790,14 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * @generated
      */
     @Override
-    public void setPServT(ServiceType newPServT) {
+    public void setPServT( ServiceType newPServT ) {
         ServiceType oldPServT = pServT;
         pServT = newPServT == null ? PSERV_T_EDEFAULT : newPServT;
         boolean oldPServTESet = pServTESet;
         pServTESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__PSERV_T, oldPServT, pServT, !oldPServTESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__PSERV_T, oldPServT, pServT,
+                    !oldPServTESet ) );
     }
 
     /**
@@ -1741,8 +1811,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldPServTESet = pServTESet;
         pServT = PSERV_T_EDEFAULT;
         pServTESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__PSERV_T, oldPServT, PSERV_T_EDEFAULT, oldPServTESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__PSERV_T, oldPServT,
+                    PSERV_T_EDEFAULT, oldPServTESet ) );
     }
 
     /**
@@ -1771,13 +1842,14 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * @generated
      */
     @Override
-    public void setPLN(String newPLN) {
+    public void setPLN( String newPLN ) {
         String oldPLN = pLN;
         pLN = newPLN;
         boolean oldPLNESet = pLNESet;
         pLNESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__PLN, oldPLN, pLN, !oldPLNESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__PLN, oldPLN, pLN,
+                    !oldPLNESet ) );
     }
 
     /**
@@ -1791,8 +1863,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldPLNESet = pLNESet;
         pLN = PLN_EDEFAULT;
         pLNESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__PLN, oldPLN, PLN_EDEFAULT, oldPLNESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__PLN, oldPLN, PLN_EDEFAULT,
+                    oldPLNESet ) );
     }
 
     /**
@@ -1821,13 +1894,14 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * @generated
      */
     @Override
-    public void setPDO(String newPDO) {
+    public void setPDO( String newPDO ) {
         String oldPDO = pDO;
         pDO = newPDO;
         boolean oldPDOESet = pDOESet;
         pDOESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__PDO, oldPDO, pDO, !oldPDOESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__PDO, oldPDO, pDO,
+                    !oldPDOESet ) );
     }
 
     /**
@@ -1841,8 +1915,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldPDOESet = pDOESet;
         pDO = PDO_EDEFAULT;
         pDOESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__PDO, oldPDO, PDO_EDEFAULT, oldPDOESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__PDO, oldPDO, PDO_EDEFAULT,
+                    oldPDOESet ) );
     }
 
     /**
@@ -1871,13 +1946,14 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * @generated
      */
     @Override
-    public void setPDA(String newPDA) {
+    public void setPDA( String newPDA ) {
         String oldPDA = pDA;
         pDA = newPDA;
         boolean oldPDAESet = pDAESet;
         pDAESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__PDA, oldPDA, pDA, !oldPDAESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__PDA, oldPDA, pDA,
+                    !oldPDAESet ) );
     }
 
     /**
@@ -1891,8 +1967,9 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         boolean oldPDAESet = pDAESet;
         pDA = PDA_EDEFAULT;
         pDAESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__PDA, oldPDA, PDA_EDEFAULT, oldPDAESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__PDA, oldPDA, PDA_EDEFAULT,
+                    oldPDAESet ) );
     }
 
     /**
@@ -1920,14 +1997,19 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToControl(Control newRefersToControl, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToControl( Control newRefersToControl, NotificationChain msgs ) {
         Control oldRefersToControl = refersToControl;
         refersToControl = newRefersToControl;
         boolean oldRefersToControlESet = refersToControlESet;
         refersToControlESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__REFERS_TO_CONTROL, oldRefersToControl, newRefersToControl, !oldRefersToControlESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.EXT_REF__REFERS_TO_CONTROL, oldRefersToControl, newRefersToControl,
+                    !oldRefersToControlESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1938,21 +2020,24 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * @generated
      */
     @Override
-    public void setRefersToControl(Control newRefersToControl) {
-        if (newRefersToControl != refersToControl) {
+    public void setRefersToControl( Control newRefersToControl ) {
+        if( newRefersToControl != refersToControl ) {
             NotificationChain msgs = null;
-            if (refersToControl != null)
-                msgs = ((InternalEObject)refersToControl).eInverseRemove(this, SclPackage.CONTROL__REFERRED_BY_EXT_REF, Control.class, msgs);
-            if (newRefersToControl != null)
-                msgs = ((InternalEObject)newRefersToControl).eInverseAdd(this, SclPackage.CONTROL__REFERRED_BY_EXT_REF, Control.class, msgs);
-            msgs = basicSetRefersToControl(newRefersToControl, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToControl != null )
+                msgs = ( ( InternalEObject ) refersToControl ).eInverseRemove( this,
+                        SclPackage.CONTROL__REFERRED_BY_EXT_REF, Control.class, msgs );
+            if( newRefersToControl != null )
+                msgs = ( ( InternalEObject ) newRefersToControl ).eInverseAdd( this,
+                        SclPackage.CONTROL__REFERRED_BY_EXT_REF, Control.class, msgs );
+            msgs = basicSetRefersToControl( newRefersToControl, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToControlESet = refersToControlESet;
             refersToControlESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.EXT_REF__REFERS_TO_CONTROL, newRefersToControl, newRefersToControl, !oldRefersToControlESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.EXT_REF__REFERS_TO_CONTROL,
+                        newRefersToControl, newRefersToControl, !oldRefersToControlESet ) );
         }
     }
 
@@ -1961,14 +2046,18 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToControl(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToControl( NotificationChain msgs ) {
         Control oldRefersToControl = refersToControl;
         refersToControl = null;
         boolean oldRefersToControlESet = refersToControlESet;
         refersToControlESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__REFERS_TO_CONTROL, oldRefersToControl, null, oldRefersToControlESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.EXT_REF__REFERS_TO_CONTROL, oldRefersToControl, null, oldRefersToControlESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1980,17 +2069,19 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      */
     @Override
     public void unsetRefersToControl() {
-        if (refersToControl != null) {
+        if( refersToControl != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToControl).eInverseRemove(this, SclPackage.CONTROL__REFERRED_BY_EXT_REF, Control.class, msgs);
-            msgs = basicUnsetRefersToControl(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToControl ).eInverseRemove( this,
+                    SclPackage.CONTROL__REFERRED_BY_EXT_REF, Control.class, msgs );
+            msgs = basicUnsetRefersToControl( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToControlESet = refersToControlESet;
             refersToControlESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.EXT_REF__REFERS_TO_CONTROL, null, null, oldRefersToControlESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.EXT_REF__REFERS_TO_CONTROL, null,
+                        null, oldRefersToControlESet ) );
         }
     }
 
@@ -2011,25 +2102,28 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.EXT_REF__PARENT_INPUTS:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentInputs((Inputs)otherEnd, msgs);
-            case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                if (refersToAbstractDataAttribute != null)
-                    msgs = ((InternalEObject)refersToAbstractDataAttribute).eInverseRemove(this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF, AbstractDataAttribute.class, msgs);
-                return basicSetRefersToAbstractDataAttribute((AbstractDataAttribute)otherEnd, msgs);
-            case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT:
-                if (refersToAbstractDataObject != null)
-                    msgs = ((InternalEObject)refersToAbstractDataObject).eInverseRemove(this, SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF, AbstractDataObject.class, msgs);
-                return basicSetRefersToAbstractDataObject((AbstractDataObject)otherEnd, msgs);
-            case SclPackage.EXT_REF__REFERS_TO_CONTROL:
-                if (refersToControl != null)
-                    msgs = ((InternalEObject)refersToControl).eInverseRemove(this, SclPackage.CONTROL__REFERRED_BY_EXT_REF, Control.class, msgs);
-                return basicSetRefersToControl((Control)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.EXT_REF__PARENT_INPUTS:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentInputs( ( Inputs ) otherEnd, msgs );
+        case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            if( refersToAbstractDataAttribute != null )
+                msgs = ( ( InternalEObject ) refersToAbstractDataAttribute ).eInverseRemove( this,
+                        SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF, AbstractDataAttribute.class, msgs );
+            return basicSetRefersToAbstractDataAttribute( ( AbstractDataAttribute ) otherEnd, msgs );
+        case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT:
+            if( refersToAbstractDataObject != null )
+                msgs = ( ( InternalEObject ) refersToAbstractDataObject ).eInverseRemove( this,
+                        SclPackage.ABSTRACT_DATA_OBJECT__REFERRED_BY_EXT_REF, AbstractDataObject.class, msgs );
+            return basicSetRefersToAbstractDataObject( ( AbstractDataObject ) otherEnd, msgs );
+        case SclPackage.EXT_REF__REFERS_TO_CONTROL:
+            if( refersToControl != null )
+                msgs = ( ( InternalEObject ) refersToControl ).eInverseRemove( this,
+                        SclPackage.CONTROL__REFERRED_BY_EXT_REF, Control.class, msgs );
+            return basicSetRefersToControl( ( Control ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -2039,17 +2133,17 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.EXT_REF__PARENT_INPUTS:
-                return basicSetParentInputs(null, msgs);
-            case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                return basicUnsetRefersToAbstractDataAttribute(msgs);
-            case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT:
-                return basicUnsetRefersToAbstractDataObject(msgs);
-            case SclPackage.EXT_REF__REFERS_TO_CONTROL:
-                return basicUnsetRefersToControl(msgs);
+        switch( featureID ) {
+        case SclPackage.EXT_REF__PARENT_INPUTS:
+            return basicSetParentInputs( null, msgs );
+        case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            return basicUnsetRefersToAbstractDataAttribute( msgs );
+        case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT:
+            return basicUnsetRefersToAbstractDataObject( msgs );
+        case SclPackage.EXT_REF__REFERS_TO_CONTROL:
+            return basicUnsetRefersToControl( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -2059,11 +2153,11 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.EXT_REF__PARENT_INPUTS:
-                return eInternalContainer().eInverseRemove(this, SclPackage.INPUTS__EXT_REF, Inputs.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.EXT_REF__PARENT_INPUTS:
+            return eInternalContainer().eInverseRemove( this, SclPackage.INPUTS__EXT_REF, Inputs.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -2073,55 +2167,55 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.EXT_REF__DESC:
-                return getDesc();
-            case SclPackage.EXT_REF__DA_NAME:
-                return getDaName();
-            case SclPackage.EXT_REF__DO_NAME:
-                return getDoName();
-            case SclPackage.EXT_REF__IED_NAME:
-                return getIedName();
-            case SclPackage.EXT_REF__INT_ADDR:
-                return getIntAddr();
-            case SclPackage.EXT_REF__LD_INST:
-                return getLdInst();
-            case SclPackage.EXT_REF__LN_CLASS:
-                return getLnClass();
-            case SclPackage.EXT_REF__LN_INST:
-                return getLnInst();
-            case SclPackage.EXT_REF__PREFIX:
-                return getPrefix();
-            case SclPackage.EXT_REF__SERVICE_TYPE:
-                return getServiceType();
-            case SclPackage.EXT_REF__SRC_CB_NAME:
-                return getSrcCBName();
-            case SclPackage.EXT_REF__SRC_LD_INST:
-                return getSrcLDInst();
-            case SclPackage.EXT_REF__SRC_LN_CLASS:
-                return getSrcLNClass();
-            case SclPackage.EXT_REF__SRC_LN_INST:
-                return getSrcLNInst();
-            case SclPackage.EXT_REF__SRC_PREFIX:
-                return getSrcPrefix();
-            case SclPackage.EXT_REF__PARENT_INPUTS:
-                return getParentInputs();
-            case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                return getRefersToAbstractDataAttribute();
-            case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT:
-                return getRefersToAbstractDataObject();
-            case SclPackage.EXT_REF__PSERV_T:
-                return getPServT();
-            case SclPackage.EXT_REF__PLN:
-                return getPLN();
-            case SclPackage.EXT_REF__PDO:
-                return getPDO();
-            case SclPackage.EXT_REF__PDA:
-                return getPDA();
-            case SclPackage.EXT_REF__REFERS_TO_CONTROL:
-                return getRefersToControl();
+        switch( featureID ) {
+        case SclPackage.EXT_REF__DESC:
+            return getDesc();
+        case SclPackage.EXT_REF__DA_NAME:
+            return getDaName();
+        case SclPackage.EXT_REF__DO_NAME:
+            return getDoName();
+        case SclPackage.EXT_REF__IED_NAME:
+            return getIedName();
+        case SclPackage.EXT_REF__INT_ADDR:
+            return getIntAddr();
+        case SclPackage.EXT_REF__LD_INST:
+            return getLdInst();
+        case SclPackage.EXT_REF__LN_CLASS:
+            return getLnClass();
+        case SclPackage.EXT_REF__LN_INST:
+            return getLnInst();
+        case SclPackage.EXT_REF__PREFIX:
+            return getPrefix();
+        case SclPackage.EXT_REF__SERVICE_TYPE:
+            return getServiceType();
+        case SclPackage.EXT_REF__SRC_CB_NAME:
+            return getSrcCBName();
+        case SclPackage.EXT_REF__SRC_LD_INST:
+            return getSrcLDInst();
+        case SclPackage.EXT_REF__SRC_LN_CLASS:
+            return getSrcLNClass();
+        case SclPackage.EXT_REF__SRC_LN_INST:
+            return getSrcLNInst();
+        case SclPackage.EXT_REF__SRC_PREFIX:
+            return getSrcPrefix();
+        case SclPackage.EXT_REF__PARENT_INPUTS:
+            return getParentInputs();
+        case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            return getRefersToAbstractDataAttribute();
+        case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT:
+            return getRefersToAbstractDataObject();
+        case SclPackage.EXT_REF__PSERV_T:
+            return getPServT();
+        case SclPackage.EXT_REF__PLN:
+            return getPLN();
+        case SclPackage.EXT_REF__PDO:
+            return getPDO();
+        case SclPackage.EXT_REF__PDA:
+            return getPDA();
+        case SclPackage.EXT_REF__REFERS_TO_CONTROL:
+            return getRefersToControl();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -2131,78 +2225,78 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.EXT_REF__DESC:
-                setDesc((String)newValue);
-                return;
-            case SclPackage.EXT_REF__DA_NAME:
-                setDaName((String)newValue);
-                return;
-            case SclPackage.EXT_REF__DO_NAME:
-                setDoName((String)newValue);
-                return;
-            case SclPackage.EXT_REF__IED_NAME:
-                setIedName((String)newValue);
-                return;
-            case SclPackage.EXT_REF__INT_ADDR:
-                setIntAddr((String)newValue);
-                return;
-            case SclPackage.EXT_REF__LD_INST:
-                setLdInst((String)newValue);
-                return;
-            case SclPackage.EXT_REF__LN_CLASS:
-                setLnClass((String)newValue);
-                return;
-            case SclPackage.EXT_REF__LN_INST:
-                setLnInst((String)newValue);
-                return;
-            case SclPackage.EXT_REF__PREFIX:
-                setPrefix((String)newValue);
-                return;
-            case SclPackage.EXT_REF__SERVICE_TYPE:
-                setServiceType((ServiceType)newValue);
-                return;
-            case SclPackage.EXT_REF__SRC_CB_NAME:
-                setSrcCBName((String)newValue);
-                return;
-            case SclPackage.EXT_REF__SRC_LD_INST:
-                setSrcLDInst((String)newValue);
-                return;
-            case SclPackage.EXT_REF__SRC_LN_CLASS:
-                setSrcLNClass((String)newValue);
-                return;
-            case SclPackage.EXT_REF__SRC_LN_INST:
-                setSrcLNInst((String)newValue);
-                return;
-            case SclPackage.EXT_REF__SRC_PREFIX:
-                setSrcPrefix((String)newValue);
-                return;
-            case SclPackage.EXT_REF__PARENT_INPUTS:
-                setParentInputs((Inputs)newValue);
-                return;
-            case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                setRefersToAbstractDataAttribute((AbstractDataAttribute)newValue);
-                return;
-            case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT:
-                setRefersToAbstractDataObject((AbstractDataObject)newValue);
-                return;
-            case SclPackage.EXT_REF__PSERV_T:
-                setPServT((ServiceType)newValue);
-                return;
-            case SclPackage.EXT_REF__PLN:
-                setPLN((String)newValue);
-                return;
-            case SclPackage.EXT_REF__PDO:
-                setPDO((String)newValue);
-                return;
-            case SclPackage.EXT_REF__PDA:
-                setPDA((String)newValue);
-                return;
-            case SclPackage.EXT_REF__REFERS_TO_CONTROL:
-                setRefersToControl((Control)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.EXT_REF__DESC:
+            setDesc( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__DA_NAME:
+            setDaName( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__DO_NAME:
+            setDoName( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__IED_NAME:
+            setIedName( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__INT_ADDR:
+            setIntAddr( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__LD_INST:
+            setLdInst( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__LN_CLASS:
+            setLnClass( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__LN_INST:
+            setLnInst( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__PREFIX:
+            setPrefix( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__SERVICE_TYPE:
+            setServiceType( ( ServiceType ) newValue );
+            return;
+        case SclPackage.EXT_REF__SRC_CB_NAME:
+            setSrcCBName( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__SRC_LD_INST:
+            setSrcLDInst( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__SRC_LN_CLASS:
+            setSrcLNClass( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__SRC_LN_INST:
+            setSrcLNInst( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__SRC_PREFIX:
+            setSrcPrefix( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__PARENT_INPUTS:
+            setParentInputs( ( Inputs ) newValue );
+            return;
+        case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            setRefersToAbstractDataAttribute( ( AbstractDataAttribute ) newValue );
+            return;
+        case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT:
+            setRefersToAbstractDataObject( ( AbstractDataObject ) newValue );
+            return;
+        case SclPackage.EXT_REF__PSERV_T:
+            setPServT( ( ServiceType ) newValue );
+            return;
+        case SclPackage.EXT_REF__PLN:
+            setPLN( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__PDO:
+            setPDO( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__PDA:
+            setPDA( ( String ) newValue );
+            return;
+        case SclPackage.EXT_REF__REFERS_TO_CONTROL:
+            setRefersToControl( ( Control ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -2212,78 +2306,78 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.EXT_REF__DESC:
-                unsetDesc();
-                return;
-            case SclPackage.EXT_REF__DA_NAME:
-                unsetDaName();
-                return;
-            case SclPackage.EXT_REF__DO_NAME:
-                unsetDoName();
-                return;
-            case SclPackage.EXT_REF__IED_NAME:
-                unsetIedName();
-                return;
-            case SclPackage.EXT_REF__INT_ADDR:
-                unsetIntAddr();
-                return;
-            case SclPackage.EXT_REF__LD_INST:
-                unsetLdInst();
-                return;
-            case SclPackage.EXT_REF__LN_CLASS:
-                unsetLnClass();
-                return;
-            case SclPackage.EXT_REF__LN_INST:
-                unsetLnInst();
-                return;
-            case SclPackage.EXT_REF__PREFIX:
-                unsetPrefix();
-                return;
-            case SclPackage.EXT_REF__SERVICE_TYPE:
-                unsetServiceType();
-                return;
-            case SclPackage.EXT_REF__SRC_CB_NAME:
-                unsetSrcCBName();
-                return;
-            case SclPackage.EXT_REF__SRC_LD_INST:
-                unsetSrcLDInst();
-                return;
-            case SclPackage.EXT_REF__SRC_LN_CLASS:
-                unsetSrcLNClass();
-                return;
-            case SclPackage.EXT_REF__SRC_LN_INST:
-                unsetSrcLNInst();
-                return;
-            case SclPackage.EXT_REF__SRC_PREFIX:
-                unsetSrcPrefix();
-                return;
-            case SclPackage.EXT_REF__PARENT_INPUTS:
-                setParentInputs((Inputs)null);
-                return;
-            case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                unsetRefersToAbstractDataAttribute();
-                return;
-            case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT:
-                unsetRefersToAbstractDataObject();
-                return;
-            case SclPackage.EXT_REF__PSERV_T:
-                unsetPServT();
-                return;
-            case SclPackage.EXT_REF__PLN:
-                unsetPLN();
-                return;
-            case SclPackage.EXT_REF__PDO:
-                unsetPDO();
-                return;
-            case SclPackage.EXT_REF__PDA:
-                unsetPDA();
-                return;
-            case SclPackage.EXT_REF__REFERS_TO_CONTROL:
-                unsetRefersToControl();
-                return;
+        switch( featureID ) {
+        case SclPackage.EXT_REF__DESC:
+            unsetDesc();
+            return;
+        case SclPackage.EXT_REF__DA_NAME:
+            unsetDaName();
+            return;
+        case SclPackage.EXT_REF__DO_NAME:
+            unsetDoName();
+            return;
+        case SclPackage.EXT_REF__IED_NAME:
+            unsetIedName();
+            return;
+        case SclPackage.EXT_REF__INT_ADDR:
+            unsetIntAddr();
+            return;
+        case SclPackage.EXT_REF__LD_INST:
+            unsetLdInst();
+            return;
+        case SclPackage.EXT_REF__LN_CLASS:
+            unsetLnClass();
+            return;
+        case SclPackage.EXT_REF__LN_INST:
+            unsetLnInst();
+            return;
+        case SclPackage.EXT_REF__PREFIX:
+            unsetPrefix();
+            return;
+        case SclPackage.EXT_REF__SERVICE_TYPE:
+            unsetServiceType();
+            return;
+        case SclPackage.EXT_REF__SRC_CB_NAME:
+            unsetSrcCBName();
+            return;
+        case SclPackage.EXT_REF__SRC_LD_INST:
+            unsetSrcLDInst();
+            return;
+        case SclPackage.EXT_REF__SRC_LN_CLASS:
+            unsetSrcLNClass();
+            return;
+        case SclPackage.EXT_REF__SRC_LN_INST:
+            unsetSrcLNInst();
+            return;
+        case SclPackage.EXT_REF__SRC_PREFIX:
+            unsetSrcPrefix();
+            return;
+        case SclPackage.EXT_REF__PARENT_INPUTS:
+            setParentInputs( ( Inputs ) null );
+            return;
+        case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            unsetRefersToAbstractDataAttribute();
+            return;
+        case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT:
+            unsetRefersToAbstractDataObject();
+            return;
+        case SclPackage.EXT_REF__PSERV_T:
+            unsetPServT();
+            return;
+        case SclPackage.EXT_REF__PLN:
+            unsetPLN();
+            return;
+        case SclPackage.EXT_REF__PDO:
+            unsetPDO();
+            return;
+        case SclPackage.EXT_REF__PDA:
+            unsetPDA();
+            return;
+        case SclPackage.EXT_REF__REFERS_TO_CONTROL:
+            unsetRefersToControl();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -2293,55 +2387,55 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.EXT_REF__DESC:
-                return isSetDesc();
-            case SclPackage.EXT_REF__DA_NAME:
-                return isSetDaName();
-            case SclPackage.EXT_REF__DO_NAME:
-                return isSetDoName();
-            case SclPackage.EXT_REF__IED_NAME:
-                return isSetIedName();
-            case SclPackage.EXT_REF__INT_ADDR:
-                return isSetIntAddr();
-            case SclPackage.EXT_REF__LD_INST:
-                return isSetLdInst();
-            case SclPackage.EXT_REF__LN_CLASS:
-                return isSetLnClass();
-            case SclPackage.EXT_REF__LN_INST:
-                return isSetLnInst();
-            case SclPackage.EXT_REF__PREFIX:
-                return isSetPrefix();
-            case SclPackage.EXT_REF__SERVICE_TYPE:
-                return isSetServiceType();
-            case SclPackage.EXT_REF__SRC_CB_NAME:
-                return isSetSrcCBName();
-            case SclPackage.EXT_REF__SRC_LD_INST:
-                return isSetSrcLDInst();
-            case SclPackage.EXT_REF__SRC_LN_CLASS:
-                return isSetSrcLNClass();
-            case SclPackage.EXT_REF__SRC_LN_INST:
-                return isSetSrcLNInst();
-            case SclPackage.EXT_REF__SRC_PREFIX:
-                return isSetSrcPrefix();
-            case SclPackage.EXT_REF__PARENT_INPUTS:
-                return getParentInputs() != null;
-            case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                return isSetRefersToAbstractDataAttribute();
-            case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT:
-                return isSetRefersToAbstractDataObject();
-            case SclPackage.EXT_REF__PSERV_T:
-                return isSetPServT();
-            case SclPackage.EXT_REF__PLN:
-                return isSetPLN();
-            case SclPackage.EXT_REF__PDO:
-                return isSetPDO();
-            case SclPackage.EXT_REF__PDA:
-                return isSetPDA();
-            case SclPackage.EXT_REF__REFERS_TO_CONTROL:
-                return isSetRefersToControl();
+        switch( featureID ) {
+        case SclPackage.EXT_REF__DESC:
+            return isSetDesc();
+        case SclPackage.EXT_REF__DA_NAME:
+            return isSetDaName();
+        case SclPackage.EXT_REF__DO_NAME:
+            return isSetDoName();
+        case SclPackage.EXT_REF__IED_NAME:
+            return isSetIedName();
+        case SclPackage.EXT_REF__INT_ADDR:
+            return isSetIntAddr();
+        case SclPackage.EXT_REF__LD_INST:
+            return isSetLdInst();
+        case SclPackage.EXT_REF__LN_CLASS:
+            return isSetLnClass();
+        case SclPackage.EXT_REF__LN_INST:
+            return isSetLnInst();
+        case SclPackage.EXT_REF__PREFIX:
+            return isSetPrefix();
+        case SclPackage.EXT_REF__SERVICE_TYPE:
+            return isSetServiceType();
+        case SclPackage.EXT_REF__SRC_CB_NAME:
+            return isSetSrcCBName();
+        case SclPackage.EXT_REF__SRC_LD_INST:
+            return isSetSrcLDInst();
+        case SclPackage.EXT_REF__SRC_LN_CLASS:
+            return isSetSrcLNClass();
+        case SclPackage.EXT_REF__SRC_LN_INST:
+            return isSetSrcLNInst();
+        case SclPackage.EXT_REF__SRC_PREFIX:
+            return isSetSrcPrefix();
+        case SclPackage.EXT_REF__PARENT_INPUTS:
+            return getParentInputs() != null;
+        case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            return isSetRefersToAbstractDataAttribute();
+        case SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_OBJECT:
+            return isSetRefersToAbstractDataObject();
+        case SclPackage.EXT_REF__PSERV_T:
+            return isSetPServT();
+        case SclPackage.EXT_REF__PLN:
+            return isSetPLN();
+        case SclPackage.EXT_REF__PDO:
+            return isSetPDO();
+        case SclPackage.EXT_REF__PDA:
+            return isSetPDA();
+        case SclPackage.EXT_REF__REFERS_TO_CONTROL:
+            return isSetRefersToControl();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -2350,14 +2444,16 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * @generated
      */
     @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDesc.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.EXT_REF__DESC: return SclPackage.AG_DESC__DESC;
-                default: return -1;
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDesc.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.EXT_REF__DESC:
+                return SclPackage.AG_DESC__DESC;
+            default:
+                return -1;
             }
         }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
     }
 
     /**
@@ -2366,14 +2462,16 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      * @generated
      */
     @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDesc.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_DESC__DESC: return SclPackage.EXT_REF__DESC;
-                default: return -1;
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDesc.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_DESC__DESC:
+                return SclPackage.EXT_REF__DESC;
+            default:
+                return -1;
             }
         }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
     }
 
     /**
@@ -2383,48 +2481,105 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (desc: ");
-        if (descESet) result.append(desc); else result.append("<unset>");
-        result.append(", daName: ");
-        if (daNameESet) result.append(daName); else result.append("<unset>");
-        result.append(", doName: ");
-        if (doNameESet) result.append(doName); else result.append("<unset>");
-        result.append(", iedName: ");
-        if (iedNameESet) result.append(iedName); else result.append("<unset>");
-        result.append(", intAddr: ");
-        if (intAddrESet) result.append(intAddr); else result.append("<unset>");
-        result.append(", ldInst: ");
-        if (ldInstESet) result.append(ldInst); else result.append("<unset>");
-        result.append(", lnClass: ");
-        if (lnClassESet) result.append(lnClass); else result.append("<unset>");
-        result.append(", lnInst: ");
-        if (lnInstESet) result.append(lnInst); else result.append("<unset>");
-        result.append(", prefix: ");
-        if (prefixESet) result.append(prefix); else result.append("<unset>");
-        result.append(", serviceType: ");
-        if (serviceTypeESet) result.append(serviceType); else result.append("<unset>");
-        result.append(", srcCBName: ");
-        if (srcCBNameESet) result.append(srcCBName); else result.append("<unset>");
-        result.append(", srcLDInst: ");
-        if (srcLDInstESet) result.append(srcLDInst); else result.append("<unset>");
-        result.append(", srcLNClass: ");
-        if (srcLNClassESet) result.append(srcLNClass); else result.append("<unset>");
-        result.append(", srcLNInst: ");
-        if (srcLNInstESet) result.append(srcLNInst); else result.append("<unset>");
-        result.append(", srcPrefix: ");
-        if (srcPrefixESet) result.append(srcPrefix); else result.append("<unset>");
-        result.append(", pServT: ");
-        if (pServTESet) result.append(pServT); else result.append("<unset>");
-        result.append(", pLN: ");
-        if (pLNESet) result.append(pLN); else result.append("<unset>");
-        result.append(", pDO: ");
-        if (pDOESet) result.append(pDO); else result.append("<unset>");
-        result.append(", pDA: ");
-        if (pDAESet) result.append(pDA); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (desc: " );
+        if( descESet )
+            result.append( desc );
+        else
+            result.append( "<unset>" );
+        result.append( ", daName: " );
+        if( daNameESet )
+            result.append( daName );
+        else
+            result.append( "<unset>" );
+        result.append( ", doName: " );
+        if( doNameESet )
+            result.append( doName );
+        else
+            result.append( "<unset>" );
+        result.append( ", iedName: " );
+        if( iedNameESet )
+            result.append( iedName );
+        else
+            result.append( "<unset>" );
+        result.append( ", intAddr: " );
+        if( intAddrESet )
+            result.append( intAddr );
+        else
+            result.append( "<unset>" );
+        result.append( ", ldInst: " );
+        if( ldInstESet )
+            result.append( ldInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnClass: " );
+        if( lnClassESet )
+            result.append( lnClass );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnInst: " );
+        if( lnInstESet )
+            result.append( lnInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", prefix: " );
+        if( prefixESet )
+            result.append( prefix );
+        else
+            result.append( "<unset>" );
+        result.append( ", serviceType: " );
+        if( serviceTypeESet )
+            result.append( serviceType );
+        else
+            result.append( "<unset>" );
+        result.append( ", srcCBName: " );
+        if( srcCBNameESet )
+            result.append( srcCBName );
+        else
+            result.append( "<unset>" );
+        result.append( ", srcLDInst: " );
+        if( srcLDInstESet )
+            result.append( srcLDInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", srcLNClass: " );
+        if( srcLNClassESet )
+            result.append( srcLNClass );
+        else
+            result.append( "<unset>" );
+        result.append( ", srcLNInst: " );
+        if( srcLNInstESet )
+            result.append( srcLNInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", srcPrefix: " );
+        if( srcPrefixESet )
+            result.append( srcPrefix );
+        else
+            result.append( "<unset>" );
+        result.append( ", pServT: " );
+        if( pServTESet )
+            result.append( pServT );
+        else
+            result.append( "<unset>" );
+        result.append( ", pLN: " );
+        if( pLNESet )
+            result.append( pLN );
+        else
+            result.append( "<unset>" );
+        result.append( ", pDO: " );
+        if( pDOESet )
+            result.append( pDO );
+        else
+            result.append( "<unset>" );
+        result.append( ", pDA: " );
+        if( pDAESet )
+            result.append( pDA );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -2432,16 +2587,16 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         String messagePrefix = "[SCL links] while resolving link from ExtRef on line " + getLineNumber() + ": ";
         Pair< IED, LDevice > args = doBuildExplicitDataLink( console, messagePrefix );
         doBuildExplicitCBLink( console, messagePrefix, args );
     }
-    
+
     private Pair< IED, LDevice > doBuildExplicitDataLink( IRiseClipseConsole console, String mPrefix ) {
 
         String messagePrefix = mPrefix + "(looking for data) ";
-        
+
         // iedName      The name of the IED from where the input comes
         // ldInst       The LD instance name from where the input comes
         // prefix       The LN prefix
@@ -2456,37 +2611,39 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         // desc         A free description / text. Can e.g. be used at system engineering time to tell the IED engineer the purpose of this incoming data
         // serviceType  Optional, values: Poll, Report, GOOSE, SMV, Typically used at system design time to specify the service type to be used for sending the needed input data
 
-        if(( getIedName() == null ) || getIedName().isEmpty() ) {
+        if( ( getIedName() == null ) || getIedName().isEmpty() ) {
             // no warning if no iedName
             console.verbose( messagePrefix, "do not look for DA because iedName is missing" );
             return Pair.of( null, null );
         }
 
-        if(( getDoName() == null ) || getDoName().isEmpty() ) {
+        if( ( getDoName() == null ) || getDoName().isEmpty() ) {
             // No link if no doName
             console.verbose( messagePrefix, "doName is absent" );
             return Pair.of( null, null );
         }
 
         Pair< IED, Integer > ied = null;
-        if( "@".equals( getIedName() )) {
+        if( "@".equals( getIedName() ) ) {
             ied = Pair.of( SclUtilities.getMyIED( this ), 1 );
         }
         else {
             ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getIedName() );
         }
         if( ied.getLeft() == null ) {
-            SclUtilities.displayNotFoundWarning( console, messagePrefix, "IED( name = " + getIedName() + " )", ied.getRight() );
+            SclUtilities.displayNotFoundWarning( console, messagePrefix, "IED( name = " + getIedName() + " )",
+                    ied.getRight() );
             return Pair.of( null, null );
         }
-        console.verbose( messagePrefix, "found IED ( name = ", ied.getLeft().getName(), " ) on line ", ied.getLeft().getLineNumber() );
+        console.verbose( messagePrefix, "found IED ( name = ", ied.getLeft().getName(), " ) on line ",
+                ied.getLeft().getLineNumber() );
 
         // Only now so that we can give back ied
-        if(( getLdInst() == null ) || getLdInst().isEmpty() ) {
+        if( ( getLdInst() == null ) || getLdInst().isEmpty() ) {
             console.warning( messagePrefix, "ldInst is missing" );
             return Pair.of( ied.getLeft(), null );
         }
-        if(( getLnClass() == null ) || getLnClass().isEmpty() ) {
+        if( ( getLnClass() == null ) || getLnClass().isEmpty() ) {
             console.warning( messagePrefix, "lnClass is missing" );
             return Pair.of( ied.getLeft(), null );
         }
@@ -2501,7 +2658,8 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
 
         Pair< IED, LDevice > finalRes = Pair.of( ied.getLeft(), lDevice.getLeft() );
 
-        Pair< AnyLN,Integer > anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(), getPrefix() );
+        Pair< AnyLN, Integer > anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(),
+                getPrefix() );
         String mess2 = "LN( lnClass = " + getLnClass();
         if( getLnInst() != null ) {
             mess2 += ", inst = " + getLnInst();
@@ -2517,7 +2675,8 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
 
         // No error or warning message here: if this happens, error should have been detected before
         if( anyLN.getLeft().getRefersToLNodeType() == null ) return finalRes;
-        console.verbose( messagePrefix, "found LNodeType on line ", anyLN.getLeft().getRefersToLNodeType().getLineNumber() );
+        console.verbose( messagePrefix, "found LNodeType on line ",
+                anyLN.getLeft().getRefersToLNodeType().getLineNumber() );
 
         // doName and daName are structured using . as separator
         // The first doName let us find the DO inside the LNodeType
@@ -2527,13 +2686,12 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         // If doName is structured, find the SDO and its DOType using remaining doName
 
         final String[] doNames = getDoName().split( "\\.", -1 );
-        List< DO > res3a =
-                anyLN
+        List< DO > res3a = anyLN
                 .getLeft()
                 .getRefersToLNodeType()
                 .getDO()
                 .stream()
-                .filter( do2 -> doNames[0].equals( do2.getName() ))
+                .filter( do2 -> doNames[0].equals( do2.getName() ) )
                 .collect( Collectors.toList() );
 
         String mess3a = "DO ( name = " + doNames[0] + " )";
@@ -2551,11 +2709,10 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
             if( doType == null ) return finalRes;
             console.verbose( messagePrefix, "found DOType on line ", doType.getLineNumber() );
             String name = doNames[i];
-            List< SDO > res3b =
-                    doType
+            List< SDO > res3b = doType
                     .getSDO()
                     .stream()
-                    .filter( sdo ->  name.equals( sdo.getName() ))
+                    .filter( sdo -> name.equals( sdo.getName() ) )
                     .collect( Collectors.toList() );
 
             String mess3b = "SDO ( name = " + name + " ) in DOType on line " + doType.getLineNumber();
@@ -2571,7 +2728,8 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         // Set link to DO/SDO only if no daName
         if( getDaName() == null ) {
             setRefersToAbstractDataObject( ado );
-            console.info( "[SCL links] ExtRef on line ", getLineNumber(), " refers to AbstractDataObject ( name = ", ado.getName(), " ) on line ", ado.getLineNumber() );
+            console.info( "[SCL links] ExtRef on line ", getLineNumber(), " refers to AbstractDataObject ( name = ",
+                    ado.getName(), " ) on line ", ado.getLineNumber() );
             return finalRes;
         }
 
@@ -2579,16 +2737,15 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         // No error or warning message here: if this happens, error should have been detected before
         if( doType == null ) return finalRes;
         console.verbose( messagePrefix, "found DOType on line ", doType.getLineNumber() );
-        
+
         // The first daName gives us the DA inside the DOType
         // If daName is structured, find the DAType and its BDA using remaining daName
 
         final String[] daNames = getDaName().split( "\\.", -1 );
-        List< DA > res4a =
-                doType
+        List< DA > res4a = doType
                 .getDA()
                 .stream()
-                .filter(  da -> da.getName().equals( daNames[0] ))
+                .filter( da -> da.getName().equals( daNames[0] ) )
                 .collect( Collectors.toList() );
 
         String mess4a = "DA ( name = " + daNames[0] + " ) in DOType";
@@ -2603,12 +2760,11 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
             da.buildExplicitLinks( console, false );
 
             String name = daNames[i];
-            List< BDA > res4b =
-                    da
+            List< BDA > res4b = da
                     .getRefersToDAType()
                     .getBDA()
                     .stream()
-                    .filter(  bda -> name.equals(  bda.getName() ))
+                    .filter( bda -> name.equals( bda.getName() ) )
                     .collect( Collectors.toList() );
 
             String mess4b = "BDA ( name = " + name + " ) in DAType on line " + da.getRefersToDAType().getLineNumber();
@@ -2620,16 +2776,17 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
             console.verbose( messagePrefix, "found ", mess4b, " on line ", da.getLineNumber() );
         }
 
-        console.info( "[SCL links] ExtRef on line ", getLineNumber(), " refers to AbstractDataAttribute ( name = ", da.getName(), " ) on line ", da.getLineNumber() );
+        console.info( "[SCL links] ExtRef on line ", getLineNumber(), " refers to AbstractDataAttribute ( name = ",
+                da.getName(), " ) on line ", da.getLineNumber() );
         setRefersToAbstractDataAttribute( da );
-        
+
         return finalRes;
     }
 
     private void doBuildExplicitCBLink( IRiseClipseConsole console, String mPrefix, Pair< IED, LDevice > args ) {
 
         String messagePrefix = mPrefix + "(looking for control) ";
-        
+
         // srcLDInst    The LD inst of the source control block – if missing, same as ldInst above
         // srcPrefix    The prefix of the LN instance, where the source control block resides; if missing, no prefix
         // srcLNClass   The LN class of the LN, where the source control block resides; if missing, LLN0 
@@ -2638,15 +2795,15 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
 
         IED ied = args.getLeft();
         LDevice lDevice = args.getRight();
-        
+
         if( ied == null ) return;
 
-        if(( getSrcCBName() == null ) || getSrcCBName().isEmpty() ) {
+        if( ( getSrcCBName() == null ) || getSrcCBName().isEmpty() ) {
             console.verbose( messagePrefix, "srcCBName is absent" );
             return;
         }
 
-        if(( getSrcLDInst() != null ) && ( ! getSrcLDInst().isEmpty() )) {
+        if( ( getSrcLDInst() != null ) && ( !getSrcLDInst().isEmpty() ) ) {
             Pair< LDevice, Integer > lDevice1 = SclUtilities.getLDevice( ied, getSrcLDInst() );
             String mess5 = "LDevice( inst = " + getSrcLDInst() + " )";
             if( lDevice1.getLeft() == null ) {
@@ -2659,7 +2816,7 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         if( lDevice == null ) return;
 
         String cbLNClass = "LLN0";
-        if(( getSrcLNClass() != null ) && ( ! getSrcLNClass().isEmpty() )) {
+        if( ( getSrcLNClass() != null ) && ( !getSrcLNClass().isEmpty() ) ) {
             cbLNClass = getSrcLNClass();
         }
         Pair< AnyLN, Integer > anyLN = SclUtilities.getAnyLN( lDevice, cbLNClass, getSrcLNInst(), getSrcPrefix() );
@@ -2678,27 +2835,28 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
         List< Control > listControls = new ArrayList< Control >();
         listControls.addAll( anyLN.getLeft().getLogControl() );
         listControls.addAll( anyLN.getLeft().getReportControl() );
-        if( "LLN0".equals( cbLNClass )) {
+        if( "LLN0".equals( cbLNClass ) ) {
             listControls.addAll( lDevice.getLN0().getGSEControl() );
             listControls.addAll( lDevice.getLN0().getSampledValueControl() );
         }
         if( listControls.size() == 0 ) {
-            console.warning( messagePrefix, "control not found because there are none of them in AnyLN line ", anyLN.getLeft().getLineNumber() );
+            console.warning( messagePrefix, "control not found because there are none of them in AnyLN line ",
+                    anyLN.getLeft().getLineNumber() );
             return;
         }
 
-        List< Control > res7 =
-                listControls
+        List< Control > res7 = listControls
                 .stream()
-                .filter( c -> getSrcCBName().equals( c.getName() ))
+                .filter( c -> getSrcCBName().equals( c.getName() ) )
                 .collect( Collectors.toList() );
         String mess7 = "Control( name = " + getSrcCBName() + " )";
         if( res7.size() != 1 ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess7, res7.size() );
             return;
         }
-        setRefersToControl( res7.get( 0 ));
-        console.info( "[SCL links] ExtRef on line ", getLineNumber(), " refers to ", mess7, " on line ", getRefersToControl().getLineNumber() );
+        setRefersToControl( res7.get( 0 ) );
+        console.info( "[SCL links] ExtRef on line ", getLineNumber(), " refers to ", mess7, " on line ",
+                getRefersToControl().getLineNumber() );
     }
 
 } //ExtRefImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java
index ff8644d..4950f4f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java
@@ -317,7 +317,7 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      * @generated
      * @ordered
      */
-    protected EList<AbstractDataAttribute> refersToAbstractDataAttribute;
+    protected EList< AbstractDataAttribute > refersToAbstractDataAttribute;
 
     /**
      * <!-- begin-user-doc -->
@@ -359,8 +359,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         daName = newDaName;
         boolean oldDaNameESet = daNameESet;
         daNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FCDA__DA_NAME, oldDaName, daName, !oldDaNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__DA_NAME, oldDaName, daName,
+                    !oldDaNameESet ) );
     }
 
     /**
@@ -374,8 +375,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         boolean oldDaNameESet = daNameESet;
         daName = DA_NAME_EDEFAULT;
         daNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.FCDA__DA_NAME, oldDaName, DA_NAME_EDEFAULT, oldDaNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__DA_NAME, oldDaName,
+                    DA_NAME_EDEFAULT, oldDaNameESet ) );
     }
 
     /**
@@ -409,8 +411,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         doName = newDoName;
         boolean oldDoNameESet = doNameESet;
         doNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FCDA__DO_NAME, oldDoName, doName, !oldDoNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__DO_NAME, oldDoName, doName,
+                    !oldDoNameESet ) );
     }
 
     /**
@@ -424,8 +427,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         boolean oldDoNameESet = doNameESet;
         doName = DO_NAME_EDEFAULT;
         doNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.FCDA__DO_NAME, oldDoName, DO_NAME_EDEFAULT, oldDoNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__DO_NAME, oldDoName,
+                    DO_NAME_EDEFAULT, oldDoNameESet ) );
     }
 
     /**
@@ -459,8 +463,8 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         fc = newFc == null ? FC_EDEFAULT : newFc;
         boolean oldFcESet = fcESet;
         fcESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FCDA__FC, oldFc, fc, !oldFcESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__FC, oldFc, fc, !oldFcESet ) );
     }
 
     /**
@@ -474,8 +478,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         boolean oldFcESet = fcESet;
         fc = FC_EDEFAULT;
         fcESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.FCDA__FC, oldFc, FC_EDEFAULT, oldFcESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__FC, oldFc, FC_EDEFAULT,
+                    oldFcESet ) );
     }
 
     /**
@@ -509,8 +514,8 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         ix = newIx;
         boolean oldIxESet = ixESet;
         ixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FCDA__IX, oldIx, ix, !oldIxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__IX, oldIx, ix, !oldIxESet ) );
     }
 
     /**
@@ -524,8 +529,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         boolean oldIxESet = ixESet;
         ix = IX_EDEFAULT;
         ixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.FCDA__IX, oldIx, IX_EDEFAULT, oldIxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__IX, oldIx, IX_EDEFAULT,
+                    oldIxESet ) );
     }
 
     /**
@@ -559,8 +565,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         ldInst = newLdInst;
         boolean oldLdInstESet = ldInstESet;
         ldInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FCDA__LD_INST, oldLdInst, ldInst, !oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__LD_INST, oldLdInst, ldInst,
+                    !oldLdInstESet ) );
     }
 
     /**
@@ -574,8 +581,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         boolean oldLdInstESet = ldInstESet;
         ldInst = LD_INST_EDEFAULT;
         ldInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.FCDA__LD_INST, oldLdInst, LD_INST_EDEFAULT, oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__LD_INST, oldLdInst,
+                    LD_INST_EDEFAULT, oldLdInstESet ) );
     }
 
     /**
@@ -609,8 +617,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         lnClass = newLnClass;
         boolean oldLnClassESet = lnClassESet;
         lnClassESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FCDA__LN_CLASS, oldLnClass, lnClass, !oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__LN_CLASS, oldLnClass, lnClass,
+                    !oldLnClassESet ) );
     }
 
     /**
@@ -624,8 +633,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         boolean oldLnClassESet = lnClassESet;
         lnClass = LN_CLASS_EDEFAULT;
         lnClassESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.FCDA__LN_CLASS, oldLnClass, LN_CLASS_EDEFAULT, oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__LN_CLASS, oldLnClass,
+                    LN_CLASS_EDEFAULT, oldLnClassESet ) );
     }
 
     /**
@@ -659,8 +669,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         lnInst = newLnInst;
         boolean oldLnInstESet = lnInstESet;
         lnInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FCDA__LN_INST, oldLnInst, lnInst, !oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__LN_INST, oldLnInst, lnInst,
+                    !oldLnInstESet ) );
     }
 
     /**
@@ -674,8 +685,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         boolean oldLnInstESet = lnInstESet;
         lnInst = LN_INST_EDEFAULT;
         lnInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.FCDA__LN_INST, oldLnInst, LN_INST_EDEFAULT, oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__LN_INST, oldLnInst,
+                    LN_INST_EDEFAULT, oldLnInstESet ) );
     }
 
     /**
@@ -709,8 +721,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         prefix = newPrefix;
         boolean oldPrefixESet = prefixESet;
         prefixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FCDA__PREFIX, oldPrefix, prefix, !oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__PREFIX, oldPrefix, prefix,
+                    !oldPrefixESet ) );
     }
 
     /**
@@ -724,8 +737,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         boolean oldPrefixESet = prefixESet;
         prefix = PREFIX_EDEFAULT;
         prefixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.FCDA__PREFIX, oldPrefix, PREFIX_EDEFAULT, oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__PREFIX, oldPrefix,
+                    PREFIX_EDEFAULT, oldPrefixESet ) );
     }
 
     /**
@@ -745,8 +759,8 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      */
     @Override
     public DataSet getParentDataSet() {
-        if (eContainerFeatureID() != SclPackage.FCDA__PARENT_DATA_SET) return null;
-        return (DataSet)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.FCDA__PARENT_DATA_SET ) return null;
+        return ( DataSet ) eInternalContainer();
     }
 
     /**
@@ -754,8 +768,8 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentDataSet(DataSet newParentDataSet, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentDataSet, SclPackage.FCDA__PARENT_DATA_SET, msgs);
+    public NotificationChain basicSetParentDataSet( DataSet newParentDataSet, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentDataSet, SclPackage.FCDA__PARENT_DATA_SET, msgs );
         return msgs;
     }
 
@@ -765,20 +779,23 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      * @generated
      */
     @Override
-    public void setParentDataSet(DataSet newParentDataSet) {
-        if (newParentDataSet != eInternalContainer() || (eContainerFeatureID() != SclPackage.FCDA__PARENT_DATA_SET && newParentDataSet != null)) {
-            if (EcoreUtil.isAncestor(this, newParentDataSet))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentDataSet( DataSet newParentDataSet ) {
+        if( newParentDataSet != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.FCDA__PARENT_DATA_SET && newParentDataSet != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentDataSet ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentDataSet != null)
-                msgs = ((InternalEObject)newParentDataSet).eInverseAdd(this, SclPackage.DATA_SET__FCDA, DataSet.class, msgs);
-            msgs = basicSetParentDataSet(newParentDataSet, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentDataSet != null )
+                msgs = ( ( InternalEObject ) newParentDataSet ).eInverseAdd( this, SclPackage.DATA_SET__FCDA,
+                        DataSet.class, msgs );
+            msgs = basicSetParentDataSet( newParentDataSet, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FCDA__PARENT_DATA_SET, newParentDataSet, newParentDataSet));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__PARENT_DATA_SET, newParentDataSet,
+                    newParentDataSet ) );
     }
 
     /**
@@ -787,9 +804,11 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      * @generated
      */
     @Override
-    public EList<AbstractDataAttribute> getRefersToAbstractDataAttribute() {
-        if (refersToAbstractDataAttribute == null) {
-            refersToAbstractDataAttribute = new EObjectWithInverseEList.Unsettable.ManyInverse<AbstractDataAttribute>(AbstractDataAttribute.class, this, SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA);
+    public EList< AbstractDataAttribute > getRefersToAbstractDataAttribute() {
+        if( refersToAbstractDataAttribute == null ) {
+            refersToAbstractDataAttribute = new EObjectWithInverseEList.Unsettable.ManyInverse< AbstractDataAttribute >(
+                    AbstractDataAttribute.class, this, SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA );
         }
         return refersToAbstractDataAttribute;
     }
@@ -801,7 +820,8 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      */
     @Override
     public void unsetRefersToAbstractDataAttribute() {
-        if (refersToAbstractDataAttribute != null) ((InternalEList.Unsettable<?>)refersToAbstractDataAttribute).unset();
+        if( refersToAbstractDataAttribute != null )
+            ( ( InternalEList.Unsettable< ? > ) refersToAbstractDataAttribute ).unset();
     }
 
     /**
@@ -811,7 +831,8 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      */
     @Override
     public boolean isSetRefersToAbstractDataAttribute() {
-        return refersToAbstractDataAttribute != null && ((InternalEList.Unsettable<?>)refersToAbstractDataAttribute).isSet();
+        return refersToAbstractDataAttribute != null
+                && ( ( InternalEList.Unsettable< ? > ) refersToAbstractDataAttribute ).isSet();
     }
 
     /**
@@ -819,18 +840,19 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.FCDA__PARENT_DATA_SET:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentDataSet((DataSet)otherEnd, msgs);
-            case SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getRefersToAbstractDataAttribute()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.FCDA__PARENT_DATA_SET:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentDataSet( ( DataSet ) otherEnd, msgs );
+        case SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getRefersToAbstractDataAttribute() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -840,13 +862,13 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.FCDA__PARENT_DATA_SET:
-                return basicSetParentDataSet(null, msgs);
-            case SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                return ((InternalEList<?>)getRefersToAbstractDataAttribute()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.FCDA__PARENT_DATA_SET:
+            return basicSetParentDataSet( null, msgs );
+        case SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            return ( ( InternalEList< ? > ) getRefersToAbstractDataAttribute() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -856,11 +878,11 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.FCDA__PARENT_DATA_SET:
-                return eInternalContainer().eInverseRemove(this, SclPackage.DATA_SET__FCDA, DataSet.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.FCDA__PARENT_DATA_SET:
+            return eInternalContainer().eInverseRemove( this, SclPackage.DATA_SET__FCDA, DataSet.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -870,29 +892,29 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.FCDA__DA_NAME:
-                return getDaName();
-            case SclPackage.FCDA__DO_NAME:
-                return getDoName();
-            case SclPackage.FCDA__FC:
-                return getFc();
-            case SclPackage.FCDA__IX:
-                return getIx();
-            case SclPackage.FCDA__LD_INST:
-                return getLdInst();
-            case SclPackage.FCDA__LN_CLASS:
-                return getLnClass();
-            case SclPackage.FCDA__LN_INST:
-                return getLnInst();
-            case SclPackage.FCDA__PREFIX:
-                return getPrefix();
-            case SclPackage.FCDA__PARENT_DATA_SET:
-                return getParentDataSet();
-            case SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                return getRefersToAbstractDataAttribute();
+        switch( featureID ) {
+        case SclPackage.FCDA__DA_NAME:
+            return getDaName();
+        case SclPackage.FCDA__DO_NAME:
+            return getDoName();
+        case SclPackage.FCDA__FC:
+            return getFc();
+        case SclPackage.FCDA__IX:
+            return getIx();
+        case SclPackage.FCDA__LD_INST:
+            return getLdInst();
+        case SclPackage.FCDA__LN_CLASS:
+            return getLnClass();
+        case SclPackage.FCDA__LN_INST:
+            return getLnInst();
+        case SclPackage.FCDA__PREFIX:
+            return getPrefix();
+        case SclPackage.FCDA__PARENT_DATA_SET:
+            return getParentDataSet();
+        case SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            return getRefersToAbstractDataAttribute();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -900,43 +922,43 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.FCDA__DA_NAME:
-                setDaName((String)newValue);
-                return;
-            case SclPackage.FCDA__DO_NAME:
-                setDoName((String)newValue);
-                return;
-            case SclPackage.FCDA__FC:
-                setFc((FCEnum)newValue);
-                return;
-            case SclPackage.FCDA__IX:
-                setIx((Integer)newValue);
-                return;
-            case SclPackage.FCDA__LD_INST:
-                setLdInst((String)newValue);
-                return;
-            case SclPackage.FCDA__LN_CLASS:
-                setLnClass((String)newValue);
-                return;
-            case SclPackage.FCDA__LN_INST:
-                setLnInst((String)newValue);
-                return;
-            case SclPackage.FCDA__PREFIX:
-                setPrefix((String)newValue);
-                return;
-            case SclPackage.FCDA__PARENT_DATA_SET:
-                setParentDataSet((DataSet)newValue);
-                return;
-            case SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                getRefersToAbstractDataAttribute().clear();
-                getRefersToAbstractDataAttribute().addAll((Collection<? extends AbstractDataAttribute>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.FCDA__DA_NAME:
+            setDaName( ( String ) newValue );
+            return;
+        case SclPackage.FCDA__DO_NAME:
+            setDoName( ( String ) newValue );
+            return;
+        case SclPackage.FCDA__FC:
+            setFc( ( FCEnum ) newValue );
+            return;
+        case SclPackage.FCDA__IX:
+            setIx( ( Integer ) newValue );
+            return;
+        case SclPackage.FCDA__LD_INST:
+            setLdInst( ( String ) newValue );
+            return;
+        case SclPackage.FCDA__LN_CLASS:
+            setLnClass( ( String ) newValue );
+            return;
+        case SclPackage.FCDA__LN_INST:
+            setLnInst( ( String ) newValue );
+            return;
+        case SclPackage.FCDA__PREFIX:
+            setPrefix( ( String ) newValue );
+            return;
+        case SclPackage.FCDA__PARENT_DATA_SET:
+            setParentDataSet( ( DataSet ) newValue );
+            return;
+        case SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            getRefersToAbstractDataAttribute().clear();
+            getRefersToAbstractDataAttribute().addAll( ( Collection< ? extends AbstractDataAttribute > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -946,39 +968,39 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.FCDA__DA_NAME:
-                unsetDaName();
-                return;
-            case SclPackage.FCDA__DO_NAME:
-                unsetDoName();
-                return;
-            case SclPackage.FCDA__FC:
-                unsetFc();
-                return;
-            case SclPackage.FCDA__IX:
-                unsetIx();
-                return;
-            case SclPackage.FCDA__LD_INST:
-                unsetLdInst();
-                return;
-            case SclPackage.FCDA__LN_CLASS:
-                unsetLnClass();
-                return;
-            case SclPackage.FCDA__LN_INST:
-                unsetLnInst();
-                return;
-            case SclPackage.FCDA__PREFIX:
-                unsetPrefix();
-                return;
-            case SclPackage.FCDA__PARENT_DATA_SET:
-                setParentDataSet((DataSet)null);
-                return;
-            case SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                unsetRefersToAbstractDataAttribute();
-                return;
+        switch( featureID ) {
+        case SclPackage.FCDA__DA_NAME:
+            unsetDaName();
+            return;
+        case SclPackage.FCDA__DO_NAME:
+            unsetDoName();
+            return;
+        case SclPackage.FCDA__FC:
+            unsetFc();
+            return;
+        case SclPackage.FCDA__IX:
+            unsetIx();
+            return;
+        case SclPackage.FCDA__LD_INST:
+            unsetLdInst();
+            return;
+        case SclPackage.FCDA__LN_CLASS:
+            unsetLnClass();
+            return;
+        case SclPackage.FCDA__LN_INST:
+            unsetLnInst();
+            return;
+        case SclPackage.FCDA__PREFIX:
+            unsetPrefix();
+            return;
+        case SclPackage.FCDA__PARENT_DATA_SET:
+            setParentDataSet( ( DataSet ) null );
+            return;
+        case SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            unsetRefersToAbstractDataAttribute();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -988,29 +1010,29 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.FCDA__DA_NAME:
-                return isSetDaName();
-            case SclPackage.FCDA__DO_NAME:
-                return isSetDoName();
-            case SclPackage.FCDA__FC:
-                return isSetFc();
-            case SclPackage.FCDA__IX:
-                return isSetIx();
-            case SclPackage.FCDA__LD_INST:
-                return isSetLdInst();
-            case SclPackage.FCDA__LN_CLASS:
-                return isSetLnClass();
-            case SclPackage.FCDA__LN_INST:
-                return isSetLnInst();
-            case SclPackage.FCDA__PREFIX:
-                return isSetPrefix();
-            case SclPackage.FCDA__PARENT_DATA_SET:
-                return getParentDataSet() != null;
-            case SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                return isSetRefersToAbstractDataAttribute();
+        switch( featureID ) {
+        case SclPackage.FCDA__DA_NAME:
+            return isSetDaName();
+        case SclPackage.FCDA__DO_NAME:
+            return isSetDoName();
+        case SclPackage.FCDA__FC:
+            return isSetFc();
+        case SclPackage.FCDA__IX:
+            return isSetIx();
+        case SclPackage.FCDA__LD_INST:
+            return isSetLdInst();
+        case SclPackage.FCDA__LN_CLASS:
+            return isSetLnClass();
+        case SclPackage.FCDA__LN_INST:
+            return isSetLnInst();
+        case SclPackage.FCDA__PREFIX:
+            return isSetPrefix();
+        case SclPackage.FCDA__PARENT_DATA_SET:
+            return getParentDataSet() != null;
+        case SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            return isSetRefersToAbstractDataAttribute();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -1020,26 +1042,50 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (daName: ");
-        if (daNameESet) result.append(daName); else result.append("<unset>");
-        result.append(", doName: ");
-        if (doNameESet) result.append(doName); else result.append("<unset>");
-        result.append(", fc: ");
-        if (fcESet) result.append(fc); else result.append("<unset>");
-        result.append(", ix: ");
-        if (ixESet) result.append(ix); else result.append("<unset>");
-        result.append(", ldInst: ");
-        if (ldInstESet) result.append(ldInst); else result.append("<unset>");
-        result.append(", lnClass: ");
-        if (lnClassESet) result.append(lnClass); else result.append("<unset>");
-        result.append(", lnInst: ");
-        if (lnInstESet) result.append(lnInst); else result.append("<unset>");
-        result.append(", prefix: ");
-        if (prefixESet) result.append(prefix); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (daName: " );
+        if( daNameESet )
+            result.append( daName );
+        else
+            result.append( "<unset>" );
+        result.append( ", doName: " );
+        if( doNameESet )
+            result.append( doName );
+        else
+            result.append( "<unset>" );
+        result.append( ", fc: " );
+        if( fcESet )
+            result.append( fc );
+        else
+            result.append( "<unset>" );
+        result.append( ", ix: " );
+        if( ixESet )
+            result.append( ix );
+        else
+            result.append( "<unset>" );
+        result.append( ", ldInst: " );
+        if( ldInstESet )
+            result.append( ldInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnClass: " );
+        if( lnClassESet )
+            result.append( lnClass );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnInst: " );
+        if( lnInstESet )
+            result.append( lnInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", prefix: " );
+        if( prefixESet )
+            result.append( prefix );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -1047,7 +1093,7 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         // ldInst   The LD where the DO resides; shall always be specified except for GSSE
         // prefix   Prefix identifying together with lnInst and lnClass the LN where the DO resides; optional, default value is the empty string
         // lnClass  LN class of the LN where the DO resides; shall always be specified except for GSSE DataLabel empty string
@@ -1066,22 +1112,22 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
 
         String messagePrefix = "[SCL links] while resolving link from FCDA on line " + getLineNumber() + ": ";
 
-        if(( getLdInst() == null ) || getLdInst().isEmpty() ) {
+        if( ( getLdInst() == null ) || getLdInst().isEmpty() ) {
             console.warning( messagePrefix, "ldInst is missing" );
             return;
         }
-        if(( getLnClass() == null ) || getLnClass().isEmpty() ) {
+        if( ( getLnClass() == null ) || getLnClass().isEmpty() ) {
             console.warning( messagePrefix, "lnClass is missing" );
             return;
         }
-        if(( getDoName() == null ) || getDoName().isEmpty() ) {
+        if( ( getDoName() == null ) || getDoName().isEmpty() ) {
             console.warning( messagePrefix, "doName is missing" );
             return;
         }
-        
+
         // The LN we are looking for is in the same IED/Server
         EObject object = this;
-        while(( object != null ) && !( object instanceof AccessPoint ) ) {
+        while( ( object != null ) && !( object instanceof AccessPoint ) ) {
             object = object.eContainer();
         }
         if( object == null ) {
@@ -1090,7 +1136,7 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         }
         AccessPoint ap = ( AccessPoint ) object;
         console.verbose( messagePrefix, "found Server on line ", ap.getServer().getLineNumber() );
-        
+
         Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ap, getLdInst() );
         String mess1 = "LDevice( inst = " + getLdInst() + " )";
         if( lDevice.getLeft() == null ) {
@@ -1098,8 +1144,9 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
             return;
         }
         console.verbose( messagePrefix, "found ", mess1, " on line ", lDevice.getLeft().getLineNumber() );
-        
-        Pair< AnyLN, Integer > anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(), getPrefix() );
+
+        Pair< AnyLN, Integer > anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(),
+                getPrefix() );
         String mess2 = "LN( lnClass = " + getLnClass();
         if( getLnInst() != null ) {
             mess2 += ", inst = " + getLnInst();
@@ -1112,49 +1159,48 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
         }
         console.verbose( messagePrefix, "found ", mess2, " on line ", anyLN.getLeft().getLineNumber() );
         anyLN.getLeft().buildExplicitLinks( console, false );
-        
+
         if( anyLN.getLeft().getRefersToLNodeType() == null ) return;
-        console.verbose( messagePrefix, "found LNodeType on line ", anyLN.getLeft().getRefersToLNodeType().getLineNumber() );
-        
+        console.verbose( messagePrefix, "found LNodeType on line ",
+                anyLN.getLeft().getRefersToLNodeType().getLineNumber() );
+
         // doName and daName are structured using . as separator
         // The first doName let us find the DO inside the LNodeType
         // referred by the LN
         // The type attribute of the DO give us the DOType with its id attribute
         // If doName is simple, use daName to find the DA in the DOType
         // If doName is structured, find the SDO and its DOType using remaining doName
-        
+
         final String[] doNames = getDoName().split( "\\.", -1 );
-        List< DO > res3a =
-                 anyLN
+        List< DO > res3a = anyLN
                 .getLeft()
                 .getRefersToLNodeType()
                 .getDO()
                 .stream()
-                .filter( do2 -> doNames[0].equals( do2.getName() ))
+                .filter( do2 -> doNames[0].equals( do2.getName() ) )
                 .collect( Collectors.toList() );
-        
+
         String mess3a = "DO ( name = " + doNames[0] + " )";
         if( res3a.size() != 1 ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess3a, res3a.size() );
             return;
         }
         console.verbose( messagePrefix, "found ", mess3a, " on line ", res3a.get( 0 ).getLineNumber() );
-        
+
         res3a.get( 0 ).buildExplicitLinks( console, false );
         DOType doType = res3a.get( 0 ).getRefersToDOType();
         // No error or warning message here: if this happens, error should have been detected before
         if( doType == null ) return;
         console.verbose( messagePrefix, "found DOType on line ", doType.getLineNumber() );
-        
+
         for( int i = 1; i < doNames.length; ++i ) {
             String name = doNames[i];
-            List< SDO > res3b =
-                    doType
+            List< SDO > res3b = doType
                     .getSDO()
                     .stream()
-                    .filter( sdo ->  name.equals( sdo.getName() ))
+                    .filter( sdo -> name.equals( sdo.getName() ) )
                     .collect( Collectors.toList() );
-            
+
             String mess3b = "SDO ( name = " + name + " ) in DOType on line " + doType.getLineNumber();
             if( res3b.size() != 1 ) {
                 SclUtilities.displayNotFoundWarning( console, messagePrefix, mess3b, res3b.size() );
@@ -1167,19 +1213,18 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
             if( doType == null ) return;
             console.verbose( messagePrefix, "found DOType on line ", doType.getLineNumber() );
         }
-        
+
         if( getDaName() != null ) {
             // The first daName gives us the DA inside the DOType
             // If daName is structured, find the DAType and its BDA using remaining doName
-            
+
             final String[] daNames = getDaName().split( "\\.", -1 );
-            List< DA > res4a =
-                     doType
+            List< DA > res4a = doType
                     .getDA()
                     .stream()
-                    .filter(  da -> da.getName().equals( daNames[0] ))
+                    .filter( da -> da.getName().equals( daNames[0] ) )
                     .collect( Collectors.toList() );
-            
+
             String mess4a = "DA ( name = " + daNames[0] + " ) in DOType";
             if( res4a.size() != 1 ) {
                 SclUtilities.displayNotFoundWarning( console, messagePrefix, mess4a, res4a.size() );
@@ -1187,20 +1232,20 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
             }
             AbstractDataAttribute da = res4a.get( 0 );
             console.verbose( messagePrefix, "found ", mess4a, " on line ", da.getLineNumber() );
-            
+
             for( int i = 1; i < daNames.length; ++i ) {
                 da.buildExplicitLinks( console, false );
-                
+
                 String name = daNames[i];
-                List< BDA > res4b =
-                        da
+                List< BDA > res4b = da
                         .getRefersToDAType()
                         .getBDA()
                         .stream()
-                        .filter(  bda -> name.equals(  bda.getName() ))
+                        .filter( bda -> name.equals( bda.getName() ) )
                         .collect( Collectors.toList() );
-                        
-                String mess4b = "BDA ( name = " + name + " ) in DAType on line " + da.getRefersToDAType().getLineNumber();
+
+                String mess4b = "BDA ( name = " + name + " ) in DAType on line "
+                        + da.getRefersToDAType().getLineNumber();
                 if( res4b.size() != 1 ) {
                     SclUtilities.displayNotFoundWarning( console, messagePrefix, mess4b, res4b.size() );
                     return;
@@ -1210,28 +1255,32 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
             }
             // TODO: do we have to check if fc is right ?
             // TODO: ix is ignored !
-            
-            console.info( "[SCL links] FCDA on line ", getLineNumber(), " refers to AbstractDataAttribute ( name = ", da.getName(), " ) on line ", da.getLineNumber() );
+
+            console.info( "[SCL links] FCDA on line ", getLineNumber(), " refers to AbstractDataAttribute ( name = ",
+                    da.getName(), " ) on line ", da.getLineNumber() );
             getRefersToAbstractDataAttribute().add( da );
         }
-        
+
         else {
             // daName – if missing, all attributes with functional characteristic given by fc are selected.
             if( getFc() == null ) return;
-            
+
             doType
-            .getDA()
-            .stream()
-            .filter(  da -> da.getFc().equals( getFc() ))
-            .collect( Collectors.toCollection(() -> getRefersToAbstractDataAttribute() ));
-            
+                    .getDA()
+                    .stream()
+                    .filter( da -> da.getFc().equals( getFc() ) )
+                    .collect( Collectors.toCollection( () -> getRefersToAbstractDataAttribute() ) );
+
             if( getRefersToAbstractDataAttribute().size() > 0 ) {
                 for( AbstractDataAttribute a : getRefersToAbstractDataAttribute() ) {
-                    console.info( "[SCL links] FCDA on line ", getLineNumber(), " refers to AbstractDataAttribute ( name = ", a.getName(), " ) on line ", a.getLineNumber() );
+                    console.info( "[SCL links] FCDA on line ", getLineNumber(),
+                            " refers to AbstractDataAttribute ( name = ", a.getName(), " ) on line ",
+                            a.getLineNumber() );
                 }
             }
             else {
-                console.warning( "[SCL links] FCDA (line ", getLineNumber(), ") does not refer to any AbstractDataAttribute" );
+                console.warning( "[SCL links] FCDA (line ", getLineNumber(),
+                        ") does not refer to any AbstractDataAttribute" );
             }
         }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FileHandlingImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FileHandlingImpl.java
index 044de56..f14e6b7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FileHandlingImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FileHandlingImpl.java
@@ -175,8 +175,9 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
         ftp = newFtp;
         boolean oldFtpESet = ftpESet;
         ftpESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FILE_HANDLING__FTP, oldFtp, ftp, !oldFtpESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FILE_HANDLING__FTP, oldFtp, ftp,
+                    !oldFtpESet ) );
     }
 
     /**
@@ -190,8 +191,9 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
         boolean oldFtpESet = ftpESet;
         ftp = FTP_EDEFAULT;
         ftpESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.FILE_HANDLING__FTP, oldFtp, FTP_EDEFAULT, oldFtpESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FILE_HANDLING__FTP, oldFtp,
+                    FTP_EDEFAULT, oldFtpESet ) );
     }
 
     /**
@@ -225,8 +227,9 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
         ftps = newFtps;
         boolean oldFtpsESet = ftpsESet;
         ftpsESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FILE_HANDLING__FTPS, oldFtps, ftps, !oldFtpsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FILE_HANDLING__FTPS, oldFtps, ftps,
+                    !oldFtpsESet ) );
     }
 
     /**
@@ -240,8 +243,9 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
         boolean oldFtpsESet = ftpsESet;
         ftps = FTPS_EDEFAULT;
         ftpsESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.FILE_HANDLING__FTPS, oldFtps, FTPS_EDEFAULT, oldFtpsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FILE_HANDLING__FTPS, oldFtps,
+                    FTPS_EDEFAULT, oldFtpsESet ) );
     }
 
     /**
@@ -275,8 +279,9 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
         mms = newMms;
         boolean oldMmsESet = mmsESet;
         mmsESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FILE_HANDLING__MMS, oldMms, mms, !oldMmsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FILE_HANDLING__MMS, oldMms, mms,
+                    !oldMmsESet ) );
     }
 
     /**
@@ -290,8 +295,9 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
         boolean oldMmsESet = mmsESet;
         mms = MMS_EDEFAULT;
         mmsESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.FILE_HANDLING__MMS, oldMms, MMS_EDEFAULT, oldMmsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FILE_HANDLING__MMS, oldMms,
+                    MMS_EDEFAULT, oldMmsESet ) );
     }
 
     /**
@@ -311,8 +317,8 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.FILE_HANDLING__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.FILE_HANDLING__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -320,8 +326,9 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.FILE_HANDLING__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.FILE_HANDLING__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -331,20 +338,24 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.FILE_HANDLING__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.FILE_HANDLING__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__FILE_HANDLING, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__FILE_HANDLING,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FILE_HANDLING__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FILE_HANDLING__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -354,13 +365,13 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.FILE_HANDLING__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.FILE_HANDLING__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -370,11 +381,11 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.FILE_HANDLING__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.FILE_HANDLING__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -384,11 +395,12 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.FILE_HANDLING__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__FILE_HANDLING, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.FILE_HANDLING__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__FILE_HANDLING, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -398,17 +410,17 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.FILE_HANDLING__FTP:
-                return getFtp();
-            case SclPackage.FILE_HANDLING__FTPS:
-                return getFtps();
-            case SclPackage.FILE_HANDLING__MMS:
-                return getMms();
-            case SclPackage.FILE_HANDLING__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.FILE_HANDLING__FTP:
+            return getFtp();
+        case SclPackage.FILE_HANDLING__FTPS:
+            return getFtps();
+        case SclPackage.FILE_HANDLING__MMS:
+            return getMms();
+        case SclPackage.FILE_HANDLING__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -418,21 +430,21 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.FILE_HANDLING__FTP:
-                setFtp((Boolean)newValue);
-                return;
-            case SclPackage.FILE_HANDLING__FTPS:
-                setFtps((Boolean)newValue);
-                return;
-            case SclPackage.FILE_HANDLING__MMS:
-                setMms((Boolean)newValue);
-                return;
-            case SclPackage.FILE_HANDLING__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.FILE_HANDLING__FTP:
+            setFtp( ( Boolean ) newValue );
+            return;
+        case SclPackage.FILE_HANDLING__FTPS:
+            setFtps( ( Boolean ) newValue );
+            return;
+        case SclPackage.FILE_HANDLING__MMS:
+            setMms( ( Boolean ) newValue );
+            return;
+        case SclPackage.FILE_HANDLING__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -442,21 +454,21 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.FILE_HANDLING__FTP:
-                unsetFtp();
-                return;
-            case SclPackage.FILE_HANDLING__FTPS:
-                unsetFtps();
-                return;
-            case SclPackage.FILE_HANDLING__MMS:
-                unsetMms();
-                return;
-            case SclPackage.FILE_HANDLING__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.FILE_HANDLING__FTP:
+            unsetFtp();
+            return;
+        case SclPackage.FILE_HANDLING__FTPS:
+            unsetFtps();
+            return;
+        case SclPackage.FILE_HANDLING__MMS:
+            unsetMms();
+            return;
+        case SclPackage.FILE_HANDLING__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -466,17 +478,17 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.FILE_HANDLING__FTP:
-                return isSetFtp();
-            case SclPackage.FILE_HANDLING__FTPS:
-                return isSetFtps();
-            case SclPackage.FILE_HANDLING__MMS:
-                return isSetMms();
-            case SclPackage.FILE_HANDLING__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.FILE_HANDLING__FTP:
+            return isSetFtp();
+        case SclPackage.FILE_HANDLING__FTPS:
+            return isSetFtps();
+        case SclPackage.FILE_HANDLING__MMS:
+            return isSetMms();
+        case SclPackage.FILE_HANDLING__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -486,16 +498,25 @@ public class FileHandlingImpl extends SclObjectImpl implements FileHandling {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (ftp: ");
-        if (ftpESet) result.append(ftp); else result.append("<unset>");
-        result.append(", ftps: ");
-        if (ftpsESet) result.append(ftps); else result.append("<unset>");
-        result.append(", mms: ");
-        if (mmsESet) result.append(mms); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (ftp: " );
+        if( ftpESet )
+            result.append( ftp );
+        else
+            result.append( "<unset>" );
+        result.append( ", ftps: " );
+        if( ftpsESet )
+            result.append( ftps );
+        else
+            result.append( "<unset>" );
+        result.append( ", mms: " );
+        if( mmsESet )
+            result.append( mms );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FunctionImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FunctionImpl.java
index f4469a7..e4ba78a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FunctionImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FunctionImpl.java
@@ -99,7 +99,7 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      * @generated
      * @ordered
      */
-    protected EList<ConductingEquipment> conductingEquipment;
+    protected EList< ConductingEquipment > conductingEquipment;
 
     /**
      * The cached value of the '{@link #getSubFunction() <em>Sub Function</em>}' containment reference list.
@@ -109,7 +109,7 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      * @generated
      * @ordered
      */
-    protected EList<SubFunction> subFunction;
+    protected EList< SubFunction > subFunction;
 
     /**
      * The cached value of the '{@link #getGeneralEquipment() <em>General Equipment</em>}' containment reference list.
@@ -119,7 +119,7 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      * @generated
      * @ordered
      */
-    protected EList<GeneralEquipment> generalEquipment;
+    protected EList< GeneralEquipment > generalEquipment;
 
     /**
      * <!-- begin-user-doc -->
@@ -161,8 +161,9 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FUNCTION__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FUNCTION__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -176,8 +177,9 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.FUNCTION__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FUNCTION__TYPE, oldType, TYPE_EDEFAULT,
+                    oldTypeESet ) );
     }
 
     /**
@@ -197,8 +199,8 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public Bay getParentBay() {
-        if (eContainerFeatureID() != SclPackage.FUNCTION__PARENT_BAY) return null;
-        return (Bay)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.FUNCTION__PARENT_BAY ) return null;
+        return ( Bay ) eInternalContainer();
     }
 
     /**
@@ -206,8 +208,8 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentBay(Bay newParentBay, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentBay, SclPackage.FUNCTION__PARENT_BAY, msgs);
+    public NotificationChain basicSetParentBay( Bay newParentBay, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentBay, SclPackage.FUNCTION__PARENT_BAY, msgs );
         return msgs;
     }
 
@@ -217,20 +219,23 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      * @generated
      */
     @Override
-    public void setParentBay(Bay newParentBay) {
-        if (newParentBay != eInternalContainer() || (eContainerFeatureID() != SclPackage.FUNCTION__PARENT_BAY && newParentBay != null)) {
-            if (EcoreUtil.isAncestor(this, newParentBay))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentBay( Bay newParentBay ) {
+        if( newParentBay != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.FUNCTION__PARENT_BAY && newParentBay != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentBay ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentBay != null)
-                msgs = ((InternalEObject)newParentBay).eInverseAdd(this, SclPackage.BAY__FUNCTION, Bay.class, msgs);
-            msgs = basicSetParentBay(newParentBay, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentBay != null )
+                msgs = ( ( InternalEObject ) newParentBay ).eInverseAdd( this, SclPackage.BAY__FUNCTION, Bay.class,
+                        msgs );
+            msgs = basicSetParentBay( newParentBay, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FUNCTION__PARENT_BAY, newParentBay, newParentBay));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FUNCTION__PARENT_BAY, newParentBay,
+                    newParentBay ) );
     }
 
     /**
@@ -239,9 +244,11 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      * @generated
      */
     @Override
-    public EList<ConductingEquipment> getConductingEquipment() {
-        if (conductingEquipment == null) {
-            conductingEquipment = new EObjectContainmentWithInverseEList.Unsettable<ConductingEquipment>(ConductingEquipment.class, this, SclPackage.FUNCTION__CONDUCTING_EQUIPMENT, SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION);
+    public EList< ConductingEquipment > getConductingEquipment() {
+        if( conductingEquipment == null ) {
+            conductingEquipment = new EObjectContainmentWithInverseEList.Unsettable< ConductingEquipment >(
+                    ConductingEquipment.class, this, SclPackage.FUNCTION__CONDUCTING_EQUIPMENT,
+                    SclPackage.CONDUCTING_EQUIPMENT__PARENT_FUNCTION );
         }
         return conductingEquipment;
     }
@@ -253,7 +260,7 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public void unsetConductingEquipment() {
-        if (conductingEquipment != null) ((InternalEList.Unsettable<?>)conductingEquipment).unset();
+        if( conductingEquipment != null ) ( ( InternalEList.Unsettable< ? > ) conductingEquipment ).unset();
     }
 
     /**
@@ -263,7 +270,7 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public boolean isSetConductingEquipment() {
-        return conductingEquipment != null && ((InternalEList.Unsettable<?>)conductingEquipment).isSet();
+        return conductingEquipment != null && ( ( InternalEList.Unsettable< ? > ) conductingEquipment ).isSet();
     }
 
     /**
@@ -273,8 +280,8 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public GeneralEquipmentContainer getParentGeneralEquipmentContainer() {
-        if (eContainerFeatureID() != SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER) return null;
-        return (GeneralEquipmentContainer)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER ) return null;
+        return ( GeneralEquipmentContainer ) eInternalContainer();
     }
 
     /**
@@ -282,8 +289,10 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentGeneralEquipmentContainer(GeneralEquipmentContainer newParentGeneralEquipmentContainer, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentGeneralEquipmentContainer, SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER, msgs);
+    public NotificationChain basicSetParentGeneralEquipmentContainer(
+            GeneralEquipmentContainer newParentGeneralEquipmentContainer, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentGeneralEquipmentContainer,
+                SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER, msgs );
         return msgs;
     }
 
@@ -293,20 +302,25 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      * @generated
      */
     @Override
-    public void setParentGeneralEquipmentContainer(GeneralEquipmentContainer newParentGeneralEquipmentContainer) {
-        if (newParentGeneralEquipmentContainer != eInternalContainer() || (eContainerFeatureID() != SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER && newParentGeneralEquipmentContainer != null)) {
-            if (EcoreUtil.isAncestor(this, newParentGeneralEquipmentContainer))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentGeneralEquipmentContainer( GeneralEquipmentContainer newParentGeneralEquipmentContainer ) {
+        if( newParentGeneralEquipmentContainer != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER
+                        && newParentGeneralEquipmentContainer != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentGeneralEquipmentContainer ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentGeneralEquipmentContainer != null)
-                msgs = ((InternalEObject)newParentGeneralEquipmentContainer).eInverseAdd(this, SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION, GeneralEquipmentContainer.class, msgs);
-            msgs = basicSetParentGeneralEquipmentContainer(newParentGeneralEquipmentContainer, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentGeneralEquipmentContainer != null )
+                msgs = ( ( InternalEObject ) newParentGeneralEquipmentContainer ).eInverseAdd( this,
+                        SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION, GeneralEquipmentContainer.class, msgs );
+            msgs = basicSetParentGeneralEquipmentContainer( newParentGeneralEquipmentContainer, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER, newParentGeneralEquipmentContainer, newParentGeneralEquipmentContainer));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET,
+                    SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER, newParentGeneralEquipmentContainer,
+                    newParentGeneralEquipmentContainer ) );
     }
 
     /**
@@ -316,8 +330,8 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public Substation getParentSubstation() {
-        if (eContainerFeatureID() != SclPackage.FUNCTION__PARENT_SUBSTATION) return null;
-        return (Substation)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.FUNCTION__PARENT_SUBSTATION ) return null;
+        return ( Substation ) eInternalContainer();
     }
 
     /**
@@ -325,8 +339,9 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSubstation(Substation newParentSubstation, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSubstation, SclPackage.FUNCTION__PARENT_SUBSTATION, msgs);
+    public NotificationChain basicSetParentSubstation( Substation newParentSubstation, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSubstation, SclPackage.FUNCTION__PARENT_SUBSTATION,
+                msgs );
         return msgs;
     }
 
@@ -336,20 +351,24 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      * @generated
      */
     @Override
-    public void setParentSubstation(Substation newParentSubstation) {
-        if (newParentSubstation != eInternalContainer() || (eContainerFeatureID() != SclPackage.FUNCTION__PARENT_SUBSTATION && newParentSubstation != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSubstation))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSubstation( Substation newParentSubstation ) {
+        if( newParentSubstation != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.FUNCTION__PARENT_SUBSTATION
+                        && newParentSubstation != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSubstation ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSubstation != null)
-                msgs = ((InternalEObject)newParentSubstation).eInverseAdd(this, SclPackage.SUBSTATION__FUNCTION, Substation.class, msgs);
-            msgs = basicSetParentSubstation(newParentSubstation, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSubstation != null )
+                msgs = ( ( InternalEObject ) newParentSubstation ).eInverseAdd( this, SclPackage.SUBSTATION__FUNCTION,
+                        Substation.class, msgs );
+            msgs = basicSetParentSubstation( newParentSubstation, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FUNCTION__PARENT_SUBSTATION, newParentSubstation, newParentSubstation));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FUNCTION__PARENT_SUBSTATION,
+                    newParentSubstation, newParentSubstation ) );
     }
 
     /**
@@ -359,8 +378,8 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public VoltageLevel getParentVoltageLevel() {
-        if (eContainerFeatureID() != SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL) return null;
-        return (VoltageLevel)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL ) return null;
+        return ( VoltageLevel ) eInternalContainer();
     }
 
     /**
@@ -368,8 +387,9 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentVoltageLevel(VoltageLevel newParentVoltageLevel, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentVoltageLevel, SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL, msgs);
+    public NotificationChain basicSetParentVoltageLevel( VoltageLevel newParentVoltageLevel, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentVoltageLevel, SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL,
+                msgs );
         return msgs;
     }
 
@@ -379,20 +399,24 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      * @generated
      */
     @Override
-    public void setParentVoltageLevel(VoltageLevel newParentVoltageLevel) {
-        if (newParentVoltageLevel != eInternalContainer() || (eContainerFeatureID() != SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL && newParentVoltageLevel != null)) {
-            if (EcoreUtil.isAncestor(this, newParentVoltageLevel))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentVoltageLevel( VoltageLevel newParentVoltageLevel ) {
+        if( newParentVoltageLevel != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL
+                        && newParentVoltageLevel != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentVoltageLevel ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentVoltageLevel != null)
-                msgs = ((InternalEObject)newParentVoltageLevel).eInverseAdd(this, SclPackage.VOLTAGE_LEVEL__FUNCTION, VoltageLevel.class, msgs);
-            msgs = basicSetParentVoltageLevel(newParentVoltageLevel, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentVoltageLevel != null )
+                msgs = ( ( InternalEObject ) newParentVoltageLevel ).eInverseAdd( this,
+                        SclPackage.VOLTAGE_LEVEL__FUNCTION, VoltageLevel.class, msgs );
+            msgs = basicSetParentVoltageLevel( newParentVoltageLevel, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL, newParentVoltageLevel, newParentVoltageLevel));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL,
+                    newParentVoltageLevel, newParentVoltageLevel ) );
     }
 
     /**
@@ -401,9 +425,10 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      * @generated
      */
     @Override
-    public EList<SubFunction> getSubFunction() {
-        if (subFunction == null) {
-            subFunction = new EObjectContainmentWithInverseEList.Unsettable<SubFunction>(SubFunction.class, this, SclPackage.FUNCTION__SUB_FUNCTION, SclPackage.SUB_FUNCTION__PARENT_FUNCTION);
+    public EList< SubFunction > getSubFunction() {
+        if( subFunction == null ) {
+            subFunction = new EObjectContainmentWithInverseEList.Unsettable< SubFunction >( SubFunction.class, this,
+                    SclPackage.FUNCTION__SUB_FUNCTION, SclPackage.SUB_FUNCTION__PARENT_FUNCTION );
         }
         return subFunction;
     }
@@ -415,7 +440,7 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public void unsetSubFunction() {
-        if (subFunction != null) ((InternalEList.Unsettable<?>)subFunction).unset();
+        if( subFunction != null ) ( ( InternalEList.Unsettable< ? > ) subFunction ).unset();
     }
 
     /**
@@ -425,7 +450,7 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public boolean isSetSubFunction() {
-        return subFunction != null && ((InternalEList.Unsettable<?>)subFunction).isSet();
+        return subFunction != null && ( ( InternalEList.Unsettable< ? > ) subFunction ).isSet();
     }
 
     /**
@@ -434,9 +459,11 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      * @generated
      */
     @Override
-    public EList<GeneralEquipment> getGeneralEquipment() {
-        if (generalEquipment == null) {
-            generalEquipment = new EObjectContainmentWithInverseEList.Unsettable<GeneralEquipment>(GeneralEquipment.class, this, SclPackage.FUNCTION__GENERAL_EQUIPMENT, SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION);
+    public EList< GeneralEquipment > getGeneralEquipment() {
+        if( generalEquipment == null ) {
+            generalEquipment = new EObjectContainmentWithInverseEList.Unsettable< GeneralEquipment >(
+                    GeneralEquipment.class, this, SclPackage.FUNCTION__GENERAL_EQUIPMENT,
+                    SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION );
         }
         return generalEquipment;
     }
@@ -448,7 +475,7 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public void unsetGeneralEquipment() {
-        if (generalEquipment != null) ((InternalEList.Unsettable<?>)generalEquipment).unset();
+        if( generalEquipment != null ) ( ( InternalEList.Unsettable< ? > ) generalEquipment ).unset();
     }
 
     /**
@@ -458,7 +485,7 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public boolean isSetGeneralEquipment() {
-        return generalEquipment != null && ((InternalEList.Unsettable<?>)generalEquipment).isSet();
+        return generalEquipment != null && ( ( InternalEList.Unsettable< ? > ) generalEquipment ).isSet();
     }
 
     /**
@@ -469,31 +496,34 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.FUNCTION__PARENT_BAY:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentBay((Bay)otherEnd, msgs);
-            case SclPackage.FUNCTION__CONDUCTING_EQUIPMENT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getConductingEquipment()).basicAdd(otherEnd, msgs);
-            case SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentGeneralEquipmentContainer((GeneralEquipmentContainer)otherEnd, msgs);
-            case SclPackage.FUNCTION__PARENT_SUBSTATION:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSubstation((Substation)otherEnd, msgs);
-            case SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentVoltageLevel((VoltageLevel)otherEnd, msgs);
-            case SclPackage.FUNCTION__SUB_FUNCTION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSubFunction()).basicAdd(otherEnd, msgs);
-            case SclPackage.FUNCTION__GENERAL_EQUIPMENT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getGeneralEquipment()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.FUNCTION__PARENT_BAY:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentBay( ( Bay ) otherEnd, msgs );
+        case SclPackage.FUNCTION__CONDUCTING_EQUIPMENT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getConductingEquipment() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentGeneralEquipmentContainer( ( GeneralEquipmentContainer ) otherEnd, msgs );
+        case SclPackage.FUNCTION__PARENT_SUBSTATION:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSubstation( ( Substation ) otherEnd, msgs );
+        case SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentVoltageLevel( ( VoltageLevel ) otherEnd, msgs );
+        case SclPackage.FUNCTION__SUB_FUNCTION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSubFunction() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.FUNCTION__GENERAL_EQUIPMENT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getGeneralEquipment() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -503,23 +533,23 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.FUNCTION__PARENT_BAY:
-                return basicSetParentBay(null, msgs);
-            case SclPackage.FUNCTION__CONDUCTING_EQUIPMENT:
-                return ((InternalEList<?>)getConductingEquipment()).basicRemove(otherEnd, msgs);
-            case SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER:
-                return basicSetParentGeneralEquipmentContainer(null, msgs);
-            case SclPackage.FUNCTION__PARENT_SUBSTATION:
-                return basicSetParentSubstation(null, msgs);
-            case SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL:
-                return basicSetParentVoltageLevel(null, msgs);
-            case SclPackage.FUNCTION__SUB_FUNCTION:
-                return ((InternalEList<?>)getSubFunction()).basicRemove(otherEnd, msgs);
-            case SclPackage.FUNCTION__GENERAL_EQUIPMENT:
-                return ((InternalEList<?>)getGeneralEquipment()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.FUNCTION__PARENT_BAY:
+            return basicSetParentBay( null, msgs );
+        case SclPackage.FUNCTION__CONDUCTING_EQUIPMENT:
+            return ( ( InternalEList< ? > ) getConductingEquipment() ).basicRemove( otherEnd, msgs );
+        case SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER:
+            return basicSetParentGeneralEquipmentContainer( null, msgs );
+        case SclPackage.FUNCTION__PARENT_SUBSTATION:
+            return basicSetParentSubstation( null, msgs );
+        case SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL:
+            return basicSetParentVoltageLevel( null, msgs );
+        case SclPackage.FUNCTION__SUB_FUNCTION:
+            return ( ( InternalEList< ? > ) getSubFunction() ).basicRemove( otherEnd, msgs );
+        case SclPackage.FUNCTION__GENERAL_EQUIPMENT:
+            return ( ( InternalEList< ? > ) getGeneralEquipment() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -529,17 +559,19 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.FUNCTION__PARENT_BAY:
-                return eInternalContainer().eInverseRemove(this, SclPackage.BAY__FUNCTION, Bay.class, msgs);
-            case SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION, GeneralEquipmentContainer.class, msgs);
-            case SclPackage.FUNCTION__PARENT_SUBSTATION:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SUBSTATION__FUNCTION, Substation.class, msgs);
-            case SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL:
-                return eInternalContainer().eInverseRemove(this, SclPackage.VOLTAGE_LEVEL__FUNCTION, VoltageLevel.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.FUNCTION__PARENT_BAY:
+            return eInternalContainer().eInverseRemove( this, SclPackage.BAY__FUNCTION, Bay.class, msgs );
+        case SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION,
+                    GeneralEquipmentContainer.class, msgs );
+        case SclPackage.FUNCTION__PARENT_SUBSTATION:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SUBSTATION__FUNCTION, Substation.class, msgs );
+        case SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL:
+            return eInternalContainer().eInverseRemove( this, SclPackage.VOLTAGE_LEVEL__FUNCTION, VoltageLevel.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -549,25 +581,25 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.FUNCTION__TYPE:
-                return getType();
-            case SclPackage.FUNCTION__PARENT_BAY:
-                return getParentBay();
-            case SclPackage.FUNCTION__CONDUCTING_EQUIPMENT:
-                return getConductingEquipment();
-            case SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER:
-                return getParentGeneralEquipmentContainer();
-            case SclPackage.FUNCTION__PARENT_SUBSTATION:
-                return getParentSubstation();
-            case SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL:
-                return getParentVoltageLevel();
-            case SclPackage.FUNCTION__SUB_FUNCTION:
-                return getSubFunction();
-            case SclPackage.FUNCTION__GENERAL_EQUIPMENT:
-                return getGeneralEquipment();
+        switch( featureID ) {
+        case SclPackage.FUNCTION__TYPE:
+            return getType();
+        case SclPackage.FUNCTION__PARENT_BAY:
+            return getParentBay();
+        case SclPackage.FUNCTION__CONDUCTING_EQUIPMENT:
+            return getConductingEquipment();
+        case SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER:
+            return getParentGeneralEquipmentContainer();
+        case SclPackage.FUNCTION__PARENT_SUBSTATION:
+            return getParentSubstation();
+        case SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL:
+            return getParentVoltageLevel();
+        case SclPackage.FUNCTION__SUB_FUNCTION:
+            return getSubFunction();
+        case SclPackage.FUNCTION__GENERAL_EQUIPMENT:
+            return getGeneralEquipment();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -578,36 +610,36 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.FUNCTION__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.FUNCTION__PARENT_BAY:
-                setParentBay((Bay)newValue);
-                return;
-            case SclPackage.FUNCTION__CONDUCTING_EQUIPMENT:
-                getConductingEquipment().clear();
-                getConductingEquipment().addAll((Collection<? extends ConductingEquipment>)newValue);
-                return;
-            case SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER:
-                setParentGeneralEquipmentContainer((GeneralEquipmentContainer)newValue);
-                return;
-            case SclPackage.FUNCTION__PARENT_SUBSTATION:
-                setParentSubstation((Substation)newValue);
-                return;
-            case SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL:
-                setParentVoltageLevel((VoltageLevel)newValue);
-                return;
-            case SclPackage.FUNCTION__SUB_FUNCTION:
-                getSubFunction().clear();
-                getSubFunction().addAll((Collection<? extends SubFunction>)newValue);
-                return;
-            case SclPackage.FUNCTION__GENERAL_EQUIPMENT:
-                getGeneralEquipment().clear();
-                getGeneralEquipment().addAll((Collection<? extends GeneralEquipment>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.FUNCTION__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.FUNCTION__PARENT_BAY:
+            setParentBay( ( Bay ) newValue );
+            return;
+        case SclPackage.FUNCTION__CONDUCTING_EQUIPMENT:
+            getConductingEquipment().clear();
+            getConductingEquipment().addAll( ( Collection< ? extends ConductingEquipment > ) newValue );
+            return;
+        case SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER:
+            setParentGeneralEquipmentContainer( ( GeneralEquipmentContainer ) newValue );
+            return;
+        case SclPackage.FUNCTION__PARENT_SUBSTATION:
+            setParentSubstation( ( Substation ) newValue );
+            return;
+        case SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL:
+            setParentVoltageLevel( ( VoltageLevel ) newValue );
+            return;
+        case SclPackage.FUNCTION__SUB_FUNCTION:
+            getSubFunction().clear();
+            getSubFunction().addAll( ( Collection< ? extends SubFunction > ) newValue );
+            return;
+        case SclPackage.FUNCTION__GENERAL_EQUIPMENT:
+            getGeneralEquipment().clear();
+            getGeneralEquipment().addAll( ( Collection< ? extends GeneralEquipment > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -617,33 +649,33 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.FUNCTION__TYPE:
-                unsetType();
-                return;
-            case SclPackage.FUNCTION__PARENT_BAY:
-                setParentBay((Bay)null);
-                return;
-            case SclPackage.FUNCTION__CONDUCTING_EQUIPMENT:
-                unsetConductingEquipment();
-                return;
-            case SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER:
-                setParentGeneralEquipmentContainer((GeneralEquipmentContainer)null);
-                return;
-            case SclPackage.FUNCTION__PARENT_SUBSTATION:
-                setParentSubstation((Substation)null);
-                return;
-            case SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL:
-                setParentVoltageLevel((VoltageLevel)null);
-                return;
-            case SclPackage.FUNCTION__SUB_FUNCTION:
-                unsetSubFunction();
-                return;
-            case SclPackage.FUNCTION__GENERAL_EQUIPMENT:
-                unsetGeneralEquipment();
-                return;
+        switch( featureID ) {
+        case SclPackage.FUNCTION__TYPE:
+            unsetType();
+            return;
+        case SclPackage.FUNCTION__PARENT_BAY:
+            setParentBay( ( Bay ) null );
+            return;
+        case SclPackage.FUNCTION__CONDUCTING_EQUIPMENT:
+            unsetConductingEquipment();
+            return;
+        case SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER:
+            setParentGeneralEquipmentContainer( ( GeneralEquipmentContainer ) null );
+            return;
+        case SclPackage.FUNCTION__PARENT_SUBSTATION:
+            setParentSubstation( ( Substation ) null );
+            return;
+        case SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL:
+            setParentVoltageLevel( ( VoltageLevel ) null );
+            return;
+        case SclPackage.FUNCTION__SUB_FUNCTION:
+            unsetSubFunction();
+            return;
+        case SclPackage.FUNCTION__GENERAL_EQUIPMENT:
+            unsetGeneralEquipment();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -653,25 +685,25 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.FUNCTION__TYPE:
-                return isSetType();
-            case SclPackage.FUNCTION__PARENT_BAY:
-                return getParentBay() != null;
-            case SclPackage.FUNCTION__CONDUCTING_EQUIPMENT:
-                return isSetConductingEquipment();
-            case SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER:
-                return getParentGeneralEquipmentContainer() != null;
-            case SclPackage.FUNCTION__PARENT_SUBSTATION:
-                return getParentSubstation() != null;
-            case SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL:
-                return getParentVoltageLevel() != null;
-            case SclPackage.FUNCTION__SUB_FUNCTION:
-                return isSetSubFunction();
-            case SclPackage.FUNCTION__GENERAL_EQUIPMENT:
-                return isSetGeneralEquipment();
+        switch( featureID ) {
+        case SclPackage.FUNCTION__TYPE:
+            return isSetType();
+        case SclPackage.FUNCTION__PARENT_BAY:
+            return getParentBay() != null;
+        case SclPackage.FUNCTION__CONDUCTING_EQUIPMENT:
+            return isSetConductingEquipment();
+        case SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER:
+            return getParentGeneralEquipmentContainer() != null;
+        case SclPackage.FUNCTION__PARENT_SUBSTATION:
+            return getParentSubstation() != null;
+        case SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL:
+            return getParentVoltageLevel() != null;
+        case SclPackage.FUNCTION__SUB_FUNCTION:
+            return isSetSubFunction();
+        case SclPackage.FUNCTION__GENERAL_EQUIPMENT:
+            return isSetGeneralEquipment();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -681,12 +713,15 @@ public class FunctionImpl extends PowerSystemResourceImpl implements Function {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GOOSEImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GOOSEImpl.java
index 8688fdb..ae3bfa6 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GOOSEImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GOOSEImpl.java
@@ -175,8 +175,9 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
         fixedOffs = newFixedOffs;
         boolean oldFixedOffsESet = fixedOffsESet;
         fixedOffsESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GOOSE__FIXED_OFFS, oldFixedOffs, fixedOffs, !oldFixedOffsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GOOSE__FIXED_OFFS, oldFixedOffs,
+                    fixedOffs, !oldFixedOffsESet ) );
     }
 
     /**
@@ -190,8 +191,9 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
         boolean oldFixedOffsESet = fixedOffsESet;
         fixedOffs = FIXED_OFFS_EDEFAULT;
         fixedOffsESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GOOSE__FIXED_OFFS, oldFixedOffs, FIXED_OFFS_EDEFAULT, oldFixedOffsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.GOOSE__FIXED_OFFS, oldFixedOffs,
+                    FIXED_OFFS_EDEFAULT, oldFixedOffsESet ) );
     }
 
     /**
@@ -211,8 +213,8 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.GOOSE__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GOOSE__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -220,8 +222,8 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.GOOSE__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.GOOSE__PARENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -231,20 +233,23 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.GOOSE__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GOOSE__PARENT_SERVICES && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__GOOSE, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__GOOSE,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GOOSE__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GOOSE__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -263,13 +268,14 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
      * @generated
      */
     @Override
-    public void setGoose(Boolean newGoose) {
+    public void setGoose( Boolean newGoose ) {
         Boolean oldGoose = goose;
         goose = newGoose;
         boolean oldGooseESet = gooseESet;
         gooseESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GOOSE__GOOSE, oldGoose, goose, !oldGooseESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GOOSE__GOOSE, oldGoose, goose,
+                    !oldGooseESet ) );
     }
 
     /**
@@ -283,8 +289,9 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
         boolean oldGooseESet = gooseESet;
         goose = GOOSE_EDEFAULT;
         gooseESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GOOSE__GOOSE, oldGoose, GOOSE_EDEFAULT, oldGooseESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.GOOSE__GOOSE, oldGoose, GOOSE_EDEFAULT,
+                    oldGooseESet ) );
     }
 
     /**
@@ -313,13 +320,14 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
      * @generated
      */
     @Override
-    public void setRGOOSE(Boolean newRGOOSE) {
+    public void setRGOOSE( Boolean newRGOOSE ) {
         Boolean oldRGOOSE = rGOOSE;
         rGOOSE = newRGOOSE;
         boolean oldRGOOSEESet = rGOOSEESet;
         rGOOSEESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GOOSE__RGOOSE, oldRGOOSE, rGOOSE, !oldRGOOSEESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GOOSE__RGOOSE, oldRGOOSE, rGOOSE,
+                    !oldRGOOSEESet ) );
     }
 
     /**
@@ -333,8 +341,9 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
         boolean oldRGOOSEESet = rGOOSEESet;
         rGOOSE = RGOOSE_EDEFAULT;
         rGOOSEESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GOOSE__RGOOSE, oldRGOOSE, RGOOSE_EDEFAULT, oldRGOOSEESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.GOOSE__RGOOSE, oldRGOOSE,
+                    RGOOSE_EDEFAULT, oldRGOOSEESet ) );
     }
 
     /**
@@ -354,13 +363,13 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GOOSE__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.GOOSE__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -370,11 +379,11 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GOOSE__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.GOOSE__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -384,11 +393,11 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.GOOSE__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__GOOSE, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.GOOSE__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__GOOSE, Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -398,17 +407,17 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.GOOSE__FIXED_OFFS:
-                return getFixedOffs();
-            case SclPackage.GOOSE__PARENT_SERVICES:
-                return getParentServices();
-            case SclPackage.GOOSE__GOOSE:
-                return getGoose();
-            case SclPackage.GOOSE__RGOOSE:
-                return getRGOOSE();
+        switch( featureID ) {
+        case SclPackage.GOOSE__FIXED_OFFS:
+            return getFixedOffs();
+        case SclPackage.GOOSE__PARENT_SERVICES:
+            return getParentServices();
+        case SclPackage.GOOSE__GOOSE:
+            return getGoose();
+        case SclPackage.GOOSE__RGOOSE:
+            return getRGOOSE();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -418,21 +427,21 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.GOOSE__FIXED_OFFS:
-                setFixedOffs((Boolean)newValue);
-                return;
-            case SclPackage.GOOSE__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
-            case SclPackage.GOOSE__GOOSE:
-                setGoose((Boolean)newValue);
-                return;
-            case SclPackage.GOOSE__RGOOSE:
-                setRGOOSE((Boolean)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.GOOSE__FIXED_OFFS:
+            setFixedOffs( ( Boolean ) newValue );
+            return;
+        case SclPackage.GOOSE__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
+        case SclPackage.GOOSE__GOOSE:
+            setGoose( ( Boolean ) newValue );
+            return;
+        case SclPackage.GOOSE__RGOOSE:
+            setRGOOSE( ( Boolean ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -442,21 +451,21 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GOOSE__FIXED_OFFS:
-                unsetFixedOffs();
-                return;
-            case SclPackage.GOOSE__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
-            case SclPackage.GOOSE__GOOSE:
-                unsetGoose();
-                return;
-            case SclPackage.GOOSE__RGOOSE:
-                unsetRGOOSE();
-                return;
+        switch( featureID ) {
+        case SclPackage.GOOSE__FIXED_OFFS:
+            unsetFixedOffs();
+            return;
+        case SclPackage.GOOSE__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
+        case SclPackage.GOOSE__GOOSE:
+            unsetGoose();
+            return;
+        case SclPackage.GOOSE__RGOOSE:
+            unsetRGOOSE();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -466,17 +475,17 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GOOSE__FIXED_OFFS:
-                return isSetFixedOffs();
-            case SclPackage.GOOSE__PARENT_SERVICES:
-                return getParentServices() != null;
-            case SclPackage.GOOSE__GOOSE:
-                return isSetGoose();
-            case SclPackage.GOOSE__RGOOSE:
-                return isSetRGOOSE();
+        switch( featureID ) {
+        case SclPackage.GOOSE__FIXED_OFFS:
+            return isSetFixedOffs();
+        case SclPackage.GOOSE__PARENT_SERVICES:
+            return getParentServices() != null;
+        case SclPackage.GOOSE__GOOSE:
+            return isSetGoose();
+        case SclPackage.GOOSE__RGOOSE:
+            return isSetRGOOSE();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -486,16 +495,25 @@ public class GOOSEImpl extends ServiceWithMaxImpl implements GOOSE {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (fixedOffs: ");
-        if (fixedOffsESet) result.append(fixedOffs); else result.append("<unset>");
-        result.append(", goose: ");
-        if (gooseESet) result.append(goose); else result.append("<unset>");
-        result.append(", rGOOSE: ");
-        if (rGOOSEESet) result.append(rGOOSE); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (fixedOffs: " );
+        if( fixedOffsESet )
+            result.append( fixedOffs );
+        else
+            result.append( "<unset>" );
+        result.append( ", goose: " );
+        if( gooseESet )
+            result.append( goose );
+        else
+            result.append( "<unset>" );
+        result.append( ", rGOOSE: " );
+        if( rGOOSEESet )
+            result.append( rGOOSE );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GOOSESecurityImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GOOSESecurityImpl.java
index e83c561..0b2d41f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GOOSESecurityImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GOOSESecurityImpl.java
@@ -71,8 +71,8 @@ public class GOOSESecurityImpl extends CertificateImpl implements GOOSESecurity
      */
     @Override
     public AccessPoint getParentAccessPoint() {
-        if (eContainerFeatureID() != SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT) return null;
-        return (AccessPoint)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT ) return null;
+        return ( AccessPoint ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class GOOSESecurityImpl extends CertificateImpl implements GOOSESecurity
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAccessPoint(AccessPoint newParentAccessPoint, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAccessPoint, SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT, msgs);
+    public NotificationChain basicSetParentAccessPoint( AccessPoint newParentAccessPoint, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAccessPoint,
+                SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT, msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class GOOSESecurityImpl extends CertificateImpl implements GOOSESecurity
      * @generated
      */
     @Override
-    public void setParentAccessPoint(AccessPoint newParentAccessPoint) {
-        if (newParentAccessPoint != eInternalContainer() || (eContainerFeatureID() != SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT && newParentAccessPoint != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAccessPoint))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAccessPoint( AccessPoint newParentAccessPoint ) {
+        if( newParentAccessPoint != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT
+                        && newParentAccessPoint != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAccessPoint ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAccessPoint != null)
-                msgs = ((InternalEObject)newParentAccessPoint).eInverseAdd(this, SclPackage.ACCESS_POINT__GOOSE_SECURITY, AccessPoint.class, msgs);
-            msgs = basicSetParentAccessPoint(newParentAccessPoint, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAccessPoint != null )
+                msgs = ( ( InternalEObject ) newParentAccessPoint ).eInverseAdd( this,
+                        SclPackage.ACCESS_POINT__GOOSE_SECURITY, AccessPoint.class, msgs );
+            msgs = basicSetParentAccessPoint( newParentAccessPoint, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT, newParentAccessPoint, newParentAccessPoint));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT,
+                    newParentAccessPoint, newParentAccessPoint ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class GOOSESecurityImpl extends CertificateImpl implements GOOSESecurity
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAccessPoint((AccessPoint)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAccessPoint( ( AccessPoint ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class GOOSESecurityImpl extends CertificateImpl implements GOOSESecurity
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT:
-                return basicSetParentAccessPoint(null, msgs);
+        switch( featureID ) {
+        case SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT:
+            return basicSetParentAccessPoint( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class GOOSESecurityImpl extends CertificateImpl implements GOOSESecurity
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ACCESS_POINT__GOOSE_SECURITY, AccessPoint.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ACCESS_POINT__GOOSE_SECURITY,
+                    AccessPoint.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class GOOSESecurityImpl extends CertificateImpl implements GOOSESecurity
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT:
-                return getParentAccessPoint();
+        switch( featureID ) {
+        case SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT:
+            return getParentAccessPoint();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class GOOSESecurityImpl extends CertificateImpl implements GOOSESecurity
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT:
-                setParentAccessPoint((AccessPoint)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT:
+            setParentAccessPoint( ( AccessPoint ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class GOOSESecurityImpl extends CertificateImpl implements GOOSESecurity
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT:
-                setParentAccessPoint((AccessPoint)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT:
+            setParentAccessPoint( ( AccessPoint ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class GOOSESecurityImpl extends CertificateImpl implements GOOSESecurity
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT:
-                return getParentAccessPoint() != null;
+        switch( featureID ) {
+        case SclPackage.GOOSE_SECURITY__PARENT_ACCESS_POINT:
+            return getParentAccessPoint() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //GOOSESecurityImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSEControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSEControlImpl.java
index 941183f..d92cc04 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSEControlImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSEControlImpl.java
@@ -208,8 +208,9 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
         appID = newAppID;
         boolean oldAppIDESet = appIDESet;
         appIDESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE_CONTROL__APP_ID, oldAppID, appID, !oldAppIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSE_CONTROL__APP_ID, oldAppID, appID,
+                    !oldAppIDESet ) );
     }
 
     /**
@@ -223,8 +224,9 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
         boolean oldAppIDESet = appIDESet;
         appID = APP_ID_EDEFAULT;
         appIDESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GSE_CONTROL__APP_ID, oldAppID, APP_ID_EDEFAULT, oldAppIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.GSE_CONTROL__APP_ID, oldAppID,
+                    APP_ID_EDEFAULT, oldAppIDESet ) );
     }
 
     /**
@@ -258,8 +260,9 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
         fixedOffs = newFixedOffs;
         boolean oldFixedOffsESet = fixedOffsESet;
         fixedOffsESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE_CONTROL__FIXED_OFFS, oldFixedOffs, fixedOffs, !oldFixedOffsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSE_CONTROL__FIXED_OFFS, oldFixedOffs,
+                    fixedOffs, !oldFixedOffsESet ) );
     }
 
     /**
@@ -273,8 +276,9 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
         boolean oldFixedOffsESet = fixedOffsESet;
         fixedOffs = FIXED_OFFS_EDEFAULT;
         fixedOffsESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GSE_CONTROL__FIXED_OFFS, oldFixedOffs, FIXED_OFFS_EDEFAULT, oldFixedOffsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.GSE_CONTROL__FIXED_OFFS, oldFixedOffs,
+                    FIXED_OFFS_EDEFAULT, oldFixedOffsESet ) );
     }
 
     /**
@@ -308,8 +312,9 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
         securityEnable = newSecurityEnable == null ? SECURITY_ENABLE_EDEFAULT : newSecurityEnable;
         boolean oldSecurityEnableESet = securityEnableESet;
         securityEnableESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE_CONTROL__SECURITY_ENABLE, oldSecurityEnable, securityEnable, !oldSecurityEnableESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSE_CONTROL__SECURITY_ENABLE,
+                    oldSecurityEnable, securityEnable, !oldSecurityEnableESet ) );
     }
 
     /**
@@ -323,8 +328,9 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
         boolean oldSecurityEnableESet = securityEnableESet;
         securityEnable = SECURITY_ENABLE_EDEFAULT;
         securityEnableESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GSE_CONTROL__SECURITY_ENABLE, oldSecurityEnable, SECURITY_ENABLE_EDEFAULT, oldSecurityEnableESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.GSE_CONTROL__SECURITY_ENABLE,
+                    oldSecurityEnable, SECURITY_ENABLE_EDEFAULT, oldSecurityEnableESet ) );
     }
 
     /**
@@ -358,8 +364,9 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
         type = newType == null ? TYPE_EDEFAULT : newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE_CONTROL__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSE_CONTROL__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -373,8 +380,9 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GSE_CONTROL__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.GSE_CONTROL__TYPE, oldType,
+                    TYPE_EDEFAULT, oldTypeESet ) );
     }
 
     /**
@@ -394,8 +402,8 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
      */
     @Override
     public LN0 getParentLN0() {
-        if (eContainerFeatureID() != SclPackage.GSE_CONTROL__PARENT_LN0) return null;
-        return (LN0)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GSE_CONTROL__PARENT_LN0 ) return null;
+        return ( LN0 ) eInternalContainer();
     }
 
     /**
@@ -403,8 +411,8 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentLN0(LN0 newParentLN0, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentLN0, SclPackage.GSE_CONTROL__PARENT_LN0, msgs);
+    public NotificationChain basicSetParentLN0( LN0 newParentLN0, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentLN0, SclPackage.GSE_CONTROL__PARENT_LN0, msgs );
         return msgs;
     }
 
@@ -414,20 +422,23 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
      * @generated
      */
     @Override
-    public void setParentLN0(LN0 newParentLN0) {
-        if (newParentLN0 != eInternalContainer() || (eContainerFeatureID() != SclPackage.GSE_CONTROL__PARENT_LN0 && newParentLN0 != null)) {
-            if (EcoreUtil.isAncestor(this, newParentLN0))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentLN0( LN0 newParentLN0 ) {
+        if( newParentLN0 != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GSE_CONTROL__PARENT_LN0 && newParentLN0 != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentLN0 ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentLN0 != null)
-                msgs = ((InternalEObject)newParentLN0).eInverseAdd(this, SclPackage.LN0__GSE_CONTROL, LN0.class, msgs);
-            msgs = basicSetParentLN0(newParentLN0, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentLN0 != null )
+                msgs = ( ( InternalEObject ) newParentLN0 ).eInverseAdd( this, SclPackage.LN0__GSE_CONTROL, LN0.class,
+                        msgs );
+            msgs = basicSetParentLN0( newParentLN0, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE_CONTROL__PARENT_LN0, newParentLN0, newParentLN0));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSE_CONTROL__PARENT_LN0, newParentLN0,
+                    newParentLN0 ) );
     }
 
     /**
@@ -437,13 +448,13 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GSE_CONTROL__PARENT_LN0:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentLN0((LN0)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.GSE_CONTROL__PARENT_LN0:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentLN0( ( LN0 ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -453,11 +464,11 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GSE_CONTROL__PARENT_LN0:
-                return basicSetParentLN0(null, msgs);
+        switch( featureID ) {
+        case SclPackage.GSE_CONTROL__PARENT_LN0:
+            return basicSetParentLN0( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -467,11 +478,11 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.GSE_CONTROL__PARENT_LN0:
-                return eInternalContainer().eInverseRemove(this, SclPackage.LN0__GSE_CONTROL, LN0.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.GSE_CONTROL__PARENT_LN0:
+            return eInternalContainer().eInverseRemove( this, SclPackage.LN0__GSE_CONTROL, LN0.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -481,19 +492,19 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.GSE_CONTROL__APP_ID:
-                return getAppID();
-            case SclPackage.GSE_CONTROL__FIXED_OFFS:
-                return getFixedOffs();
-            case SclPackage.GSE_CONTROL__SECURITY_ENABLE:
-                return getSecurityEnable();
-            case SclPackage.GSE_CONTROL__TYPE:
-                return getType();
-            case SclPackage.GSE_CONTROL__PARENT_LN0:
-                return getParentLN0();
+        switch( featureID ) {
+        case SclPackage.GSE_CONTROL__APP_ID:
+            return getAppID();
+        case SclPackage.GSE_CONTROL__FIXED_OFFS:
+            return getFixedOffs();
+        case SclPackage.GSE_CONTROL__SECURITY_ENABLE:
+            return getSecurityEnable();
+        case SclPackage.GSE_CONTROL__TYPE:
+            return getType();
+        case SclPackage.GSE_CONTROL__PARENT_LN0:
+            return getParentLN0();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -503,24 +514,24 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.GSE_CONTROL__APP_ID:
-                setAppID((String)newValue);
-                return;
-            case SclPackage.GSE_CONTROL__FIXED_OFFS:
-                setFixedOffs((Boolean)newValue);
-                return;
-            case SclPackage.GSE_CONTROL__SECURITY_ENABLE:
-                setSecurityEnable((PredefinedTypeOfSecurityEnum)newValue);
-                return;
-            case SclPackage.GSE_CONTROL__TYPE:
-                setType((GSEControlTypeEnum)newValue);
-                return;
-            case SclPackage.GSE_CONTROL__PARENT_LN0:
-                setParentLN0((LN0)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.GSE_CONTROL__APP_ID:
+            setAppID( ( String ) newValue );
+            return;
+        case SclPackage.GSE_CONTROL__FIXED_OFFS:
+            setFixedOffs( ( Boolean ) newValue );
+            return;
+        case SclPackage.GSE_CONTROL__SECURITY_ENABLE:
+            setSecurityEnable( ( PredefinedTypeOfSecurityEnum ) newValue );
+            return;
+        case SclPackage.GSE_CONTROL__TYPE:
+            setType( ( GSEControlTypeEnum ) newValue );
+            return;
+        case SclPackage.GSE_CONTROL__PARENT_LN0:
+            setParentLN0( ( LN0 ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -530,24 +541,24 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GSE_CONTROL__APP_ID:
-                unsetAppID();
-                return;
-            case SclPackage.GSE_CONTROL__FIXED_OFFS:
-                unsetFixedOffs();
-                return;
-            case SclPackage.GSE_CONTROL__SECURITY_ENABLE:
-                unsetSecurityEnable();
-                return;
-            case SclPackage.GSE_CONTROL__TYPE:
-                unsetType();
-                return;
-            case SclPackage.GSE_CONTROL__PARENT_LN0:
-                setParentLN0((LN0)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.GSE_CONTROL__APP_ID:
+            unsetAppID();
+            return;
+        case SclPackage.GSE_CONTROL__FIXED_OFFS:
+            unsetFixedOffs();
+            return;
+        case SclPackage.GSE_CONTROL__SECURITY_ENABLE:
+            unsetSecurityEnable();
+            return;
+        case SclPackage.GSE_CONTROL__TYPE:
+            unsetType();
+            return;
+        case SclPackage.GSE_CONTROL__PARENT_LN0:
+            setParentLN0( ( LN0 ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -557,19 +568,19 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GSE_CONTROL__APP_ID:
-                return isSetAppID();
-            case SclPackage.GSE_CONTROL__FIXED_OFFS:
-                return isSetFixedOffs();
-            case SclPackage.GSE_CONTROL__SECURITY_ENABLE:
-                return isSetSecurityEnable();
-            case SclPackage.GSE_CONTROL__TYPE:
-                return isSetType();
-            case SclPackage.GSE_CONTROL__PARENT_LN0:
-                return getParentLN0() != null;
+        switch( featureID ) {
+        case SclPackage.GSE_CONTROL__APP_ID:
+            return isSetAppID();
+        case SclPackage.GSE_CONTROL__FIXED_OFFS:
+            return isSetFixedOffs();
+        case SclPackage.GSE_CONTROL__SECURITY_ENABLE:
+            return isSetSecurityEnable();
+        case SclPackage.GSE_CONTROL__TYPE:
+            return isSetType();
+        case SclPackage.GSE_CONTROL__PARENT_LN0:
+            return getParentLN0() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -579,18 +590,30 @@ public class GSEControlImpl extends ControlWithIEDNameImpl implements GSEControl
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (appID: ");
-        if (appIDESet) result.append(appID); else result.append("<unset>");
-        result.append(", fixedOffs: ");
-        if (fixedOffsESet) result.append(fixedOffs); else result.append("<unset>");
-        result.append(", securityEnable: ");
-        if (securityEnableESet) result.append(securityEnable); else result.append("<unset>");
-        result.append(", type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (appID: " );
+        if( appIDESet )
+            result.append( appID );
+        else
+            result.append( "<unset>" );
+        result.append( ", fixedOffs: " );
+        if( fixedOffsESet )
+            result.append( fixedOffs );
+        else
+            result.append( "<unset>" );
+        result.append( ", securityEnable: " );
+        if( securityEnableESet )
+            result.append( securityEnable );
+        else
+            result.append( "<unset>" );
+        result.append( ", type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSEDirImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSEDirImpl.java
index ef82dc8..1b671b1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSEDirImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSEDirImpl.java
@@ -71,8 +71,8 @@ public class GSEDirImpl extends ServiceYesNoImpl implements GSEDir {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.GSE_DIR__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GSE_DIR__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,8 @@ public class GSEDirImpl extends ServiceYesNoImpl implements GSEDir {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.GSE_DIR__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.GSE_DIR__PARENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -91,20 +91,23 @@ public class GSEDirImpl extends ServiceYesNoImpl implements GSEDir {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.GSE_DIR__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GSE_DIR__PARENT_SERVICES && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__GSE_DIR, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__GSE_DIR,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE_DIR__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSE_DIR__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +117,13 @@ public class GSEDirImpl extends ServiceYesNoImpl implements GSEDir {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GSE_DIR__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.GSE_DIR__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +133,11 @@ public class GSEDirImpl extends ServiceYesNoImpl implements GSEDir {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GSE_DIR__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.GSE_DIR__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +147,11 @@ public class GSEDirImpl extends ServiceYesNoImpl implements GSEDir {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.GSE_DIR__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__GSE_DIR, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.GSE_DIR__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__GSE_DIR, Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +161,11 @@ public class GSEDirImpl extends ServiceYesNoImpl implements GSEDir {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.GSE_DIR__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.GSE_DIR__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +175,12 @@ public class GSEDirImpl extends ServiceYesNoImpl implements GSEDir {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.GSE_DIR__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.GSE_DIR__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +190,12 @@ public class GSEDirImpl extends ServiceYesNoImpl implements GSEDir {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GSE_DIR__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.GSE_DIR__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +205,11 @@ public class GSEDirImpl extends ServiceYesNoImpl implements GSEDir {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GSE_DIR__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.GSE_DIR__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //GSEDirImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSEImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSEImpl.java
index b1a4fa1..b46772c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSEImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSEImpl.java
@@ -121,14 +121,18 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetMaxTime(MaxTime newMaxTime, NotificationChain msgs) {
+    public NotificationChain basicSetMaxTime( MaxTime newMaxTime, NotificationChain msgs ) {
         MaxTime oldMaxTime = maxTime;
         maxTime = newMaxTime;
         boolean oldMaxTimeESet = maxTimeESet;
         maxTimeESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.GSE__MAX_TIME, oldMaxTime, newMaxTime, !oldMaxTimeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.GSE__MAX_TIME,
+                    oldMaxTime, newMaxTime, !oldMaxTimeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -139,21 +143,24 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      * @generated
      */
     @Override
-    public void setMaxTime(MaxTime newMaxTime) {
-        if (newMaxTime != maxTime) {
+    public void setMaxTime( MaxTime newMaxTime ) {
+        if( newMaxTime != maxTime ) {
             NotificationChain msgs = null;
-            if (maxTime != null)
-                msgs = ((InternalEObject)maxTime).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.GSE__MAX_TIME, null, msgs);
-            if (newMaxTime != null)
-                msgs = ((InternalEObject)newMaxTime).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SclPackage.GSE__MAX_TIME, null, msgs);
-            msgs = basicSetMaxTime(newMaxTime, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( maxTime != null )
+                msgs = ( ( InternalEObject ) maxTime ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.GSE__MAX_TIME, null, msgs );
+            if( newMaxTime != null )
+                msgs = ( ( InternalEObject ) newMaxTime ).eInverseAdd( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.GSE__MAX_TIME, null, msgs );
+            msgs = basicSetMaxTime( newMaxTime, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldMaxTimeESet = maxTimeESet;
             maxTimeESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE__MAX_TIME, newMaxTime, newMaxTime, !oldMaxTimeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSE__MAX_TIME, newMaxTime,
+                        newMaxTime, !oldMaxTimeESet ) );
         }
     }
 
@@ -162,14 +169,18 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetMaxTime(NotificationChain msgs) {
+    public NotificationChain basicUnsetMaxTime( NotificationChain msgs ) {
         MaxTime oldMaxTime = maxTime;
         maxTime = null;
         boolean oldMaxTimeESet = maxTimeESet;
         maxTimeESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.GSE__MAX_TIME, oldMaxTime, null, oldMaxTimeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.GSE__MAX_TIME,
+                    oldMaxTime, null, oldMaxTimeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -181,17 +192,19 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      */
     @Override
     public void unsetMaxTime() {
-        if (maxTime != null) {
+        if( maxTime != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)maxTime).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.GSE__MAX_TIME, null, msgs);
-            msgs = basicUnsetMaxTime(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) maxTime ).eInverseRemove( this,
+                    EOPPOSITE_FEATURE_BASE - SclPackage.GSE__MAX_TIME, null, msgs );
+            msgs = basicUnsetMaxTime( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldMaxTimeESet = maxTimeESet;
             maxTimeESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GSE__MAX_TIME, null, null, oldMaxTimeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.GSE__MAX_TIME, null, null,
+                        oldMaxTimeESet ) );
         }
     }
 
@@ -212,8 +225,8 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      */
     @Override
     public ConnectedAP getParentConnectedAP() {
-        if (eContainerFeatureID() != SclPackage.GSE__PARENT_CONNECTED_AP) return null;
-        return (ConnectedAP)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GSE__PARENT_CONNECTED_AP ) return null;
+        return ( ConnectedAP ) eInternalContainer();
     }
 
     /**
@@ -221,8 +234,9 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentConnectedAP(ConnectedAP newParentConnectedAP, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentConnectedAP, SclPackage.GSE__PARENT_CONNECTED_AP, msgs);
+    public NotificationChain basicSetParentConnectedAP( ConnectedAP newParentConnectedAP, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentConnectedAP, SclPackage.GSE__PARENT_CONNECTED_AP,
+                msgs );
         return msgs;
     }
 
@@ -232,20 +246,23 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      * @generated
      */
     @Override
-    public void setParentConnectedAP(ConnectedAP newParentConnectedAP) {
-        if (newParentConnectedAP != eInternalContainer() || (eContainerFeatureID() != SclPackage.GSE__PARENT_CONNECTED_AP && newParentConnectedAP != null)) {
-            if (EcoreUtil.isAncestor(this, newParentConnectedAP))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentConnectedAP( ConnectedAP newParentConnectedAP ) {
+        if( newParentConnectedAP != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GSE__PARENT_CONNECTED_AP && newParentConnectedAP != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentConnectedAP ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentConnectedAP != null)
-                msgs = ((InternalEObject)newParentConnectedAP).eInverseAdd(this, SclPackage.CONNECTED_AP__GSE, ConnectedAP.class, msgs);
-            msgs = basicSetParentConnectedAP(newParentConnectedAP, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentConnectedAP != null )
+                msgs = ( ( InternalEObject ) newParentConnectedAP ).eInverseAdd( this, SclPackage.CONNECTED_AP__GSE,
+                        ConnectedAP.class, msgs );
+            msgs = basicSetParentConnectedAP( newParentConnectedAP, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE__PARENT_CONNECTED_AP, newParentConnectedAP, newParentConnectedAP));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSE__PARENT_CONNECTED_AP,
+                    newParentConnectedAP, newParentConnectedAP ) );
     }
 
     /**
@@ -263,14 +280,18 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetMinTime(MinTime newMinTime, NotificationChain msgs) {
+    public NotificationChain basicSetMinTime( MinTime newMinTime, NotificationChain msgs ) {
         MinTime oldMinTime = minTime;
         minTime = newMinTime;
         boolean oldMinTimeESet = minTimeESet;
         minTimeESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.GSE__MIN_TIME, oldMinTime, newMinTime, !oldMinTimeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.GSE__MIN_TIME,
+                    oldMinTime, newMinTime, !oldMinTimeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -281,21 +302,24 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      * @generated
      */
     @Override
-    public void setMinTime(MinTime newMinTime) {
-        if (newMinTime != minTime) {
+    public void setMinTime( MinTime newMinTime ) {
+        if( newMinTime != minTime ) {
             NotificationChain msgs = null;
-            if (minTime != null)
-                msgs = ((InternalEObject)minTime).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.GSE__MIN_TIME, null, msgs);
-            if (newMinTime != null)
-                msgs = ((InternalEObject)newMinTime).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SclPackage.GSE__MIN_TIME, null, msgs);
-            msgs = basicSetMinTime(newMinTime, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( minTime != null )
+                msgs = ( ( InternalEObject ) minTime ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.GSE__MIN_TIME, null, msgs );
+            if( newMinTime != null )
+                msgs = ( ( InternalEObject ) newMinTime ).eInverseAdd( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.GSE__MIN_TIME, null, msgs );
+            msgs = basicSetMinTime( newMinTime, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldMinTimeESet = minTimeESet;
             minTimeESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE__MIN_TIME, newMinTime, newMinTime, !oldMinTimeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSE__MIN_TIME, newMinTime,
+                        newMinTime, !oldMinTimeESet ) );
         }
     }
 
@@ -304,14 +328,18 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetMinTime(NotificationChain msgs) {
+    public NotificationChain basicUnsetMinTime( NotificationChain msgs ) {
         MinTime oldMinTime = minTime;
         minTime = null;
         boolean oldMinTimeESet = minTimeESet;
         minTimeESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.GSE__MIN_TIME, oldMinTime, null, oldMinTimeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.GSE__MIN_TIME,
+                    oldMinTime, null, oldMinTimeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -323,17 +351,19 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      */
     @Override
     public void unsetMinTime() {
-        if (minTime != null) {
+        if( minTime != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)minTime).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.GSE__MIN_TIME, null, msgs);
-            msgs = basicUnsetMinTime(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) minTime ).eInverseRemove( this,
+                    EOPPOSITE_FEATURE_BASE - SclPackage.GSE__MIN_TIME, null, msgs );
+            msgs = basicUnsetMinTime( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldMinTimeESet = minTimeESet;
             minTimeESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GSE__MIN_TIME, null, null, oldMinTimeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.GSE__MIN_TIME, null, null,
+                        oldMinTimeESet ) );
         }
     }
 
@@ -354,13 +384,13 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GSE__PARENT_CONNECTED_AP:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentConnectedAP((ConnectedAP)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.GSE__PARENT_CONNECTED_AP:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentConnectedAP( ( ConnectedAP ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -370,15 +400,15 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GSE__MIN_TIME:
-                return basicUnsetMinTime(msgs);
-            case SclPackage.GSE__MAX_TIME:
-                return basicUnsetMaxTime(msgs);
-            case SclPackage.GSE__PARENT_CONNECTED_AP:
-                return basicSetParentConnectedAP(null, msgs);
+        switch( featureID ) {
+        case SclPackage.GSE__MIN_TIME:
+            return basicUnsetMinTime( msgs );
+        case SclPackage.GSE__MAX_TIME:
+            return basicUnsetMaxTime( msgs );
+        case SclPackage.GSE__PARENT_CONNECTED_AP:
+            return basicSetParentConnectedAP( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -388,11 +418,11 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.GSE__PARENT_CONNECTED_AP:
-                return eInternalContainer().eInverseRemove(this, SclPackage.CONNECTED_AP__GSE, ConnectedAP.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.GSE__PARENT_CONNECTED_AP:
+            return eInternalContainer().eInverseRemove( this, SclPackage.CONNECTED_AP__GSE, ConnectedAP.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -402,15 +432,15 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.GSE__MIN_TIME:
-                return getMinTime();
-            case SclPackage.GSE__MAX_TIME:
-                return getMaxTime();
-            case SclPackage.GSE__PARENT_CONNECTED_AP:
-                return getParentConnectedAP();
+        switch( featureID ) {
+        case SclPackage.GSE__MIN_TIME:
+            return getMinTime();
+        case SclPackage.GSE__MAX_TIME:
+            return getMaxTime();
+        case SclPackage.GSE__PARENT_CONNECTED_AP:
+            return getParentConnectedAP();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -420,18 +450,18 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.GSE__MIN_TIME:
-                setMinTime((MinTime)newValue);
-                return;
-            case SclPackage.GSE__MAX_TIME:
-                setMaxTime((MaxTime)newValue);
-                return;
-            case SclPackage.GSE__PARENT_CONNECTED_AP:
-                setParentConnectedAP((ConnectedAP)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.GSE__MIN_TIME:
+            setMinTime( ( MinTime ) newValue );
+            return;
+        case SclPackage.GSE__MAX_TIME:
+            setMaxTime( ( MaxTime ) newValue );
+            return;
+        case SclPackage.GSE__PARENT_CONNECTED_AP:
+            setParentConnectedAP( ( ConnectedAP ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -441,18 +471,18 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GSE__MIN_TIME:
-                unsetMinTime();
-                return;
-            case SclPackage.GSE__MAX_TIME:
-                unsetMaxTime();
-                return;
-            case SclPackage.GSE__PARENT_CONNECTED_AP:
-                setParentConnectedAP((ConnectedAP)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.GSE__MIN_TIME:
+            unsetMinTime();
+            return;
+        case SclPackage.GSE__MAX_TIME:
+            unsetMaxTime();
+            return;
+        case SclPackage.GSE__PARENT_CONNECTED_AP:
+            setParentConnectedAP( ( ConnectedAP ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -462,15 +492,15 @@ public class GSEImpl extends ControlBlockImpl implements GSE {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GSE__MIN_TIME:
-                return isSetMinTime();
-            case SclPackage.GSE__MAX_TIME:
-                return isSetMaxTime();
-            case SclPackage.GSE__PARENT_CONNECTED_AP:
-                return getParentConnectedAP() != null;
+        switch( featureID ) {
+        case SclPackage.GSE__MIN_TIME:
+            return isSetMinTime();
+        case SclPackage.GSE__MAX_TIME:
+            return isSetMaxTime();
+        case SclPackage.GSE__PARENT_CONNECTED_AP:
+            return getParentConnectedAP() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //GSEImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSESettingsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSESettingsImpl.java
index f544650..f4d0783 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSESettingsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSESettingsImpl.java
@@ -197,8 +197,9 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
         appID = newAppID == null ? APP_ID_EDEFAULT : newAppID;
         boolean oldAppIDESet = appIDESet;
         appIDESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE_SETTINGS__APP_ID, oldAppID, appID, !oldAppIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSE_SETTINGS__APP_ID, oldAppID, appID,
+                    !oldAppIDESet ) );
     }
 
     /**
@@ -212,8 +213,9 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
         boolean oldAppIDESet = appIDESet;
         appID = APP_ID_EDEFAULT;
         appIDESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GSE_SETTINGS__APP_ID, oldAppID, APP_ID_EDEFAULT, oldAppIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.GSE_SETTINGS__APP_ID, oldAppID,
+                    APP_ID_EDEFAULT, oldAppIDESet ) );
     }
 
     /**
@@ -247,8 +249,9 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
         dataLabel = newDataLabel == null ? DATA_LABEL_EDEFAULT : newDataLabel;
         boolean oldDataLabelESet = dataLabelESet;
         dataLabelESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE_SETTINGS__DATA_LABEL, oldDataLabel, dataLabel, !oldDataLabelESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSE_SETTINGS__DATA_LABEL, oldDataLabel,
+                    dataLabel, !oldDataLabelESet ) );
     }
 
     /**
@@ -262,8 +265,9 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
         boolean oldDataLabelESet = dataLabelESet;
         dataLabel = DATA_LABEL_EDEFAULT;
         dataLabelESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GSE_SETTINGS__DATA_LABEL, oldDataLabel, DATA_LABEL_EDEFAULT, oldDataLabelESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.GSE_SETTINGS__DATA_LABEL, oldDataLabel,
+                    DATA_LABEL_EDEFAULT, oldDataLabelESet ) );
     }
 
     /**
@@ -283,8 +287,8 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.GSE_SETTINGS__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GSE_SETTINGS__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -292,8 +296,9 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.GSE_SETTINGS__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.GSE_SETTINGS__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -303,20 +308,24 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.GSE_SETTINGS__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GSE_SETTINGS__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__GSE_SETTINGS, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__GSE_SETTINGS,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE_SETTINGS__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSE_SETTINGS__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -334,14 +343,18 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetMcSecurity(McSecurity newMcSecurity, NotificationChain msgs) {
+    public NotificationChain basicSetMcSecurity( McSecurity newMcSecurity, NotificationChain msgs ) {
         McSecurity oldMcSecurity = mcSecurity;
         mcSecurity = newMcSecurity;
         boolean oldMcSecurityESet = mcSecurityESet;
         mcSecurityESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.GSE_SETTINGS__MC_SECURITY, oldMcSecurity, newMcSecurity, !oldMcSecurityESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.GSE_SETTINGS__MC_SECURITY, oldMcSecurity, newMcSecurity, !oldMcSecurityESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -352,21 +365,24 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      * @generated
      */
     @Override
-    public void setMcSecurity(McSecurity newMcSecurity) {
-        if (newMcSecurity != mcSecurity) {
+    public void setMcSecurity( McSecurity newMcSecurity ) {
+        if( newMcSecurity != mcSecurity ) {
             NotificationChain msgs = null;
-            if (mcSecurity != null)
-                msgs = ((InternalEObject)mcSecurity).eInverseRemove(this, SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS, McSecurity.class, msgs);
-            if (newMcSecurity != null)
-                msgs = ((InternalEObject)newMcSecurity).eInverseAdd(this, SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS, McSecurity.class, msgs);
-            msgs = basicSetMcSecurity(newMcSecurity, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( mcSecurity != null )
+                msgs = ( ( InternalEObject ) mcSecurity ).eInverseRemove( this,
+                        SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS, McSecurity.class, msgs );
+            if( newMcSecurity != null )
+                msgs = ( ( InternalEObject ) newMcSecurity ).eInverseAdd( this,
+                        SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS, McSecurity.class, msgs );
+            msgs = basicSetMcSecurity( newMcSecurity, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldMcSecurityESet = mcSecurityESet;
             mcSecurityESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE_SETTINGS__MC_SECURITY, newMcSecurity, newMcSecurity, !oldMcSecurityESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSE_SETTINGS__MC_SECURITY,
+                        newMcSecurity, newMcSecurity, !oldMcSecurityESet ) );
         }
     }
 
@@ -375,14 +391,18 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetMcSecurity(NotificationChain msgs) {
+    public NotificationChain basicUnsetMcSecurity( NotificationChain msgs ) {
         McSecurity oldMcSecurity = mcSecurity;
         mcSecurity = null;
         boolean oldMcSecurityESet = mcSecurityESet;
         mcSecurityESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.GSE_SETTINGS__MC_SECURITY, oldMcSecurity, null, oldMcSecurityESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.GSE_SETTINGS__MC_SECURITY, oldMcSecurity, null, oldMcSecurityESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -394,17 +414,19 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      */
     @Override
     public void unsetMcSecurity() {
-        if (mcSecurity != null) {
+        if( mcSecurity != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)mcSecurity).eInverseRemove(this, SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS, McSecurity.class, msgs);
-            msgs = basicUnsetMcSecurity(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) mcSecurity ).eInverseRemove( this, SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS,
+                    McSecurity.class, msgs );
+            msgs = basicUnsetMcSecurity( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldMcSecurityESet = mcSecurityESet;
             mcSecurityESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GSE_SETTINGS__MC_SECURITY, null, null, oldMcSecurityESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.GSE_SETTINGS__MC_SECURITY, null,
+                        null, oldMcSecurityESet ) );
         }
     }
 
@@ -434,13 +456,14 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      * @generated
      */
     @Override
-    public void setKdaParticipant(Boolean newKdaParticipant) {
+    public void setKdaParticipant( Boolean newKdaParticipant ) {
         Boolean oldKdaParticipant = kdaParticipant;
         kdaParticipant = newKdaParticipant;
         boolean oldKdaParticipantESet = kdaParticipantESet;
         kdaParticipantESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSE_SETTINGS__KDA_PARTICIPANT, oldKdaParticipant, kdaParticipant, !oldKdaParticipantESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSE_SETTINGS__KDA_PARTICIPANT,
+                    oldKdaParticipant, kdaParticipant, !oldKdaParticipantESet ) );
     }
 
     /**
@@ -454,8 +477,9 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
         boolean oldKdaParticipantESet = kdaParticipantESet;
         kdaParticipant = KDA_PARTICIPANT_EDEFAULT;
         kdaParticipantESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GSE_SETTINGS__KDA_PARTICIPANT, oldKdaParticipant, KDA_PARTICIPANT_EDEFAULT, oldKdaParticipantESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.GSE_SETTINGS__KDA_PARTICIPANT,
+                    oldKdaParticipant, KDA_PARTICIPANT_EDEFAULT, oldKdaParticipantESet ) );
     }
 
     /**
@@ -475,17 +499,18 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GSE_SETTINGS__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
-            case SclPackage.GSE_SETTINGS__MC_SECURITY:
-                if (mcSecurity != null)
-                    msgs = ((InternalEObject)mcSecurity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.GSE_SETTINGS__MC_SECURITY, null, msgs);
-                return basicSetMcSecurity((McSecurity)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.GSE_SETTINGS__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
+        case SclPackage.GSE_SETTINGS__MC_SECURITY:
+            if( mcSecurity != null )
+                msgs = ( ( InternalEObject ) mcSecurity ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.GSE_SETTINGS__MC_SECURITY, null, msgs );
+            return basicSetMcSecurity( ( McSecurity ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -495,13 +520,13 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GSE_SETTINGS__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
-            case SclPackage.GSE_SETTINGS__MC_SECURITY:
-                return basicUnsetMcSecurity(msgs);
+        switch( featureID ) {
+        case SclPackage.GSE_SETTINGS__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
+        case SclPackage.GSE_SETTINGS__MC_SECURITY:
+            return basicUnsetMcSecurity( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -511,11 +536,11 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.GSE_SETTINGS__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__GSE_SETTINGS, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.GSE_SETTINGS__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__GSE_SETTINGS, Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -525,19 +550,19 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.GSE_SETTINGS__APP_ID:
-                return getAppID();
-            case SclPackage.GSE_SETTINGS__DATA_LABEL:
-                return getDataLabel();
-            case SclPackage.GSE_SETTINGS__PARENT_SERVICES:
-                return getParentServices();
-            case SclPackage.GSE_SETTINGS__MC_SECURITY:
-                return getMcSecurity();
-            case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
-                return getKdaParticipant();
+        switch( featureID ) {
+        case SclPackage.GSE_SETTINGS__APP_ID:
+            return getAppID();
+        case SclPackage.GSE_SETTINGS__DATA_LABEL:
+            return getDataLabel();
+        case SclPackage.GSE_SETTINGS__PARENT_SERVICES:
+            return getParentServices();
+        case SclPackage.GSE_SETTINGS__MC_SECURITY:
+            return getMcSecurity();
+        case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
+            return getKdaParticipant();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -547,24 +572,24 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.GSE_SETTINGS__APP_ID:
-                setAppID((ServiceSettingsEnum)newValue);
-                return;
-            case SclPackage.GSE_SETTINGS__DATA_LABEL:
-                setDataLabel((ServiceSettingsEnum)newValue);
-                return;
-            case SclPackage.GSE_SETTINGS__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
-            case SclPackage.GSE_SETTINGS__MC_SECURITY:
-                setMcSecurity((McSecurity)newValue);
-                return;
-            case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
-                setKdaParticipant((Boolean)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.GSE_SETTINGS__APP_ID:
+            setAppID( ( ServiceSettingsEnum ) newValue );
+            return;
+        case SclPackage.GSE_SETTINGS__DATA_LABEL:
+            setDataLabel( ( ServiceSettingsEnum ) newValue );
+            return;
+        case SclPackage.GSE_SETTINGS__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
+        case SclPackage.GSE_SETTINGS__MC_SECURITY:
+            setMcSecurity( ( McSecurity ) newValue );
+            return;
+        case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
+            setKdaParticipant( ( Boolean ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -574,24 +599,24 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GSE_SETTINGS__APP_ID:
-                unsetAppID();
-                return;
-            case SclPackage.GSE_SETTINGS__DATA_LABEL:
-                unsetDataLabel();
-                return;
-            case SclPackage.GSE_SETTINGS__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
-            case SclPackage.GSE_SETTINGS__MC_SECURITY:
-                unsetMcSecurity();
-                return;
-            case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
-                unsetKdaParticipant();
-                return;
+        switch( featureID ) {
+        case SclPackage.GSE_SETTINGS__APP_ID:
+            unsetAppID();
+            return;
+        case SclPackage.GSE_SETTINGS__DATA_LABEL:
+            unsetDataLabel();
+            return;
+        case SclPackage.GSE_SETTINGS__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
+        case SclPackage.GSE_SETTINGS__MC_SECURITY:
+            unsetMcSecurity();
+            return;
+        case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
+            unsetKdaParticipant();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -601,19 +626,19 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GSE_SETTINGS__APP_ID:
-                return isSetAppID();
-            case SclPackage.GSE_SETTINGS__DATA_LABEL:
-                return isSetDataLabel();
-            case SclPackage.GSE_SETTINGS__PARENT_SERVICES:
-                return getParentServices() != null;
-            case SclPackage.GSE_SETTINGS__MC_SECURITY:
-                return isSetMcSecurity();
-            case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
-                return isSetKdaParticipant();
+        switch( featureID ) {
+        case SclPackage.GSE_SETTINGS__APP_ID:
+            return isSetAppID();
+        case SclPackage.GSE_SETTINGS__DATA_LABEL:
+            return isSetDataLabel();
+        case SclPackage.GSE_SETTINGS__PARENT_SERVICES:
+            return getParentServices() != null;
+        case SclPackage.GSE_SETTINGS__MC_SECURITY:
+            return isSetMcSecurity();
+        case SclPackage.GSE_SETTINGS__KDA_PARTICIPANT:
+            return isSetKdaParticipant();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -623,16 +648,25 @@ public class GSESettingsImpl extends ServiceSettingsImpl implements GSESettings
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (appID: ");
-        if (appIDESet) result.append(appID); else result.append("<unset>");
-        result.append(", dataLabel: ");
-        if (dataLabelESet) result.append(dataLabel); else result.append("<unset>");
-        result.append(", kdaParticipant: ");
-        if (kdaParticipantESet) result.append(kdaParticipant); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (appID: " );
+        if( appIDESet )
+            result.append( appID );
+        else
+            result.append( "<unset>" );
+        result.append( ", dataLabel: " );
+        if( dataLabelESet )
+            result.append( dataLabel );
+        else
+            result.append( "<unset>" );
+        result.append( ", kdaParticipant: " );
+        if( kdaParticipantESet )
+            result.append( kdaParticipant );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSSEImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSSEImpl.java
index 0daf009..4c50d69 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSSEImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GSSEImpl.java
@@ -71,8 +71,8 @@ public class GSSEImpl extends ServiceWithMaxImpl implements GSSE {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.GSSE__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GSSE__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,8 @@ public class GSSEImpl extends ServiceWithMaxImpl implements GSSE {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.GSSE__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.GSSE__PARENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -91,20 +91,23 @@ public class GSSEImpl extends ServiceWithMaxImpl implements GSSE {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.GSSE__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GSSE__PARENT_SERVICES && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__GSSE, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__GSSE,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GSSE__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GSSE__PARENT_SERVICES, newParentServices,
+                    newParentServices ) );
     }
 
     /**
@@ -114,13 +117,13 @@ public class GSSEImpl extends ServiceWithMaxImpl implements GSSE {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GSSE__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.GSSE__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +133,11 @@ public class GSSEImpl extends ServiceWithMaxImpl implements GSSE {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GSSE__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.GSSE__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +147,11 @@ public class GSSEImpl extends ServiceWithMaxImpl implements GSSE {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.GSSE__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__GSSE, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.GSSE__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__GSSE, Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +161,11 @@ public class GSSEImpl extends ServiceWithMaxImpl implements GSSE {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.GSSE__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.GSSE__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +175,12 @@ public class GSSEImpl extends ServiceWithMaxImpl implements GSSE {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.GSSE__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.GSSE__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +190,12 @@ public class GSSEImpl extends ServiceWithMaxImpl implements GSSE {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GSSE__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.GSSE__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +205,11 @@ public class GSSEImpl extends ServiceWithMaxImpl implements GSSE {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GSSE__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.GSSE__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //GSSEImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GeneralEquipmentContainerImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GeneralEquipmentContainerImpl.java
index 977d9ea..ffc2448 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GeneralEquipmentContainerImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GeneralEquipmentContainerImpl.java
@@ -60,7 +60,7 @@ public class GeneralEquipmentContainerImpl extends PowerSystemResourceImpl imple
      * @generated
      * @ordered
      */
-    protected EList<Function> function;
+    protected EList< Function > function;
 
     /**
      * The cached value of the '{@link #getGeneralEquipment() <em>General Equipment</em>}' containment reference list.
@@ -70,7 +70,7 @@ public class GeneralEquipmentContainerImpl extends PowerSystemResourceImpl imple
      * @generated
      * @ordered
      */
-    protected EList<GeneralEquipment> generalEquipment;
+    protected EList< GeneralEquipment > generalEquipment;
 
     /**
      * <!-- begin-user-doc -->
@@ -97,9 +97,11 @@ public class GeneralEquipmentContainerImpl extends PowerSystemResourceImpl imple
      * @generated
      */
     @Override
-    public EList<Function> getFunction() {
-        if (function == null) {
-            function = new EObjectContainmentWithInverseEList.Unsettable<Function>(Function.class, this, SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION, SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER);
+    public EList< Function > getFunction() {
+        if( function == null ) {
+            function = new EObjectContainmentWithInverseEList.Unsettable< Function >( Function.class, this,
+                    SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION,
+                    SclPackage.FUNCTION__PARENT_GENERAL_EQUIPMENT_CONTAINER );
         }
         return function;
     }
@@ -111,7 +113,7 @@ public class GeneralEquipmentContainerImpl extends PowerSystemResourceImpl imple
      */
     @Override
     public void unsetFunction() {
-        if (function != null) ((InternalEList.Unsettable<?>)function).unset();
+        if( function != null ) ( ( InternalEList.Unsettable< ? > ) function ).unset();
     }
 
     /**
@@ -121,7 +123,7 @@ public class GeneralEquipmentContainerImpl extends PowerSystemResourceImpl imple
      */
     @Override
     public boolean isSetFunction() {
-        return function != null && ((InternalEList.Unsettable<?>)function).isSet();
+        return function != null && ( ( InternalEList.Unsettable< ? > ) function ).isSet();
     }
 
     /**
@@ -130,9 +132,11 @@ public class GeneralEquipmentContainerImpl extends PowerSystemResourceImpl imple
      * @generated
      */
     @Override
-    public EList<GeneralEquipment> getGeneralEquipment() {
-        if (generalEquipment == null) {
-            generalEquipment = new EObjectContainmentWithInverseEList.Unsettable<GeneralEquipment>(GeneralEquipment.class, this, SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT, SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER);
+    public EList< GeneralEquipment > getGeneralEquipment() {
+        if( generalEquipment == null ) {
+            generalEquipment = new EObjectContainmentWithInverseEList.Unsettable< GeneralEquipment >(
+                    GeneralEquipment.class, this, SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT,
+                    SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER );
         }
         return generalEquipment;
     }
@@ -144,7 +148,7 @@ public class GeneralEquipmentContainerImpl extends PowerSystemResourceImpl imple
      */
     @Override
     public void unsetGeneralEquipment() {
-        if (generalEquipment != null) ((InternalEList.Unsettable<?>)generalEquipment).unset();
+        if( generalEquipment != null ) ( ( InternalEList.Unsettable< ? > ) generalEquipment ).unset();
     }
 
     /**
@@ -154,7 +158,7 @@ public class GeneralEquipmentContainerImpl extends PowerSystemResourceImpl imple
      */
     @Override
     public boolean isSetGeneralEquipment() {
-        return generalEquipment != null && ((InternalEList.Unsettable<?>)generalEquipment).isSet();
+        return generalEquipment != null && ( ( InternalEList.Unsettable< ? > ) generalEquipment ).isSet();
     }
 
     /**
@@ -165,13 +169,15 @@ public class GeneralEquipmentContainerImpl extends PowerSystemResourceImpl imple
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getFunction()).basicAdd(otherEnd, msgs);
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getGeneralEquipment()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getFunction() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getGeneralEquipment() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -181,13 +187,13 @@ public class GeneralEquipmentContainerImpl extends PowerSystemResourceImpl imple
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION:
-                return ((InternalEList<?>)getFunction()).basicRemove(otherEnd, msgs);
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
-                return ((InternalEList<?>)getGeneralEquipment()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION:
+            return ( ( InternalEList< ? > ) getFunction() ).basicRemove( otherEnd, msgs );
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
+            return ( ( InternalEList< ? > ) getGeneralEquipment() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -197,13 +203,13 @@ public class GeneralEquipmentContainerImpl extends PowerSystemResourceImpl imple
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION:
-                return getFunction();
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
-                return getGeneralEquipment();
+        switch( featureID ) {
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION:
+            return getFunction();
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
+            return getGeneralEquipment();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -214,17 +220,17 @@ public class GeneralEquipmentContainerImpl extends PowerSystemResourceImpl imple
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION:
-                getFunction().clear();
-                getFunction().addAll((Collection<? extends Function>)newValue);
-                return;
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
-                getGeneralEquipment().clear();
-                getGeneralEquipment().addAll((Collection<? extends GeneralEquipment>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION:
+            getFunction().clear();
+            getFunction().addAll( ( Collection< ? extends Function > ) newValue );
+            return;
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
+            getGeneralEquipment().clear();
+            getGeneralEquipment().addAll( ( Collection< ? extends GeneralEquipment > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -234,15 +240,15 @@ public class GeneralEquipmentContainerImpl extends PowerSystemResourceImpl imple
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION:
-                unsetFunction();
-                return;
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
-                unsetGeneralEquipment();
-                return;
+        switch( featureID ) {
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION:
+            unsetFunction();
+            return;
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
+            unsetGeneralEquipment();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -252,13 +258,13 @@ public class GeneralEquipmentContainerImpl extends PowerSystemResourceImpl imple
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION:
-                return isSetFunction();
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
-                return isSetGeneralEquipment();
+        switch( featureID ) {
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER__FUNCTION:
+            return isSetFunction();
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT:
+            return isSetGeneralEquipment();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //GeneralEquipmentContainerImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GeneralEquipmentImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GeneralEquipmentImpl.java
index eef7bf2..df98d2a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GeneralEquipmentImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GeneralEquipmentImpl.java
@@ -97,7 +97,7 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      * @generated
      * @ordered
      */
-    protected EList<EqFunction> eqFunction;
+    protected EList< EqFunction > eqFunction;
 
     /**
      * <!-- begin-user-doc -->
@@ -139,8 +139,9 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GENERAL_EQUIPMENT__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GENERAL_EQUIPMENT__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -154,8 +155,9 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.GENERAL_EQUIPMENT__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.GENERAL_EQUIPMENT__TYPE, oldType,
+                    TYPE_EDEFAULT, oldTypeESet ) );
     }
 
     /**
@@ -175,8 +177,8 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      */
     @Override
     public AbstractEqFuncSubFunc getParentAbstractEqFuncSubFunc() {
-        if (eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC) return null;
-        return (AbstractEqFuncSubFunc)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC ) return null;
+        return ( AbstractEqFuncSubFunc ) eInternalContainer();
     }
 
     /**
@@ -184,8 +186,10 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAbstractEqFuncSubFunc(AbstractEqFuncSubFunc newParentAbstractEqFuncSubFunc, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAbstractEqFuncSubFunc, SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC, msgs);
+    public NotificationChain basicSetParentAbstractEqFuncSubFunc( AbstractEqFuncSubFunc newParentAbstractEqFuncSubFunc,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAbstractEqFuncSubFunc,
+                SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC, msgs );
         return msgs;
     }
 
@@ -195,20 +199,26 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      * @generated
      */
     @Override
-    public void setParentAbstractEqFuncSubFunc(AbstractEqFuncSubFunc newParentAbstractEqFuncSubFunc) {
-        if (newParentAbstractEqFuncSubFunc != eInternalContainer() || (eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC && newParentAbstractEqFuncSubFunc != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAbstractEqFuncSubFunc))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAbstractEqFuncSubFunc( AbstractEqFuncSubFunc newParentAbstractEqFuncSubFunc ) {
+        if( newParentAbstractEqFuncSubFunc != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC
+                        && newParentAbstractEqFuncSubFunc != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAbstractEqFuncSubFunc ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAbstractEqFuncSubFunc != null)
-                msgs = ((InternalEObject)newParentAbstractEqFuncSubFunc).eInverseAdd(this, SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT, AbstractEqFuncSubFunc.class, msgs);
-            msgs = basicSetParentAbstractEqFuncSubFunc(newParentAbstractEqFuncSubFunc, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAbstractEqFuncSubFunc != null )
+                msgs = ( ( InternalEObject ) newParentAbstractEqFuncSubFunc ).eInverseAdd( this,
+                        SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT, AbstractEqFuncSubFunc.class,
+                        msgs );
+            msgs = basicSetParentAbstractEqFuncSubFunc( newParentAbstractEqFuncSubFunc, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC, newParentAbstractEqFuncSubFunc, newParentAbstractEqFuncSubFunc));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET,
+                    SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC, newParentAbstractEqFuncSubFunc,
+                    newParentAbstractEqFuncSubFunc ) );
     }
 
     /**
@@ -217,9 +227,10 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      * @generated
      */
     @Override
-    public EList<EqFunction> getEqFunction() {
-        if (eqFunction == null) {
-            eqFunction = new EObjectContainmentWithInverseEList.Unsettable<EqFunction>(EqFunction.class, this, SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION, SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT);
+    public EList< EqFunction > getEqFunction() {
+        if( eqFunction == null ) {
+            eqFunction = new EObjectContainmentWithInverseEList.Unsettable< EqFunction >( EqFunction.class, this,
+                    SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION, SclPackage.EQ_FUNCTION__PARENT_GENERAL_EQUIPMENT );
         }
         return eqFunction;
     }
@@ -231,7 +242,7 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      */
     @Override
     public void unsetEqFunction() {
-        if (eqFunction != null) ((InternalEList.Unsettable<?>)eqFunction).unset();
+        if( eqFunction != null ) ( ( InternalEList.Unsettable< ? > ) eqFunction ).unset();
     }
 
     /**
@@ -241,7 +252,7 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      */
     @Override
     public boolean isSetEqFunction() {
-        return eqFunction != null && ((InternalEList.Unsettable<?>)eqFunction).isSet();
+        return eqFunction != null && ( ( InternalEList.Unsettable< ? > ) eqFunction ).isSet();
     }
 
     /**
@@ -251,8 +262,8 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      */
     @Override
     public EquipmentContainer getParentEquipmentContainer() {
-        if (eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER) return null;
-        return (EquipmentContainer)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER ) return null;
+        return ( EquipmentContainer ) eInternalContainer();
     }
 
     /**
@@ -260,8 +271,10 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentEquipmentContainer(EquipmentContainer newParentEquipmentContainer, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentEquipmentContainer, SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER, msgs);
+    public NotificationChain basicSetParentEquipmentContainer( EquipmentContainer newParentEquipmentContainer,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentEquipmentContainer,
+                SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER, msgs );
         return msgs;
     }
 
@@ -271,20 +284,25 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      * @generated
      */
     @Override
-    public void setParentEquipmentContainer(EquipmentContainer newParentEquipmentContainer) {
-        if (newParentEquipmentContainer != eInternalContainer() || (eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER && newParentEquipmentContainer != null)) {
-            if (EcoreUtil.isAncestor(this, newParentEquipmentContainer))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentEquipmentContainer( EquipmentContainer newParentEquipmentContainer ) {
+        if( newParentEquipmentContainer != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER
+                        && newParentEquipmentContainer != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentEquipmentContainer ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentEquipmentContainer != null)
-                msgs = ((InternalEObject)newParentEquipmentContainer).eInverseAdd(this, SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT, EquipmentContainer.class, msgs);
-            msgs = basicSetParentEquipmentContainer(newParentEquipmentContainer, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentEquipmentContainer != null )
+                msgs = ( ( InternalEObject ) newParentEquipmentContainer ).eInverseAdd( this,
+                        SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT, EquipmentContainer.class, msgs );
+            msgs = basicSetParentEquipmentContainer( newParentEquipmentContainer, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER, newParentEquipmentContainer, newParentEquipmentContainer));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET,
+                    SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER, newParentEquipmentContainer,
+                    newParentEquipmentContainer ) );
     }
 
     /**
@@ -294,8 +312,8 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      */
     @Override
     public Function getParentFunction() {
-        if (eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION) return null;
-        return (Function)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION ) return null;
+        return ( Function ) eInternalContainer();
     }
 
     /**
@@ -303,8 +321,9 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentFunction(Function newParentFunction, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentFunction, SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION, msgs);
+    public NotificationChain basicSetParentFunction( Function newParentFunction, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentFunction, SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION,
+                msgs );
         return msgs;
     }
 
@@ -314,20 +333,24 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      * @generated
      */
     @Override
-    public void setParentFunction(Function newParentFunction) {
-        if (newParentFunction != eInternalContainer() || (eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION && newParentFunction != null)) {
-            if (EcoreUtil.isAncestor(this, newParentFunction))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentFunction( Function newParentFunction ) {
+        if( newParentFunction != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION
+                        && newParentFunction != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentFunction ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentFunction != null)
-                msgs = ((InternalEObject)newParentFunction).eInverseAdd(this, SclPackage.FUNCTION__GENERAL_EQUIPMENT, Function.class, msgs);
-            msgs = basicSetParentFunction(newParentFunction, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentFunction != null )
+                msgs = ( ( InternalEObject ) newParentFunction ).eInverseAdd( this,
+                        SclPackage.FUNCTION__GENERAL_EQUIPMENT, Function.class, msgs );
+            msgs = basicSetParentFunction( newParentFunction, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION, newParentFunction, newParentFunction));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION,
+                    newParentFunction, newParentFunction ) );
     }
 
     /**
@@ -337,8 +360,8 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      */
     @Override
     public GeneralEquipmentContainer getParentGeneralEquipmentContainer() {
-        if (eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER) return null;
-        return (GeneralEquipmentContainer)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER ) return null;
+        return ( GeneralEquipmentContainer ) eInternalContainer();
     }
 
     /**
@@ -346,8 +369,10 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentGeneralEquipmentContainer(GeneralEquipmentContainer newParentGeneralEquipmentContainer, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentGeneralEquipmentContainer, SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER, msgs);
+    public NotificationChain basicSetParentGeneralEquipmentContainer(
+            GeneralEquipmentContainer newParentGeneralEquipmentContainer, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentGeneralEquipmentContainer,
+                SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER, msgs );
         return msgs;
     }
 
@@ -357,20 +382,26 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      * @generated
      */
     @Override
-    public void setParentGeneralEquipmentContainer(GeneralEquipmentContainer newParentGeneralEquipmentContainer) {
-        if (newParentGeneralEquipmentContainer != eInternalContainer() || (eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER && newParentGeneralEquipmentContainer != null)) {
-            if (EcoreUtil.isAncestor(this, newParentGeneralEquipmentContainer))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentGeneralEquipmentContainer( GeneralEquipmentContainer newParentGeneralEquipmentContainer ) {
+        if( newParentGeneralEquipmentContainer != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER
+                        && newParentGeneralEquipmentContainer != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentGeneralEquipmentContainer ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentGeneralEquipmentContainer != null)
-                msgs = ((InternalEObject)newParentGeneralEquipmentContainer).eInverseAdd(this, SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT, GeneralEquipmentContainer.class, msgs);
-            msgs = basicSetParentGeneralEquipmentContainer(newParentGeneralEquipmentContainer, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentGeneralEquipmentContainer != null )
+                msgs = ( ( InternalEObject ) newParentGeneralEquipmentContainer ).eInverseAdd( this,
+                        SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT, GeneralEquipmentContainer.class,
+                        msgs );
+            msgs = basicSetParentGeneralEquipmentContainer( newParentGeneralEquipmentContainer, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER, newParentGeneralEquipmentContainer, newParentGeneralEquipmentContainer));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET,
+                    SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER,
+                    newParentGeneralEquipmentContainer, newParentGeneralEquipmentContainer ) );
     }
 
     /**
@@ -380,8 +411,8 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      */
     @Override
     public SubFunction getParentSubFunction() {
-        if (eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION) return null;
-        return (SubFunction)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION ) return null;
+        return ( SubFunction ) eInternalContainer();
     }
 
     /**
@@ -389,8 +420,9 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSubFunction(SubFunction newParentSubFunction, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSubFunction, SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION, msgs);
+    public NotificationChain basicSetParentSubFunction( SubFunction newParentSubFunction, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSubFunction,
+                SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION, msgs );
         return msgs;
     }
 
@@ -400,20 +432,24 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      * @generated
      */
     @Override
-    public void setParentSubFunction(SubFunction newParentSubFunction) {
-        if (newParentSubFunction != eInternalContainer() || (eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION && newParentSubFunction != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSubFunction))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSubFunction( SubFunction newParentSubFunction ) {
+        if( newParentSubFunction != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION
+                        && newParentSubFunction != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSubFunction ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSubFunction != null)
-                msgs = ((InternalEObject)newParentSubFunction).eInverseAdd(this, SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT, SubFunction.class, msgs);
-            msgs = basicSetParentSubFunction(newParentSubFunction, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSubFunction != null )
+                msgs = ( ( InternalEObject ) newParentSubFunction ).eInverseAdd( this,
+                        SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT, SubFunction.class, msgs );
+            msgs = basicSetParentSubFunction( newParentSubFunction, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION, newParentSubFunction, newParentSubFunction));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION,
+                    newParentSubFunction, newParentSubFunction ) );
     }
 
     /**
@@ -424,31 +460,32 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAbstractEqFuncSubFunc((AbstractEqFuncSubFunc)otherEnd, msgs);
-            case SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getEqFunction()).basicAdd(otherEnd, msgs);
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentEquipmentContainer((EquipmentContainer)otherEnd, msgs);
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentFunction((Function)otherEnd, msgs);
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentGeneralEquipmentContainer((GeneralEquipmentContainer)otherEnd, msgs);
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSubFunction((SubFunction)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAbstractEqFuncSubFunc( ( AbstractEqFuncSubFunc ) otherEnd, msgs );
+        case SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getEqFunction() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentEquipmentContainer( ( EquipmentContainer ) otherEnd, msgs );
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentFunction( ( Function ) otherEnd, msgs );
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentGeneralEquipmentContainer( ( GeneralEquipmentContainer ) otherEnd, msgs );
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSubFunction( ( SubFunction ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -458,21 +495,21 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
-                return basicSetParentAbstractEqFuncSubFunc(null, msgs);
-            case SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION:
-                return ((InternalEList<?>)getEqFunction()).basicRemove(otherEnd, msgs);
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER:
-                return basicSetParentEquipmentContainer(null, msgs);
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION:
-                return basicSetParentFunction(null, msgs);
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER:
-                return basicSetParentGeneralEquipmentContainer(null, msgs);
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION:
-                return basicSetParentSubFunction(null, msgs);
+        switch( featureID ) {
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
+            return basicSetParentAbstractEqFuncSubFunc( null, msgs );
+        case SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION:
+            return ( ( InternalEList< ? > ) getEqFunction() ).basicRemove( otherEnd, msgs );
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER:
+            return basicSetParentEquipmentContainer( null, msgs );
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION:
+            return basicSetParentFunction( null, msgs );
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER:
+            return basicSetParentGeneralEquipmentContainer( null, msgs );
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION:
+            return basicSetParentSubFunction( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -482,19 +519,24 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT, AbstractEqFuncSubFunc.class, msgs);
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT, EquipmentContainer.class, msgs);
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION:
-                return eInternalContainer().eInverseRemove(this, SclPackage.FUNCTION__GENERAL_EQUIPMENT, Function.class, msgs);
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT, GeneralEquipmentContainer.class, msgs);
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT, SubFunction.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
+            return eInternalContainer().eInverseRemove( this,
+                    SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC__SUB_GENERAL_EQUIPMENT, AbstractEqFuncSubFunc.class, msgs );
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT,
+                    EquipmentContainer.class, msgs );
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION:
+            return eInternalContainer().eInverseRemove( this, SclPackage.FUNCTION__GENERAL_EQUIPMENT, Function.class,
+                    msgs );
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.GENERAL_EQUIPMENT_CONTAINER__GENERAL_EQUIPMENT,
+                    GeneralEquipmentContainer.class, msgs );
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT,
+                    SubFunction.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -504,23 +546,23 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.GENERAL_EQUIPMENT__TYPE:
-                return getType();
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
-                return getParentAbstractEqFuncSubFunc();
-            case SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION:
-                return getEqFunction();
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER:
-                return getParentEquipmentContainer();
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION:
-                return getParentFunction();
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER:
-                return getParentGeneralEquipmentContainer();
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION:
-                return getParentSubFunction();
+        switch( featureID ) {
+        case SclPackage.GENERAL_EQUIPMENT__TYPE:
+            return getType();
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
+            return getParentAbstractEqFuncSubFunc();
+        case SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION:
+            return getEqFunction();
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER:
+            return getParentEquipmentContainer();
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION:
+            return getParentFunction();
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER:
+            return getParentGeneralEquipmentContainer();
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION:
+            return getParentSubFunction();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -531,31 +573,31 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.GENERAL_EQUIPMENT__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
-                setParentAbstractEqFuncSubFunc((AbstractEqFuncSubFunc)newValue);
-                return;
-            case SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION:
-                getEqFunction().clear();
-                getEqFunction().addAll((Collection<? extends EqFunction>)newValue);
-                return;
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER:
-                setParentEquipmentContainer((EquipmentContainer)newValue);
-                return;
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION:
-                setParentFunction((Function)newValue);
-                return;
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER:
-                setParentGeneralEquipmentContainer((GeneralEquipmentContainer)newValue);
-                return;
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION:
-                setParentSubFunction((SubFunction)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.GENERAL_EQUIPMENT__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
+            setParentAbstractEqFuncSubFunc( ( AbstractEqFuncSubFunc ) newValue );
+            return;
+        case SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION:
+            getEqFunction().clear();
+            getEqFunction().addAll( ( Collection< ? extends EqFunction > ) newValue );
+            return;
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER:
+            setParentEquipmentContainer( ( EquipmentContainer ) newValue );
+            return;
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION:
+            setParentFunction( ( Function ) newValue );
+            return;
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER:
+            setParentGeneralEquipmentContainer( ( GeneralEquipmentContainer ) newValue );
+            return;
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION:
+            setParentSubFunction( ( SubFunction ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -565,30 +607,30 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GENERAL_EQUIPMENT__TYPE:
-                unsetType();
-                return;
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
-                setParentAbstractEqFuncSubFunc((AbstractEqFuncSubFunc)null);
-                return;
-            case SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION:
-                unsetEqFunction();
-                return;
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER:
-                setParentEquipmentContainer((EquipmentContainer)null);
-                return;
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION:
-                setParentFunction((Function)null);
-                return;
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER:
-                setParentGeneralEquipmentContainer((GeneralEquipmentContainer)null);
-                return;
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION:
-                setParentSubFunction((SubFunction)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.GENERAL_EQUIPMENT__TYPE:
+            unsetType();
+            return;
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
+            setParentAbstractEqFuncSubFunc( ( AbstractEqFuncSubFunc ) null );
+            return;
+        case SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION:
+            unsetEqFunction();
+            return;
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER:
+            setParentEquipmentContainer( ( EquipmentContainer ) null );
+            return;
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION:
+            setParentFunction( ( Function ) null );
+            return;
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER:
+            setParentGeneralEquipmentContainer( ( GeneralEquipmentContainer ) null );
+            return;
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION:
+            setParentSubFunction( ( SubFunction ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -598,23 +640,23 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GENERAL_EQUIPMENT__TYPE:
-                return isSetType();
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
-                return getParentAbstractEqFuncSubFunc() != null;
-            case SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION:
-                return isSetEqFunction();
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER:
-                return getParentEquipmentContainer() != null;
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION:
-                return getParentFunction() != null;
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER:
-                return getParentGeneralEquipmentContainer() != null;
-            case SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION:
-                return getParentSubFunction() != null;
+        switch( featureID ) {
+        case SclPackage.GENERAL_EQUIPMENT__TYPE:
+            return isSetType();
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_ABSTRACT_EQ_FUNC_SUB_FUNC:
+            return getParentAbstractEqFuncSubFunc() != null;
+        case SclPackage.GENERAL_EQUIPMENT__EQ_FUNCTION:
+            return isSetEqFunction();
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_EQUIPMENT_CONTAINER:
+            return getParentEquipmentContainer() != null;
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_FUNCTION:
+            return getParentFunction() != null;
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_GENERAL_EQUIPMENT_CONTAINER:
+            return getParentGeneralEquipmentContainer() != null;
+        case SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION:
+            return getParentSubFunction() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -624,12 +666,15 @@ public class GeneralEquipmentImpl extends EquipmentImpl implements GeneralEquipm
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetCBValuesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetCBValuesImpl.java
index b96fb0a..630a79c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetCBValuesImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetCBValuesImpl.java
@@ -71,8 +71,8 @@ public class GetCBValuesImpl extends ServiceYesNoImpl implements GetCBValues {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.GET_CB_VALUES__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GET_CB_VALUES__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class GetCBValuesImpl extends ServiceYesNoImpl implements GetCBValues {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.GET_CB_VALUES__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.GET_CB_VALUES__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class GetCBValuesImpl extends ServiceYesNoImpl implements GetCBValues {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.GET_CB_VALUES__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GET_CB_VALUES__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__GET_CB_VALUES, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__GET_CB_VALUES,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GET_CB_VALUES__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GET_CB_VALUES__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class GetCBValuesImpl extends ServiceYesNoImpl implements GetCBValues {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GET_CB_VALUES__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.GET_CB_VALUES__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class GetCBValuesImpl extends ServiceYesNoImpl implements GetCBValues {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GET_CB_VALUES__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.GET_CB_VALUES__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class GetCBValuesImpl extends ServiceYesNoImpl implements GetCBValues {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.GET_CB_VALUES__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__GET_CB_VALUES, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.GET_CB_VALUES__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__GET_CB_VALUES, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class GetCBValuesImpl extends ServiceYesNoImpl implements GetCBValues {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.GET_CB_VALUES__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.GET_CB_VALUES__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class GetCBValuesImpl extends ServiceYesNoImpl implements GetCBValues {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.GET_CB_VALUES__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.GET_CB_VALUES__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class GetCBValuesImpl extends ServiceYesNoImpl implements GetCBValues {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GET_CB_VALUES__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.GET_CB_VALUES__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class GetCBValuesImpl extends ServiceYesNoImpl implements GetCBValues {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GET_CB_VALUES__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.GET_CB_VALUES__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //GetCBValuesImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetDataObjectDefinitionImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetDataObjectDefinitionImpl.java
index 30a2113..31456da 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetDataObjectDefinitionImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetDataObjectDefinitionImpl.java
@@ -71,8 +71,8 @@ public class GetDataObjectDefinitionImpl extends ServiceYesNoImpl implements Get
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class GetDataObjectDefinitionImpl extends ServiceYesNoImpl implements Get
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices,
+                SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class GetDataObjectDefinitionImpl extends ServiceYesNoImpl implements Get
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this,
+                        SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION, Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET,
+                    SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES, newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class GetDataObjectDefinitionImpl extends ServiceYesNoImpl implements Get
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class GetDataObjectDefinitionImpl extends ServiceYesNoImpl implements Get
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class GetDataObjectDefinitionImpl extends ServiceYesNoImpl implements Get
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION,
+                    Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class GetDataObjectDefinitionImpl extends ServiceYesNoImpl implements Get
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class GetDataObjectDefinitionImpl extends ServiceYesNoImpl implements Get
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class GetDataObjectDefinitionImpl extends ServiceYesNoImpl implements Get
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class GetDataObjectDefinitionImpl extends ServiceYesNoImpl implements Get
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //GetDataObjectDefinitionImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetDataSetValueImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetDataSetValueImpl.java
index 1f96e31..43b839f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetDataSetValueImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetDataSetValueImpl.java
@@ -71,8 +71,8 @@ public class GetDataSetValueImpl extends ServiceYesNoImpl implements GetDataSetV
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class GetDataSetValueImpl extends ServiceYesNoImpl implements GetDataSetV
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices,
+                SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class GetDataSetValueImpl extends ServiceYesNoImpl implements GetDataSetV
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__GET_DATA_SET_VALUE, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this,
+                        SclPackage.SERVICES__GET_DATA_SET_VALUE, Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class GetDataSetValueImpl extends ServiceYesNoImpl implements GetDataSetV
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class GetDataSetValueImpl extends ServiceYesNoImpl implements GetDataSetV
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class GetDataSetValueImpl extends ServiceYesNoImpl implements GetDataSetV
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__GET_DATA_SET_VALUE, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__GET_DATA_SET_VALUE, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class GetDataSetValueImpl extends ServiceYesNoImpl implements GetDataSetV
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class GetDataSetValueImpl extends ServiceYesNoImpl implements GetDataSetV
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class GetDataSetValueImpl extends ServiceYesNoImpl implements GetDataSetV
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class GetDataSetValueImpl extends ServiceYesNoImpl implements GetDataSetV
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //GetDataSetValueImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetDirectoryImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetDirectoryImpl.java
index fbd5b67..4581a5e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetDirectoryImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/GetDirectoryImpl.java
@@ -71,8 +71,8 @@ public class GetDirectoryImpl extends ServiceYesNoImpl implements GetDirectory {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.GET_DIRECTORY__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.GET_DIRECTORY__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class GetDirectoryImpl extends ServiceYesNoImpl implements GetDirectory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.GET_DIRECTORY__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.GET_DIRECTORY__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class GetDirectoryImpl extends ServiceYesNoImpl implements GetDirectory {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.GET_DIRECTORY__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.GET_DIRECTORY__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__GET_DIRECTORY, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__GET_DIRECTORY,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.GET_DIRECTORY__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.GET_DIRECTORY__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class GetDirectoryImpl extends ServiceYesNoImpl implements GetDirectory {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GET_DIRECTORY__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.GET_DIRECTORY__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class GetDirectoryImpl extends ServiceYesNoImpl implements GetDirectory {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.GET_DIRECTORY__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.GET_DIRECTORY__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class GetDirectoryImpl extends ServiceYesNoImpl implements GetDirectory {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.GET_DIRECTORY__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__GET_DIRECTORY, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.GET_DIRECTORY__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__GET_DIRECTORY, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class GetDirectoryImpl extends ServiceYesNoImpl implements GetDirectory {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.GET_DIRECTORY__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.GET_DIRECTORY__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class GetDirectoryImpl extends ServiceYesNoImpl implements GetDirectory {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.GET_DIRECTORY__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.GET_DIRECTORY__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class GetDirectoryImpl extends ServiceYesNoImpl implements GetDirectory {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GET_DIRECTORY__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.GET_DIRECTORY__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class GetDirectoryImpl extends ServiceYesNoImpl implements GetDirectory {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.GET_DIRECTORY__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.GET_DIRECTORY__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //GetDirectoryImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/HeaderImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/HeaderImpl.java
index c142994..1430a71 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/HeaderImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/HeaderImpl.java
@@ -277,8 +277,8 @@ public class HeaderImpl extends SclObjectImpl implements Header {
         id = newId;
         boolean oldIdESet = idESet;
         idESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HEADER__ID, oldId, id, !oldIdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HEADER__ID, oldId, id, !oldIdESet ) );
     }
 
     /**
@@ -292,8 +292,9 @@ public class HeaderImpl extends SclObjectImpl implements Header {
         boolean oldIdESet = idESet;
         id = ID_EDEFAULT;
         idESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.HEADER__ID, oldId, ID_EDEFAULT, oldIdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.HEADER__ID, oldId, ID_EDEFAULT,
+                    oldIdESet ) );
     }
 
     /**
@@ -327,8 +328,9 @@ public class HeaderImpl extends SclObjectImpl implements Header {
         nameStructure = newNameStructure;
         boolean oldNameStructureESet = nameStructureESet;
         nameStructureESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HEADER__NAME_STRUCTURE, oldNameStructure, nameStructure, !oldNameStructureESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HEADER__NAME_STRUCTURE, oldNameStructure,
+                    nameStructure, !oldNameStructureESet ) );
     }
 
     /**
@@ -342,8 +344,9 @@ public class HeaderImpl extends SclObjectImpl implements Header {
         boolean oldNameStructureESet = nameStructureESet;
         nameStructure = NAME_STRUCTURE_EDEFAULT;
         nameStructureESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.HEADER__NAME_STRUCTURE, oldNameStructure, NAME_STRUCTURE_EDEFAULT, oldNameStructureESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.HEADER__NAME_STRUCTURE,
+                    oldNameStructure, NAME_STRUCTURE_EDEFAULT, oldNameStructureESet ) );
     }
 
     /**
@@ -377,8 +380,9 @@ public class HeaderImpl extends SclObjectImpl implements Header {
         revision = newRevision;
         boolean oldRevisionESet = revisionESet;
         revisionESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HEADER__REVISION, oldRevision, revision, !oldRevisionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HEADER__REVISION, oldRevision, revision,
+                    !oldRevisionESet ) );
     }
 
     /**
@@ -392,8 +396,9 @@ public class HeaderImpl extends SclObjectImpl implements Header {
         boolean oldRevisionESet = revisionESet;
         revision = REVISION_EDEFAULT;
         revisionESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.HEADER__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.HEADER__REVISION, oldRevision,
+                    REVISION_EDEFAULT, oldRevisionESet ) );
     }
 
     /**
@@ -427,8 +432,9 @@ public class HeaderImpl extends SclObjectImpl implements Header {
         toolID = newToolID;
         boolean oldToolIDESet = toolIDESet;
         toolIDESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HEADER__TOOL_ID, oldToolID, toolID, !oldToolIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HEADER__TOOL_ID, oldToolID, toolID,
+                    !oldToolIDESet ) );
     }
 
     /**
@@ -442,8 +448,9 @@ public class HeaderImpl extends SclObjectImpl implements Header {
         boolean oldToolIDESet = toolIDESet;
         toolID = TOOL_ID_EDEFAULT;
         toolIDESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.HEADER__TOOL_ID, oldToolID, TOOL_ID_EDEFAULT, oldToolIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.HEADER__TOOL_ID, oldToolID,
+                    TOOL_ID_EDEFAULT, oldToolIDESet ) );
     }
 
     /**
@@ -477,8 +484,9 @@ public class HeaderImpl extends SclObjectImpl implements Header {
         version = newVersion;
         boolean oldVersionESet = versionESet;
         versionESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HEADER__VERSION, oldVersion, version, !oldVersionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HEADER__VERSION, oldVersion, version,
+                    !oldVersionESet ) );
     }
 
     /**
@@ -492,8 +500,9 @@ public class HeaderImpl extends SclObjectImpl implements Header {
         boolean oldVersionESet = versionESet;
         version = VERSION_EDEFAULT;
         versionESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.HEADER__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.HEADER__VERSION, oldVersion,
+                    VERSION_EDEFAULT, oldVersionESet ) );
     }
 
     /**
@@ -513,8 +522,8 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      */
     @Override
     public SCL getParentSCL() {
-        if (eContainerFeatureID() != SclPackage.HEADER__PARENT_SCL) return null;
-        return (SCL)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.HEADER__PARENT_SCL ) return null;
+        return ( SCL ) eInternalContainer();
     }
 
     /**
@@ -522,8 +531,8 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSCL(SCL newParentSCL, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSCL, SclPackage.HEADER__PARENT_SCL, msgs);
+    public NotificationChain basicSetParentSCL( SCL newParentSCL, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSCL, SclPackage.HEADER__PARENT_SCL, msgs );
         return msgs;
     }
 
@@ -533,20 +542,23 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      * @generated
      */
     @Override
-    public void setParentSCL(SCL newParentSCL) {
-        if (newParentSCL != eInternalContainer() || (eContainerFeatureID() != SclPackage.HEADER__PARENT_SCL && newParentSCL != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSCL))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSCL( SCL newParentSCL ) {
+        if( newParentSCL != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.HEADER__PARENT_SCL && newParentSCL != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSCL ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSCL != null)
-                msgs = ((InternalEObject)newParentSCL).eInverseAdd(this, SclPackage.SCL__HEADER, SCL.class, msgs);
-            msgs = basicSetParentSCL(newParentSCL, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSCL != null )
+                msgs = ( ( InternalEObject ) newParentSCL ).eInverseAdd( this, SclPackage.SCL__HEADER, SCL.class,
+                        msgs );
+            msgs = basicSetParentSCL( newParentSCL, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HEADER__PARENT_SCL, newParentSCL, newParentSCL));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HEADER__PARENT_SCL, newParentSCL,
+                    newParentSCL ) );
     }
 
     /**
@@ -569,9 +581,13 @@ public class HeaderImpl extends SclObjectImpl implements Header {
         text = newText;
         boolean oldTextESet = textESet;
         textESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.HEADER__TEXT, oldText, newText, !oldTextESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.HEADER__TEXT,
+                    oldText, newText, !oldTextESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -583,20 +599,23 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      */
     @Override
     public void setText( Text newText ) {
-        if (newText != text) {
+        if( newText != text ) {
             NotificationChain msgs = null;
-            if (text != null)
-                msgs = ((InternalEObject)text).eInverseRemove(this, SclPackage.TEXT__PARENT_HEADER, Text.class, msgs);
-            if (newText != null)
-                msgs = ((InternalEObject)newText).eInverseAdd(this, SclPackage.TEXT__PARENT_HEADER, Text.class, msgs);
-            msgs = basicSetText(newText, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( text != null )
+                msgs = ( ( InternalEObject ) text ).eInverseRemove( this, SclPackage.TEXT__PARENT_HEADER, Text.class,
+                        msgs );
+            if( newText != null )
+                msgs = ( ( InternalEObject ) newText ).eInverseAdd( this, SclPackage.TEXT__PARENT_HEADER, Text.class,
+                        msgs );
+            msgs = basicSetText( newText, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldTextESet = textESet;
             textESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HEADER__TEXT, newText, newText, !oldTextESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HEADER__TEXT, newText, newText,
+                        !oldTextESet ) );
         }
     }
 
@@ -610,9 +629,13 @@ public class HeaderImpl extends SclObjectImpl implements Header {
         text = null;
         boolean oldTextESet = textESet;
         textESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.HEADER__TEXT, oldText, null, oldTextESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.HEADER__TEXT,
+                    oldText, null, oldTextESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -624,17 +647,19 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      */
     @Override
     public void unsetText() {
-        if (text != null) {
+        if( text != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)text).eInverseRemove(this, SclPackage.TEXT__PARENT_HEADER, Text.class, msgs);
-            msgs = basicUnsetText(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) text ).eInverseRemove( this, SclPackage.TEXT__PARENT_HEADER, Text.class,
+                    msgs );
+            msgs = basicUnsetText( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldTextESet = textESet;
             textESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.HEADER__TEXT, null, null, oldTextESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.HEADER__TEXT, null, null,
+                        oldTextESet ) );
         }
     }
 
@@ -668,9 +693,13 @@ public class HeaderImpl extends SclObjectImpl implements Header {
         history = newHistory;
         boolean oldHistoryESet = historyESet;
         historyESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.HEADER__HISTORY, oldHistory, newHistory, !oldHistoryESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.HEADER__HISTORY,
+                    oldHistory, newHistory, !oldHistoryESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -682,20 +711,23 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      */
     @Override
     public void setHistory( History newHistory ) {
-        if (newHistory != history) {
+        if( newHistory != history ) {
             NotificationChain msgs = null;
-            if (history != null)
-                msgs = ((InternalEObject)history).eInverseRemove(this, SclPackage.HISTORY__PARENT_HEADER, History.class, msgs);
-            if (newHistory != null)
-                msgs = ((InternalEObject)newHistory).eInverseAdd(this, SclPackage.HISTORY__PARENT_HEADER, History.class, msgs);
-            msgs = basicSetHistory(newHistory, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( history != null )
+                msgs = ( ( InternalEObject ) history ).eInverseRemove( this, SclPackage.HISTORY__PARENT_HEADER,
+                        History.class, msgs );
+            if( newHistory != null )
+                msgs = ( ( InternalEObject ) newHistory ).eInverseAdd( this, SclPackage.HISTORY__PARENT_HEADER,
+                        History.class, msgs );
+            msgs = basicSetHistory( newHistory, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldHistoryESet = historyESet;
             historyESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HEADER__HISTORY, newHistory, newHistory, !oldHistoryESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HEADER__HISTORY, newHistory,
+                        newHistory, !oldHistoryESet ) );
         }
     }
 
@@ -709,9 +741,13 @@ public class HeaderImpl extends SclObjectImpl implements Header {
         history = null;
         boolean oldHistoryESet = historyESet;
         historyESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.HEADER__HISTORY, oldHistory, null, oldHistoryESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.HEADER__HISTORY, oldHistory, null, oldHistoryESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -723,17 +759,19 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      */
     @Override
     public void unsetHistory() {
-        if (history != null) {
+        if( history != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)history).eInverseRemove(this, SclPackage.HISTORY__PARENT_HEADER, History.class, msgs);
-            msgs = basicUnsetHistory(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) history ).eInverseRemove( this, SclPackage.HISTORY__PARENT_HEADER,
+                    History.class, msgs );
+            msgs = basicUnsetHistory( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldHistoryESet = historyESet;
             historyESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.HEADER__HISTORY, null, null, oldHistoryESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.HEADER__HISTORY, null, null,
+                        oldHistoryESet ) );
         }
     }
 
@@ -754,21 +792,23 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.HEADER__PARENT_SCL:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSCL((SCL)otherEnd, msgs);
-            case SclPackage.HEADER__TEXT:
-                if (text != null)
-                    msgs = ((InternalEObject)text).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.HEADER__TEXT, null, msgs);
-                return basicSetText((Text)otherEnd, msgs);
-            case SclPackage.HEADER__HISTORY:
-                if (history != null)
-                    msgs = ((InternalEObject)history).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.HEADER__HISTORY, null, msgs);
-                return basicSetHistory((History)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.HEADER__PARENT_SCL:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSCL( ( SCL ) otherEnd, msgs );
+        case SclPackage.HEADER__TEXT:
+            if( text != null )
+                msgs = ( ( InternalEObject ) text ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.HEADER__TEXT, null, msgs );
+            return basicSetText( ( Text ) otherEnd, msgs );
+        case SclPackage.HEADER__HISTORY:
+            if( history != null )
+                msgs = ( ( InternalEObject ) history ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.HEADER__HISTORY, null, msgs );
+            return basicSetHistory( ( History ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -778,15 +818,15 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.HEADER__PARENT_SCL:
-                return basicSetParentSCL(null, msgs);
-            case SclPackage.HEADER__TEXT:
-                return basicUnsetText(msgs);
-            case SclPackage.HEADER__HISTORY:
-                return basicUnsetHistory(msgs);
+        switch( featureID ) {
+        case SclPackage.HEADER__PARENT_SCL:
+            return basicSetParentSCL( null, msgs );
+        case SclPackage.HEADER__TEXT:
+            return basicUnsetText( msgs );
+        case SclPackage.HEADER__HISTORY:
+            return basicUnsetHistory( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -796,11 +836,11 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.HEADER__PARENT_SCL:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SCL__HEADER, SCL.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.HEADER__PARENT_SCL:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SCL__HEADER, SCL.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -810,25 +850,25 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.HEADER__ID:
-                return getId();
-            case SclPackage.HEADER__NAME_STRUCTURE:
-                return getNameStructure();
-            case SclPackage.HEADER__REVISION:
-                return getRevision();
-            case SclPackage.HEADER__TOOL_ID:
-                return getToolID();
-            case SclPackage.HEADER__VERSION:
-                return getVersion();
-            case SclPackage.HEADER__PARENT_SCL:
-                return getParentSCL();
-            case SclPackage.HEADER__TEXT:
-                return getText();
-            case SclPackage.HEADER__HISTORY:
-                return getHistory();
+        switch( featureID ) {
+        case SclPackage.HEADER__ID:
+            return getId();
+        case SclPackage.HEADER__NAME_STRUCTURE:
+            return getNameStructure();
+        case SclPackage.HEADER__REVISION:
+            return getRevision();
+        case SclPackage.HEADER__TOOL_ID:
+            return getToolID();
+        case SclPackage.HEADER__VERSION:
+            return getVersion();
+        case SclPackage.HEADER__PARENT_SCL:
+            return getParentSCL();
+        case SclPackage.HEADER__TEXT:
+            return getText();
+        case SclPackage.HEADER__HISTORY:
+            return getHistory();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -838,33 +878,33 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.HEADER__ID:
-                setId((String)newValue);
-                return;
-            case SclPackage.HEADER__NAME_STRUCTURE:
-                setNameStructure((String)newValue);
-                return;
-            case SclPackage.HEADER__REVISION:
-                setRevision((String)newValue);
-                return;
-            case SclPackage.HEADER__TOOL_ID:
-                setToolID((String)newValue);
-                return;
-            case SclPackage.HEADER__VERSION:
-                setVersion((String)newValue);
-                return;
-            case SclPackage.HEADER__PARENT_SCL:
-                setParentSCL((SCL)newValue);
-                return;
-            case SclPackage.HEADER__TEXT:
-                setText((Text)newValue);
-                return;
-            case SclPackage.HEADER__HISTORY:
-                setHistory((History)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.HEADER__ID:
+            setId( ( String ) newValue );
+            return;
+        case SclPackage.HEADER__NAME_STRUCTURE:
+            setNameStructure( ( String ) newValue );
+            return;
+        case SclPackage.HEADER__REVISION:
+            setRevision( ( String ) newValue );
+            return;
+        case SclPackage.HEADER__TOOL_ID:
+            setToolID( ( String ) newValue );
+            return;
+        case SclPackage.HEADER__VERSION:
+            setVersion( ( String ) newValue );
+            return;
+        case SclPackage.HEADER__PARENT_SCL:
+            setParentSCL( ( SCL ) newValue );
+            return;
+        case SclPackage.HEADER__TEXT:
+            setText( ( Text ) newValue );
+            return;
+        case SclPackage.HEADER__HISTORY:
+            setHistory( ( History ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -874,33 +914,33 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.HEADER__ID:
-                unsetId();
-                return;
-            case SclPackage.HEADER__NAME_STRUCTURE:
-                unsetNameStructure();
-                return;
-            case SclPackage.HEADER__REVISION:
-                unsetRevision();
-                return;
-            case SclPackage.HEADER__TOOL_ID:
-                unsetToolID();
-                return;
-            case SclPackage.HEADER__VERSION:
-                unsetVersion();
-                return;
-            case SclPackage.HEADER__PARENT_SCL:
-                setParentSCL((SCL)null);
-                return;
-            case SclPackage.HEADER__TEXT:
-                unsetText();
-                return;
-            case SclPackage.HEADER__HISTORY:
-                unsetHistory();
-                return;
+        switch( featureID ) {
+        case SclPackage.HEADER__ID:
+            unsetId();
+            return;
+        case SclPackage.HEADER__NAME_STRUCTURE:
+            unsetNameStructure();
+            return;
+        case SclPackage.HEADER__REVISION:
+            unsetRevision();
+            return;
+        case SclPackage.HEADER__TOOL_ID:
+            unsetToolID();
+            return;
+        case SclPackage.HEADER__VERSION:
+            unsetVersion();
+            return;
+        case SclPackage.HEADER__PARENT_SCL:
+            setParentSCL( ( SCL ) null );
+            return;
+        case SclPackage.HEADER__TEXT:
+            unsetText();
+            return;
+        case SclPackage.HEADER__HISTORY:
+            unsetHistory();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -910,25 +950,25 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.HEADER__ID:
-                return isSetId();
-            case SclPackage.HEADER__NAME_STRUCTURE:
-                return isSetNameStructure();
-            case SclPackage.HEADER__REVISION:
-                return isSetRevision();
-            case SclPackage.HEADER__TOOL_ID:
-                return isSetToolID();
-            case SclPackage.HEADER__VERSION:
-                return isSetVersion();
-            case SclPackage.HEADER__PARENT_SCL:
-                return getParentSCL() != null;
-            case SclPackage.HEADER__TEXT:
-                return isSetText();
-            case SclPackage.HEADER__HISTORY:
-                return isSetHistory();
+        switch( featureID ) {
+        case SclPackage.HEADER__ID:
+            return isSetId();
+        case SclPackage.HEADER__NAME_STRUCTURE:
+            return isSetNameStructure();
+        case SclPackage.HEADER__REVISION:
+            return isSetRevision();
+        case SclPackage.HEADER__TOOL_ID:
+            return isSetToolID();
+        case SclPackage.HEADER__VERSION:
+            return isSetVersion();
+        case SclPackage.HEADER__PARENT_SCL:
+            return getParentSCL() != null;
+        case SclPackage.HEADER__TEXT:
+            return isSetText();
+        case SclPackage.HEADER__HISTORY:
+            return isSetHistory();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -938,20 +978,35 @@ public class HeaderImpl extends SclObjectImpl implements Header {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (id: ");
-        if (idESet) result.append(id); else result.append("<unset>");
-        result.append(", nameStructure: ");
-        if (nameStructureESet) result.append(nameStructure); else result.append("<unset>");
-        result.append(", revision: ");
-        if (revisionESet) result.append(revision); else result.append("<unset>");
-        result.append(", toolID: ");
-        if (toolIDESet) result.append(toolID); else result.append("<unset>");
-        result.append(", version: ");
-        if (versionESet) result.append(version); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (id: " );
+        if( idESet )
+            result.append( id );
+        else
+            result.append( "<unset>" );
+        result.append( ", nameStructure: " );
+        if( nameStructureESet )
+            result.append( nameStructure );
+        else
+            result.append( "<unset>" );
+        result.append( ", revision: " );
+        if( revisionESet )
+            result.append( revision );
+        else
+            result.append( "<unset>" );
+        result.append( ", toolID: " );
+        if( toolIDESet )
+            result.append( toolID );
+        else
+            result.append( "<unset>" );
+        result.append( ", version: " );
+        if( versionESet )
+            result.append( version );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/HistoryImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/HistoryImpl.java
index d263028..2199c49 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/HistoryImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/HistoryImpl.java
@@ -59,7 +59,7 @@ public class HistoryImpl extends SclObjectImpl implements History {
      * @generated
      * @ordered
      */
-    protected EList<Hitem> hitem;
+    protected EList< Hitem > hitem;
 
     /**
      * <!-- begin-user-doc -->
@@ -87,8 +87,8 @@ public class HistoryImpl extends SclObjectImpl implements History {
      */
     @Override
     public Header getParentHeader() {
-        if (eContainerFeatureID() != SclPackage.HISTORY__PARENT_HEADER) return null;
-        return (Header)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.HISTORY__PARENT_HEADER ) return null;
+        return ( Header ) eInternalContainer();
     }
 
     /**
@@ -96,8 +96,8 @@ public class HistoryImpl extends SclObjectImpl implements History {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentHeader(Header newParentHeader, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentHeader, SclPackage.HISTORY__PARENT_HEADER, msgs);
+    public NotificationChain basicSetParentHeader( Header newParentHeader, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentHeader, SclPackage.HISTORY__PARENT_HEADER, msgs );
         return msgs;
     }
 
@@ -107,20 +107,23 @@ public class HistoryImpl extends SclObjectImpl implements History {
      * @generated
      */
     @Override
-    public void setParentHeader(Header newParentHeader) {
-        if (newParentHeader != eInternalContainer() || (eContainerFeatureID() != SclPackage.HISTORY__PARENT_HEADER && newParentHeader != null)) {
-            if (EcoreUtil.isAncestor(this, newParentHeader))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentHeader( Header newParentHeader ) {
+        if( newParentHeader != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.HISTORY__PARENT_HEADER && newParentHeader != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentHeader ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentHeader != null)
-                msgs = ((InternalEObject)newParentHeader).eInverseAdd(this, SclPackage.HEADER__HISTORY, Header.class, msgs);
-            msgs = basicSetParentHeader(newParentHeader, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentHeader != null )
+                msgs = ( ( InternalEObject ) newParentHeader ).eInverseAdd( this, SclPackage.HEADER__HISTORY,
+                        Header.class, msgs );
+            msgs = basicSetParentHeader( newParentHeader, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HISTORY__PARENT_HEADER, newParentHeader, newParentHeader));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HISTORY__PARENT_HEADER, newParentHeader,
+                    newParentHeader ) );
     }
 
     /**
@@ -129,9 +132,10 @@ public class HistoryImpl extends SclObjectImpl implements History {
      * @generated
      */
     @Override
-    public EList<Hitem> getHitem() {
-        if (hitem == null) {
-            hitem = new EObjectContainmentWithInverseEList.Unsettable<Hitem>(Hitem.class, this, SclPackage.HISTORY__HITEM, SclPackage.HITEM__PARENT_HISTORY);
+    public EList< Hitem > getHitem() {
+        if( hitem == null ) {
+            hitem = new EObjectContainmentWithInverseEList.Unsettable< Hitem >( Hitem.class, this,
+                    SclPackage.HISTORY__HITEM, SclPackage.HITEM__PARENT_HISTORY );
         }
         return hitem;
     }
@@ -143,7 +147,7 @@ public class HistoryImpl extends SclObjectImpl implements History {
      */
     @Override
     public void unsetHitem() {
-        if (hitem != null) ((InternalEList.Unsettable<?>)hitem).unset();
+        if( hitem != null ) ( ( InternalEList.Unsettable< ? > ) hitem ).unset();
     }
 
     /**
@@ -153,7 +157,7 @@ public class HistoryImpl extends SclObjectImpl implements History {
      */
     @Override
     public boolean isSetHitem() {
-        return hitem != null && ((InternalEList.Unsettable<?>)hitem).isSet();
+        return hitem != null && ( ( InternalEList.Unsettable< ? > ) hitem ).isSet();
     }
 
     /**
@@ -164,15 +168,16 @@ public class HistoryImpl extends SclObjectImpl implements History {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.HISTORY__PARENT_HEADER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentHeader((Header)otherEnd, msgs);
-            case SclPackage.HISTORY__HITEM:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getHitem()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.HISTORY__PARENT_HEADER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentHeader( ( Header ) otherEnd, msgs );
+        case SclPackage.HISTORY__HITEM:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getHitem() ).basicAdd( otherEnd,
+                    msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -182,13 +187,13 @@ public class HistoryImpl extends SclObjectImpl implements History {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.HISTORY__PARENT_HEADER:
-                return basicSetParentHeader(null, msgs);
-            case SclPackage.HISTORY__HITEM:
-                return ((InternalEList<?>)getHitem()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.HISTORY__PARENT_HEADER:
+            return basicSetParentHeader( null, msgs );
+        case SclPackage.HISTORY__HITEM:
+            return ( ( InternalEList< ? > ) getHitem() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -198,11 +203,11 @@ public class HistoryImpl extends SclObjectImpl implements History {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.HISTORY__PARENT_HEADER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.HEADER__HISTORY, Header.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.HISTORY__PARENT_HEADER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.HEADER__HISTORY, Header.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -212,13 +217,13 @@ public class HistoryImpl extends SclObjectImpl implements History {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.HISTORY__PARENT_HEADER:
-                return getParentHeader();
-            case SclPackage.HISTORY__HITEM:
-                return getHitem();
+        switch( featureID ) {
+        case SclPackage.HISTORY__PARENT_HEADER:
+            return getParentHeader();
+        case SclPackage.HISTORY__HITEM:
+            return getHitem();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -229,16 +234,16 @@ public class HistoryImpl extends SclObjectImpl implements History {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.HISTORY__PARENT_HEADER:
-                setParentHeader((Header)newValue);
-                return;
-            case SclPackage.HISTORY__HITEM:
-                getHitem().clear();
-                getHitem().addAll((Collection<? extends Hitem>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.HISTORY__PARENT_HEADER:
+            setParentHeader( ( Header ) newValue );
+            return;
+        case SclPackage.HISTORY__HITEM:
+            getHitem().clear();
+            getHitem().addAll( ( Collection< ? extends Hitem > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -248,15 +253,15 @@ public class HistoryImpl extends SclObjectImpl implements History {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.HISTORY__PARENT_HEADER:
-                setParentHeader((Header)null);
-                return;
-            case SclPackage.HISTORY__HITEM:
-                unsetHitem();
-                return;
+        switch( featureID ) {
+        case SclPackage.HISTORY__PARENT_HEADER:
+            setParentHeader( ( Header ) null );
+            return;
+        case SclPackage.HISTORY__HITEM:
+            unsetHitem();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -266,13 +271,13 @@ public class HistoryImpl extends SclObjectImpl implements History {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.HISTORY__PARENT_HEADER:
-                return getParentHeader() != null;
-            case SclPackage.HISTORY__HITEM:
-                return isSetHitem();
+        switch( featureID ) {
+        case SclPackage.HISTORY__PARENT_HEADER:
+            return getParentHeader() != null;
+        case SclPackage.HISTORY__HITEM:
+            return isSetHitem();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //HistoryImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/HitemImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/HitemImpl.java
index e5f6e53..cd1f9f3 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/HitemImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/HitemImpl.java
@@ -265,8 +265,9 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
         revision = newRevision;
         boolean oldRevisionESet = revisionESet;
         revisionESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HITEM__REVISION, oldRevision, revision, !oldRevisionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HITEM__REVISION, oldRevision, revision,
+                    !oldRevisionESet ) );
     }
 
     /**
@@ -280,8 +281,9 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
         boolean oldRevisionESet = revisionESet;
         revision = REVISION_EDEFAULT;
         revisionESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.HITEM__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.HITEM__REVISION, oldRevision,
+                    REVISION_EDEFAULT, oldRevisionESet ) );
     }
 
     /**
@@ -315,8 +317,9 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
         version = newVersion;
         boolean oldVersionESet = versionESet;
         versionESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HITEM__VERSION, oldVersion, version, !oldVersionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HITEM__VERSION, oldVersion, version,
+                    !oldVersionESet ) );
     }
 
     /**
@@ -330,8 +333,9 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
         boolean oldVersionESet = versionESet;
         version = VERSION_EDEFAULT;
         versionESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.HITEM__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.HITEM__VERSION, oldVersion,
+                    VERSION_EDEFAULT, oldVersionESet ) );
     }
 
     /**
@@ -365,8 +369,9 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
         what = newWhat;
         boolean oldWhatESet = whatESet;
         whatESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HITEM__WHAT, oldWhat, what, !oldWhatESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HITEM__WHAT, oldWhat, what,
+                    !oldWhatESet ) );
     }
 
     /**
@@ -380,8 +385,9 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
         boolean oldWhatESet = whatESet;
         what = WHAT_EDEFAULT;
         whatESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.HITEM__WHAT, oldWhat, WHAT_EDEFAULT, oldWhatESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.HITEM__WHAT, oldWhat, WHAT_EDEFAULT,
+                    oldWhatESet ) );
     }
 
     /**
@@ -415,8 +421,9 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
         when = newWhen;
         boolean oldWhenESet = whenESet;
         whenESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HITEM__WHEN, oldWhen, when, !oldWhenESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HITEM__WHEN, oldWhen, when,
+                    !oldWhenESet ) );
     }
 
     /**
@@ -430,8 +437,9 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
         boolean oldWhenESet = whenESet;
         when = WHEN_EDEFAULT;
         whenESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.HITEM__WHEN, oldWhen, WHEN_EDEFAULT, oldWhenESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.HITEM__WHEN, oldWhen, WHEN_EDEFAULT,
+                    oldWhenESet ) );
     }
 
     /**
@@ -465,8 +473,8 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
         who = newWho;
         boolean oldWhoESet = whoESet;
         whoESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HITEM__WHO, oldWho, who, !oldWhoESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HITEM__WHO, oldWho, who, !oldWhoESet ) );
     }
 
     /**
@@ -480,8 +488,9 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
         boolean oldWhoESet = whoESet;
         who = WHO_EDEFAULT;
         whoESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.HITEM__WHO, oldWho, WHO_EDEFAULT, oldWhoESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.HITEM__WHO, oldWho, WHO_EDEFAULT,
+                    oldWhoESet ) );
     }
 
     /**
@@ -515,8 +524,8 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
         why = newWhy;
         boolean oldWhyESet = whyESet;
         whyESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HITEM__WHY, oldWhy, why, !oldWhyESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HITEM__WHY, oldWhy, why, !oldWhyESet ) );
     }
 
     /**
@@ -530,8 +539,9 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
         boolean oldWhyESet = whyESet;
         why = WHY_EDEFAULT;
         whyESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.HITEM__WHY, oldWhy, WHY_EDEFAULT, oldWhyESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.HITEM__WHY, oldWhy, WHY_EDEFAULT,
+                    oldWhyESet ) );
     }
 
     /**
@@ -551,8 +561,8 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
      */
     @Override
     public History getParentHistory() {
-        if (eContainerFeatureID() != SclPackage.HITEM__PARENT_HISTORY) return null;
-        return (History)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.HITEM__PARENT_HISTORY ) return null;
+        return ( History ) eInternalContainer();
     }
 
     /**
@@ -560,8 +570,8 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentHistory(History newParentHistory, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentHistory, SclPackage.HITEM__PARENT_HISTORY, msgs);
+    public NotificationChain basicSetParentHistory( History newParentHistory, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentHistory, SclPackage.HITEM__PARENT_HISTORY, msgs );
         return msgs;
     }
 
@@ -571,20 +581,23 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
      * @generated
      */
     @Override
-    public void setParentHistory(History newParentHistory) {
-        if (newParentHistory != eInternalContainer() || (eContainerFeatureID() != SclPackage.HITEM__PARENT_HISTORY && newParentHistory != null)) {
-            if (EcoreUtil.isAncestor(this, newParentHistory))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentHistory( History newParentHistory ) {
+        if( newParentHistory != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.HITEM__PARENT_HISTORY && newParentHistory != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentHistory ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentHistory != null)
-                msgs = ((InternalEObject)newParentHistory).eInverseAdd(this, SclPackage.HISTORY__HITEM, History.class, msgs);
-            msgs = basicSetParentHistory(newParentHistory, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentHistory != null )
+                msgs = ( ( InternalEObject ) newParentHistory ).eInverseAdd( this, SclPackage.HISTORY__HITEM,
+                        History.class, msgs );
+            msgs = basicSetParentHistory( newParentHistory, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.HITEM__PARENT_HISTORY, newParentHistory, newParentHistory));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.HITEM__PARENT_HISTORY, newParentHistory,
+                    newParentHistory ) );
     }
 
     /**
@@ -594,13 +607,13 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.HITEM__PARENT_HISTORY:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentHistory((History)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.HITEM__PARENT_HISTORY:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentHistory( ( History ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -610,11 +623,11 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.HITEM__PARENT_HISTORY:
-                return basicSetParentHistory(null, msgs);
+        switch( featureID ) {
+        case SclPackage.HITEM__PARENT_HISTORY:
+            return basicSetParentHistory( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -624,11 +637,11 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.HITEM__PARENT_HISTORY:
-                return eInternalContainer().eInverseRemove(this, SclPackage.HISTORY__HITEM, History.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.HITEM__PARENT_HISTORY:
+            return eInternalContainer().eInverseRemove( this, SclPackage.HISTORY__HITEM, History.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -638,23 +651,23 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.HITEM__REVISION:
-                return getRevision();
-            case SclPackage.HITEM__VERSION:
-                return getVersion();
-            case SclPackage.HITEM__WHAT:
-                return getWhat();
-            case SclPackage.HITEM__WHEN:
-                return getWhen();
-            case SclPackage.HITEM__WHO:
-                return getWho();
-            case SclPackage.HITEM__WHY:
-                return getWhy();
-            case SclPackage.HITEM__PARENT_HISTORY:
-                return getParentHistory();
+        switch( featureID ) {
+        case SclPackage.HITEM__REVISION:
+            return getRevision();
+        case SclPackage.HITEM__VERSION:
+            return getVersion();
+        case SclPackage.HITEM__WHAT:
+            return getWhat();
+        case SclPackage.HITEM__WHEN:
+            return getWhen();
+        case SclPackage.HITEM__WHO:
+            return getWho();
+        case SclPackage.HITEM__WHY:
+            return getWhy();
+        case SclPackage.HITEM__PARENT_HISTORY:
+            return getParentHistory();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -664,30 +677,30 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.HITEM__REVISION:
-                setRevision((String)newValue);
-                return;
-            case SclPackage.HITEM__VERSION:
-                setVersion((String)newValue);
-                return;
-            case SclPackage.HITEM__WHAT:
-                setWhat((String)newValue);
-                return;
-            case SclPackage.HITEM__WHEN:
-                setWhen((String)newValue);
-                return;
-            case SclPackage.HITEM__WHO:
-                setWho((String)newValue);
-                return;
-            case SclPackage.HITEM__WHY:
-                setWhy((String)newValue);
-                return;
-            case SclPackage.HITEM__PARENT_HISTORY:
-                setParentHistory((History)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.HITEM__REVISION:
+            setRevision( ( String ) newValue );
+            return;
+        case SclPackage.HITEM__VERSION:
+            setVersion( ( String ) newValue );
+            return;
+        case SclPackage.HITEM__WHAT:
+            setWhat( ( String ) newValue );
+            return;
+        case SclPackage.HITEM__WHEN:
+            setWhen( ( String ) newValue );
+            return;
+        case SclPackage.HITEM__WHO:
+            setWho( ( String ) newValue );
+            return;
+        case SclPackage.HITEM__WHY:
+            setWhy( ( String ) newValue );
+            return;
+        case SclPackage.HITEM__PARENT_HISTORY:
+            setParentHistory( ( History ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -697,30 +710,30 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.HITEM__REVISION:
-                unsetRevision();
-                return;
-            case SclPackage.HITEM__VERSION:
-                unsetVersion();
-                return;
-            case SclPackage.HITEM__WHAT:
-                unsetWhat();
-                return;
-            case SclPackage.HITEM__WHEN:
-                unsetWhen();
-                return;
-            case SclPackage.HITEM__WHO:
-                unsetWho();
-                return;
-            case SclPackage.HITEM__WHY:
-                unsetWhy();
-                return;
-            case SclPackage.HITEM__PARENT_HISTORY:
-                setParentHistory((History)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.HITEM__REVISION:
+            unsetRevision();
+            return;
+        case SclPackage.HITEM__VERSION:
+            unsetVersion();
+            return;
+        case SclPackage.HITEM__WHAT:
+            unsetWhat();
+            return;
+        case SclPackage.HITEM__WHEN:
+            unsetWhen();
+            return;
+        case SclPackage.HITEM__WHO:
+            unsetWho();
+            return;
+        case SclPackage.HITEM__WHY:
+            unsetWhy();
+            return;
+        case SclPackage.HITEM__PARENT_HISTORY:
+            setParentHistory( ( History ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -730,23 +743,23 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.HITEM__REVISION:
-                return isSetRevision();
-            case SclPackage.HITEM__VERSION:
-                return isSetVersion();
-            case SclPackage.HITEM__WHAT:
-                return isSetWhat();
-            case SclPackage.HITEM__WHEN:
-                return isSetWhen();
-            case SclPackage.HITEM__WHO:
-                return isSetWho();
-            case SclPackage.HITEM__WHY:
-                return isSetWhy();
-            case SclPackage.HITEM__PARENT_HISTORY:
-                return getParentHistory() != null;
+        switch( featureID ) {
+        case SclPackage.HITEM__REVISION:
+            return isSetRevision();
+        case SclPackage.HITEM__VERSION:
+            return isSetVersion();
+        case SclPackage.HITEM__WHAT:
+            return isSetWhat();
+        case SclPackage.HITEM__WHEN:
+            return isSetWhen();
+        case SclPackage.HITEM__WHO:
+            return isSetWho();
+        case SclPackage.HITEM__WHY:
+            return isSetWhy();
+        case SclPackage.HITEM__PARENT_HISTORY:
+            return getParentHistory() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -756,22 +769,40 @@ public class HitemImpl extends SclObjectImpl implements Hitem {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (revision: ");
-        if (revisionESet) result.append(revision); else result.append("<unset>");
-        result.append(", version: ");
-        if (versionESet) result.append(version); else result.append("<unset>");
-        result.append(", what: ");
-        if (whatESet) result.append(what); else result.append("<unset>");
-        result.append(", when: ");
-        if (whenESet) result.append(when); else result.append("<unset>");
-        result.append(", who: ");
-        if (whoESet) result.append(who); else result.append("<unset>");
-        result.append(", why: ");
-        if (whyESet) result.append(why); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (revision: " );
+        if( revisionESet )
+            result.append( revision );
+        else
+            result.append( "<unset>" );
+        result.append( ", version: " );
+        if( versionESet )
+            result.append( version );
+        else
+            result.append( "<unset>" );
+        result.append( ", what: " );
+        if( whatESet )
+            result.append( what );
+        else
+            result.append( "<unset>" );
+        result.append( ", when: " );
+        if( whenESet )
+            result.append( when );
+        else
+            result.append( "<unset>" );
+        result.append( ", who: " );
+        if( whoESet )
+            result.append( who );
+        else
+            result.append( "<unset>" );
+        result.append( ", why: " );
+        if( whyESet )
+            result.append( why );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IDNamingImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IDNamingImpl.java
index 648063b..9c68a4a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IDNamingImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IDNamingImpl.java
@@ -143,8 +143,8 @@ public class IDNamingImpl extends BaseElementImpl implements IDNaming {
         id = newId;
         boolean oldIdESet = idESet;
         idESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ID_NAMING__ID, oldId, id, !oldIdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ID_NAMING__ID, oldId, id, !oldIdESet ) );
     }
 
     /**
@@ -158,8 +158,9 @@ public class IDNamingImpl extends BaseElementImpl implements IDNaming {
         boolean oldIdESet = idESet;
         id = ID_EDEFAULT;
         idESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ID_NAMING__ID, oldId, ID_EDEFAULT, oldIdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ID_NAMING__ID, oldId, ID_EDEFAULT,
+                    oldIdESet ) );
     }
 
     /**
@@ -188,13 +189,14 @@ public class IDNamingImpl extends BaseElementImpl implements IDNaming {
      * @generated
      */
     @Override
-    public void setDesc(String newDesc) {
+    public void setDesc( String newDesc ) {
         String oldDesc = desc;
         desc = newDesc;
         boolean oldDescESet = descESet;
         descESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ID_NAMING__DESC, oldDesc, desc, !oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ID_NAMING__DESC, oldDesc, desc,
+                    !oldDescESet ) );
     }
 
     /**
@@ -208,8 +210,9 @@ public class IDNamingImpl extends BaseElementImpl implements IDNaming {
         boolean oldDescESet = descESet;
         desc = DESC_EDEFAULT;
         descESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.ID_NAMING__DESC, oldDesc, DESC_EDEFAULT, oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ID_NAMING__DESC, oldDesc,
+                    DESC_EDEFAULT, oldDescESet ) );
     }
 
     /**
@@ -229,13 +232,13 @@ public class IDNamingImpl extends BaseElementImpl implements IDNaming {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.ID_NAMING__DESC:
-                return getDesc();
-            case SclPackage.ID_NAMING__ID:
-                return getId();
+        switch( featureID ) {
+        case SclPackage.ID_NAMING__DESC:
+            return getDesc();
+        case SclPackage.ID_NAMING__ID:
+            return getId();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -245,15 +248,15 @@ public class IDNamingImpl extends BaseElementImpl implements IDNaming {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.ID_NAMING__DESC:
-                setDesc((String)newValue);
-                return;
-            case SclPackage.ID_NAMING__ID:
-                setId((String)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.ID_NAMING__DESC:
+            setDesc( ( String ) newValue );
+            return;
+        case SclPackage.ID_NAMING__ID:
+            setId( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -263,15 +266,15 @@ public class IDNamingImpl extends BaseElementImpl implements IDNaming {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ID_NAMING__DESC:
-                unsetDesc();
-                return;
-            case SclPackage.ID_NAMING__ID:
-                unsetId();
-                return;
+        switch( featureID ) {
+        case SclPackage.ID_NAMING__DESC:
+            unsetDesc();
+            return;
+        case SclPackage.ID_NAMING__ID:
+            unsetId();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -281,13 +284,13 @@ public class IDNamingImpl extends BaseElementImpl implements IDNaming {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ID_NAMING__DESC:
-                return isSetDesc();
-            case SclPackage.ID_NAMING__ID:
-                return isSetId();
+        switch( featureID ) {
+        case SclPackage.ID_NAMING__DESC:
+            return isSetDesc();
+        case SclPackage.ID_NAMING__ID:
+            return isSetId();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -296,14 +299,16 @@ public class IDNamingImpl extends BaseElementImpl implements IDNaming {
      * @generated
      */
     @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDesc.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.ID_NAMING__DESC: return SclPackage.AG_DESC__DESC;
-                default: return -1;
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDesc.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.ID_NAMING__DESC:
+                return SclPackage.AG_DESC__DESC;
+            default:
+                return -1;
             }
         }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
     }
 
     /**
@@ -312,14 +317,16 @@ public class IDNamingImpl extends BaseElementImpl implements IDNaming {
      * @generated
      */
     @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDesc.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_DESC__DESC: return SclPackage.ID_NAMING__DESC;
-                default: return -1;
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDesc.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_DESC__DESC:
+                return SclPackage.ID_NAMING__DESC;
+            default:
+                return -1;
             }
         }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
     }
 
     /**
@@ -329,14 +336,20 @@ public class IDNamingImpl extends BaseElementImpl implements IDNaming {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (desc: ");
-        if (descESet) result.append(desc); else result.append("<unset>");
-        result.append(", id: ");
-        if (idESet) result.append(id); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (desc: " );
+        if( descESet )
+            result.append( desc );
+        else
+            result.append( "<unset>" );
+        result.append( ", id: " );
+        if( idESet )
+            result.append( id );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDImpl.java
index f55d00d..0d92a71 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDImpl.java
@@ -277,7 +277,7 @@ public class IEDImpl extends UnNamingImpl implements IED {
      * @generated
      * @ordered
      */
-    protected EList<AccessPoint> accessPoint;
+    protected EList< AccessPoint > accessPoint;
 
     /**
      * The cached value of the '{@link #getKDC() <em>KDC</em>}' containment reference list.
@@ -287,7 +287,7 @@ public class IEDImpl extends UnNamingImpl implements IED {
      * @generated
      * @ordered
      */
-    protected EList<KDC> kdc;
+    protected EList< KDC > kdc;
 
     /**
      * The cached value of the '{@link #getServices() <em>Services</em>}' containment reference.
@@ -425,8 +425,9 @@ public class IEDImpl extends UnNamingImpl implements IED {
         configVersion = newConfigVersion;
         boolean oldConfigVersionESet = configVersionESet;
         configVersionESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED__CONFIG_VERSION, oldConfigVersion, configVersion, !oldConfigVersionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED__CONFIG_VERSION, oldConfigVersion,
+                    configVersion, !oldConfigVersionESet ) );
     }
 
     /**
@@ -440,8 +441,9 @@ public class IEDImpl extends UnNamingImpl implements IED {
         boolean oldConfigVersionESet = configVersionESet;
         configVersion = CONFIG_VERSION_EDEFAULT;
         configVersionESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED__CONFIG_VERSION, oldConfigVersion, CONFIG_VERSION_EDEFAULT, oldConfigVersionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED__CONFIG_VERSION, oldConfigVersion,
+                    CONFIG_VERSION_EDEFAULT, oldConfigVersionESet ) );
     }
 
     /**
@@ -470,13 +472,14 @@ public class IEDImpl extends UnNamingImpl implements IED {
      * @generated
      */
     @Override
-    public void setEngRight(String newEngRight) {
+    public void setEngRight( String newEngRight ) {
         String oldEngRight = engRight;
         engRight = newEngRight;
         boolean oldEngRightESet = engRightESet;
         engRightESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED__ENG_RIGHT, oldEngRight, engRight, !oldEngRightESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED__ENG_RIGHT, oldEngRight, engRight,
+                    !oldEngRightESet ) );
     }
 
     /**
@@ -490,8 +493,9 @@ public class IEDImpl extends UnNamingImpl implements IED {
         boolean oldEngRightESet = engRightESet;
         engRight = ENG_RIGHT_EDEFAULT;
         engRightESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED__ENG_RIGHT, oldEngRight, ENG_RIGHT_EDEFAULT, oldEngRightESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED__ENG_RIGHT, oldEngRight,
+                    ENG_RIGHT_EDEFAULT, oldEngRightESet ) );
     }
 
     /**
@@ -525,8 +529,9 @@ public class IEDImpl extends UnNamingImpl implements IED {
         manufacturer = newManufacturer;
         boolean oldManufacturerESet = manufacturerESet;
         manufacturerESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED__MANUFACTURER, oldManufacturer, manufacturer, !oldManufacturerESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED__MANUFACTURER, oldManufacturer,
+                    manufacturer, !oldManufacturerESet ) );
     }
 
     /**
@@ -540,8 +545,9 @@ public class IEDImpl extends UnNamingImpl implements IED {
         boolean oldManufacturerESet = manufacturerESet;
         manufacturer = MANUFACTURER_EDEFAULT;
         manufacturerESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED__MANUFACTURER, oldManufacturer, MANUFACTURER_EDEFAULT, oldManufacturerESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED__MANUFACTURER, oldManufacturer,
+                    MANUFACTURER_EDEFAULT, oldManufacturerESet ) );
     }
 
     /**
@@ -570,13 +576,14 @@ public class IEDImpl extends UnNamingImpl implements IED {
      * @generated
      */
     @Override
-    public void setOriginalSclRevision(String newOriginalSclRevision) {
+    public void setOriginalSclRevision( String newOriginalSclRevision ) {
         String oldOriginalSclRevision = originalSclRevision;
         originalSclRevision = newOriginalSclRevision;
         boolean oldOriginalSclRevisionESet = originalSclRevisionESet;
         originalSclRevisionESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED__ORIGINAL_SCL_REVISION, oldOriginalSclRevision, originalSclRevision, !oldOriginalSclRevisionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED__ORIGINAL_SCL_REVISION,
+                    oldOriginalSclRevision, originalSclRevision, !oldOriginalSclRevisionESet ) );
     }
 
     /**
@@ -590,8 +597,9 @@ public class IEDImpl extends UnNamingImpl implements IED {
         boolean oldOriginalSclRevisionESet = originalSclRevisionESet;
         originalSclRevision = ORIGINAL_SCL_REVISION_EDEFAULT;
         originalSclRevisionESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED__ORIGINAL_SCL_REVISION, oldOriginalSclRevision, ORIGINAL_SCL_REVISION_EDEFAULT, oldOriginalSclRevisionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED__ORIGINAL_SCL_REVISION,
+                    oldOriginalSclRevision, ORIGINAL_SCL_REVISION_EDEFAULT, oldOriginalSclRevisionESet ) );
     }
 
     /**
@@ -620,13 +628,14 @@ public class IEDImpl extends UnNamingImpl implements IED {
      * @generated
      */
     @Override
-    public void setOriginalSclVersion(String newOriginalSclVersion) {
+    public void setOriginalSclVersion( String newOriginalSclVersion ) {
         String oldOriginalSclVersion = originalSclVersion;
         originalSclVersion = newOriginalSclVersion;
         boolean oldOriginalSclVersionESet = originalSclVersionESet;
         originalSclVersionESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED__ORIGINAL_SCL_VERSION, oldOriginalSclVersion, originalSclVersion, !oldOriginalSclVersionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED__ORIGINAL_SCL_VERSION,
+                    oldOriginalSclVersion, originalSclVersion, !oldOriginalSclVersionESet ) );
     }
 
     /**
@@ -640,8 +649,9 @@ public class IEDImpl extends UnNamingImpl implements IED {
         boolean oldOriginalSclVersionESet = originalSclVersionESet;
         originalSclVersion = ORIGINAL_SCL_VERSION_EDEFAULT;
         originalSclVersionESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED__ORIGINAL_SCL_VERSION, oldOriginalSclVersion, ORIGINAL_SCL_VERSION_EDEFAULT, oldOriginalSclVersionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED__ORIGINAL_SCL_VERSION,
+                    oldOriginalSclVersion, ORIGINAL_SCL_VERSION_EDEFAULT, oldOriginalSclVersionESet ) );
     }
 
     /**
@@ -675,8 +685,9 @@ public class IEDImpl extends UnNamingImpl implements IED {
         owner = newOwner;
         boolean oldOwnerESet = ownerESet;
         ownerESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED__OWNER, oldOwner, owner, !oldOwnerESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED__OWNER, oldOwner, owner,
+                    !oldOwnerESet ) );
     }
 
     /**
@@ -690,8 +701,9 @@ public class IEDImpl extends UnNamingImpl implements IED {
         boolean oldOwnerESet = ownerESet;
         owner = OWNER_EDEFAULT;
         ownerESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED__OWNER, oldOwner, OWNER_EDEFAULT, oldOwnerESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED__OWNER, oldOwner, OWNER_EDEFAULT,
+                    oldOwnerESet ) );
     }
 
     /**
@@ -725,8 +737,9 @@ public class IEDImpl extends UnNamingImpl implements IED {
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -740,8 +753,9 @@ public class IEDImpl extends UnNamingImpl implements IED {
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED__TYPE, oldType, TYPE_EDEFAULT,
+                    oldTypeESet ) );
     }
 
     /**
@@ -760,9 +774,10 @@ public class IEDImpl extends UnNamingImpl implements IED {
      * @generated
      */
     @Override
-    public EList<AccessPoint> getAccessPoint() {
-        if (accessPoint == null) {
-            accessPoint = new EObjectContainmentWithInverseEList.Unsettable<AccessPoint>(AccessPoint.class, this, SclPackage.IED__ACCESS_POINT, SclPackage.ACCESS_POINT__PARENT_IED);
+    public EList< AccessPoint > getAccessPoint() {
+        if( accessPoint == null ) {
+            accessPoint = new EObjectContainmentWithInverseEList.Unsettable< AccessPoint >( AccessPoint.class, this,
+                    SclPackage.IED__ACCESS_POINT, SclPackage.ACCESS_POINT__PARENT_IED );
         }
         return accessPoint;
     }
@@ -774,7 +789,7 @@ public class IEDImpl extends UnNamingImpl implements IED {
      */
     @Override
     public void unsetAccessPoint() {
-        if (accessPoint != null) ((InternalEList.Unsettable<?>)accessPoint).unset();
+        if( accessPoint != null ) ( ( InternalEList.Unsettable< ? > ) accessPoint ).unset();
     }
 
     /**
@@ -784,7 +799,7 @@ public class IEDImpl extends UnNamingImpl implements IED {
      */
     @Override
     public boolean isSetAccessPoint() {
-        return accessPoint != null && ((InternalEList.Unsettable<?>)accessPoint).isSet();
+        return accessPoint != null && ( ( InternalEList.Unsettable< ? > ) accessPoint ).isSet();
     }
 
     /**
@@ -793,9 +808,10 @@ public class IEDImpl extends UnNamingImpl implements IED {
      * @generated
      */
     @Override
-    public EList<KDC> getKDC() {
-        if (kdc == null) {
-            kdc = new EObjectContainmentWithInverseEList.Unsettable<KDC>(KDC.class, this, SclPackage.IED__KDC, SclPackage.KDC__PARENT_IED);
+    public EList< KDC > getKDC() {
+        if( kdc == null ) {
+            kdc = new EObjectContainmentWithInverseEList.Unsettable< KDC >( KDC.class, this, SclPackage.IED__KDC,
+                    SclPackage.KDC__PARENT_IED );
         }
         return kdc;
     }
@@ -807,7 +823,7 @@ public class IEDImpl extends UnNamingImpl implements IED {
      */
     @Override
     public void unsetKDC() {
-        if (kdc != null) ((InternalEList.Unsettable<?>)kdc).unset();
+        if( kdc != null ) ( ( InternalEList.Unsettable< ? > ) kdc ).unset();
     }
 
     /**
@@ -817,7 +833,7 @@ public class IEDImpl extends UnNamingImpl implements IED {
      */
     @Override
     public boolean isSetKDC() {
-        return kdc != null && ((InternalEList.Unsettable<?>)kdc).isSet();
+        return kdc != null && ( ( InternalEList.Unsettable< ? > ) kdc ).isSet();
     }
 
     /**
@@ -840,9 +856,13 @@ public class IEDImpl extends UnNamingImpl implements IED {
         services = newServices;
         boolean oldServicesESet = servicesESet;
         servicesESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.IED__SERVICES, oldServices, newServices, !oldServicesESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.IED__SERVICES,
+                    oldServices, newServices, !oldServicesESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -854,20 +874,23 @@ public class IEDImpl extends UnNamingImpl implements IED {
      */
     @Override
     public void setServices( Services newServices ) {
-        if (newServices != services) {
+        if( newServices != services ) {
             NotificationChain msgs = null;
-            if (services != null)
-                msgs = ((InternalEObject)services).eInverseRemove(this, SclPackage.SERVICES__PARENT_IED, Services.class, msgs);
-            if (newServices != null)
-                msgs = ((InternalEObject)newServices).eInverseAdd(this, SclPackage.SERVICES__PARENT_IED, Services.class, msgs);
-            msgs = basicSetServices(newServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( services != null )
+                msgs = ( ( InternalEObject ) services ).eInverseRemove( this, SclPackage.SERVICES__PARENT_IED,
+                        Services.class, msgs );
+            if( newServices != null )
+                msgs = ( ( InternalEObject ) newServices ).eInverseAdd( this, SclPackage.SERVICES__PARENT_IED,
+                        Services.class, msgs );
+            msgs = basicSetServices( newServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldServicesESet = servicesESet;
             servicesESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED__SERVICES, newServices, newServices, !oldServicesESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED__SERVICES, newServices,
+                        newServices, !oldServicesESet ) );
         }
     }
 
@@ -881,9 +904,13 @@ public class IEDImpl extends UnNamingImpl implements IED {
         services = null;
         boolean oldServicesESet = servicesESet;
         servicesESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.IED__SERVICES, oldServices, null, oldServicesESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.IED__SERVICES,
+                    oldServices, null, oldServicesESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -895,17 +922,19 @@ public class IEDImpl extends UnNamingImpl implements IED {
      */
     @Override
     public void unsetServices() {
-        if (services != null) {
+        if( services != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)services).eInverseRemove(this, SclPackage.SERVICES__PARENT_IED, Services.class, msgs);
-            msgs = basicUnsetServices(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) services ).eInverseRemove( this, SclPackage.SERVICES__PARENT_IED,
+                    Services.class, msgs );
+            msgs = basicUnsetServices( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldServicesESet = servicesESet;
             servicesESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED__SERVICES, null, null, oldServicesESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED__SERVICES, null, null,
+                        oldServicesESet ) );
         }
     }
 
@@ -926,8 +955,8 @@ public class IEDImpl extends UnNamingImpl implements IED {
      */
     @Override
     public SCL getParentSCL() {
-        if (eContainerFeatureID() != SclPackage.IED__PARENT_SCL) return null;
-        return (SCL)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.IED__PARENT_SCL ) return null;
+        return ( SCL ) eInternalContainer();
     }
 
     /**
@@ -935,8 +964,8 @@ public class IEDImpl extends UnNamingImpl implements IED {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSCL(SCL newParentSCL, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSCL, SclPackage.IED__PARENT_SCL, msgs);
+    public NotificationChain basicSetParentSCL( SCL newParentSCL, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSCL, SclPackage.IED__PARENT_SCL, msgs );
         return msgs;
     }
 
@@ -946,20 +975,22 @@ public class IEDImpl extends UnNamingImpl implements IED {
      * @generated
      */
     @Override
-    public void setParentSCL(SCL newParentSCL) {
-        if (newParentSCL != eInternalContainer() || (eContainerFeatureID() != SclPackage.IED__PARENT_SCL && newParentSCL != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSCL))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSCL( SCL newParentSCL ) {
+        if( newParentSCL != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.IED__PARENT_SCL && newParentSCL != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSCL ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSCL != null)
-                msgs = ((InternalEObject)newParentSCL).eInverseAdd(this, SclPackage.SCL__IED, SCL.class, msgs);
-            msgs = basicSetParentSCL(newParentSCL, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSCL != null )
+                msgs = ( ( InternalEObject ) newParentSCL ).eInverseAdd( this, SclPackage.SCL__IED, SCL.class, msgs );
+            msgs = basicSetParentSCL( newParentSCL, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED__PARENT_SCL, newParentSCL, newParentSCL));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED__PARENT_SCL, newParentSCL,
+                    newParentSCL ) );
     }
 
     /**
@@ -978,13 +1009,14 @@ public class IEDImpl extends UnNamingImpl implements IED {
      * @generated
      */
     @Override
-    public void setName(String newName) {
+    public void setName( String newName ) {
         String oldName = name;
         name = newName;
         boolean oldNameESet = nameESet;
         nameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED__NAME, oldName, name, !oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED__NAME, oldName, name,
+                    !oldNameESet ) );
     }
 
     /**
@@ -998,8 +1030,9 @@ public class IEDImpl extends UnNamingImpl implements IED {
         boolean oldNameESet = nameESet;
         name = NAME_EDEFAULT;
         nameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED__NAME, oldName, NAME_EDEFAULT, oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED__NAME, oldName, NAME_EDEFAULT,
+                    oldNameESet ) );
     }
 
     /**
@@ -1028,13 +1061,14 @@ public class IEDImpl extends UnNamingImpl implements IED {
      * @generated
      */
     @Override
-    public void setOriginalSclRelease(Integer newOriginalSclRelease) {
+    public void setOriginalSclRelease( Integer newOriginalSclRelease ) {
         Integer oldOriginalSclRelease = originalSclRelease;
         originalSclRelease = newOriginalSclRelease;
         boolean oldOriginalSclReleaseESet = originalSclReleaseESet;
         originalSclReleaseESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED__ORIGINAL_SCL_RELEASE, oldOriginalSclRelease, originalSclRelease, !oldOriginalSclReleaseESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED__ORIGINAL_SCL_RELEASE,
+                    oldOriginalSclRelease, originalSclRelease, !oldOriginalSclReleaseESet ) );
     }
 
     /**
@@ -1048,8 +1082,9 @@ public class IEDImpl extends UnNamingImpl implements IED {
         boolean oldOriginalSclReleaseESet = originalSclReleaseESet;
         originalSclRelease = ORIGINAL_SCL_RELEASE_EDEFAULT;
         originalSclReleaseESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED__ORIGINAL_SCL_RELEASE, oldOriginalSclRelease, ORIGINAL_SCL_RELEASE_EDEFAULT, oldOriginalSclReleaseESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED__ORIGINAL_SCL_RELEASE,
+                    oldOriginalSclRelease, ORIGINAL_SCL_RELEASE_EDEFAULT, oldOriginalSclReleaseESet ) );
     }
 
     /**
@@ -1077,14 +1112,19 @@ public class IEDImpl extends UnNamingImpl implements IED {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetReferredByIEDName(IEDName newReferredByIEDName, NotificationChain msgs) {
+    public NotificationChain basicSetReferredByIEDName( IEDName newReferredByIEDName, NotificationChain msgs ) {
         IEDName oldReferredByIEDName = referredByIEDName;
         referredByIEDName = newReferredByIEDName;
         boolean oldReferredByIEDNameESet = referredByIEDNameESet;
         referredByIEDNameESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.IED__REFERRED_BY_IED_NAME, oldReferredByIEDName, newReferredByIEDName, !oldReferredByIEDNameESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.IED__REFERRED_BY_IED_NAME, oldReferredByIEDName, newReferredByIEDName,
+                    !oldReferredByIEDNameESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1095,21 +1135,24 @@ public class IEDImpl extends UnNamingImpl implements IED {
      * @generated
      */
     @Override
-    public void setReferredByIEDName(IEDName newReferredByIEDName) {
-        if (newReferredByIEDName != referredByIEDName) {
+    public void setReferredByIEDName( IEDName newReferredByIEDName ) {
+        if( newReferredByIEDName != referredByIEDName ) {
             NotificationChain msgs = null;
-            if (referredByIEDName != null)
-                msgs = ((InternalEObject)referredByIEDName).eInverseRemove(this, SclPackage.IED_NAME__REFERS_TO_IED, IEDName.class, msgs);
-            if (newReferredByIEDName != null)
-                msgs = ((InternalEObject)newReferredByIEDName).eInverseAdd(this, SclPackage.IED_NAME__REFERS_TO_IED, IEDName.class, msgs);
-            msgs = basicSetReferredByIEDName(newReferredByIEDName, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( referredByIEDName != null )
+                msgs = ( ( InternalEObject ) referredByIEDName ).eInverseRemove( this,
+                        SclPackage.IED_NAME__REFERS_TO_IED, IEDName.class, msgs );
+            if( newReferredByIEDName != null )
+                msgs = ( ( InternalEObject ) newReferredByIEDName ).eInverseAdd( this,
+                        SclPackage.IED_NAME__REFERS_TO_IED, IEDName.class, msgs );
+            msgs = basicSetReferredByIEDName( newReferredByIEDName, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldReferredByIEDNameESet = referredByIEDNameESet;
             referredByIEDNameESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED__REFERRED_BY_IED_NAME, newReferredByIEDName, newReferredByIEDName, !oldReferredByIEDNameESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED__REFERRED_BY_IED_NAME,
+                        newReferredByIEDName, newReferredByIEDName, !oldReferredByIEDNameESet ) );
         }
     }
 
@@ -1118,14 +1161,18 @@ public class IEDImpl extends UnNamingImpl implements IED {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetReferredByIEDName(NotificationChain msgs) {
+    public NotificationChain basicUnsetReferredByIEDName( NotificationChain msgs ) {
         IEDName oldReferredByIEDName = referredByIEDName;
         referredByIEDName = null;
         boolean oldReferredByIEDNameESet = referredByIEDNameESet;
         referredByIEDNameESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.IED__REFERRED_BY_IED_NAME, oldReferredByIEDName, null, oldReferredByIEDNameESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.IED__REFERRED_BY_IED_NAME, oldReferredByIEDName, null, oldReferredByIEDNameESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1137,17 +1184,19 @@ public class IEDImpl extends UnNamingImpl implements IED {
      */
     @Override
     public void unsetReferredByIEDName() {
-        if (referredByIEDName != null) {
+        if( referredByIEDName != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)referredByIEDName).eInverseRemove(this, SclPackage.IED_NAME__REFERS_TO_IED, IEDName.class, msgs);
-            msgs = basicUnsetReferredByIEDName(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) referredByIEDName ).eInverseRemove( this, SclPackage.IED_NAME__REFERS_TO_IED,
+                    IEDName.class, msgs );
+            msgs = basicUnsetReferredByIEDName( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldReferredByIEDNameESet = referredByIEDNameESet;
             referredByIEDNameESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED__REFERRED_BY_IED_NAME, null, null, oldReferredByIEDNameESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED__REFERRED_BY_IED_NAME, null,
+                        null, oldReferredByIEDNameESet ) );
         }
     }
 
@@ -1169,25 +1218,28 @@ public class IEDImpl extends UnNamingImpl implements IED {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.IED__ACCESS_POINT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getAccessPoint()).basicAdd(otherEnd, msgs);
-            case SclPackage.IED__KDC:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getKDC()).basicAdd(otherEnd, msgs);
-            case SclPackage.IED__SERVICES:
-                if (services != null)
-                    msgs = ((InternalEObject)services).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.IED__SERVICES, null, msgs);
-                return basicSetServices((Services)otherEnd, msgs);
-            case SclPackage.IED__PARENT_SCL:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSCL((SCL)otherEnd, msgs);
-            case SclPackage.IED__REFERRED_BY_IED_NAME:
-                if (referredByIEDName != null)
-                    msgs = ((InternalEObject)referredByIEDName).eInverseRemove(this, SclPackage.IED_NAME__REFERS_TO_IED, IEDName.class, msgs);
-                return basicSetReferredByIEDName((IEDName)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.IED__ACCESS_POINT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getAccessPoint() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.IED__KDC:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getKDC() ).basicAdd( otherEnd, msgs );
+        case SclPackage.IED__SERVICES:
+            if( services != null )
+                msgs = ( ( InternalEObject ) services ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.IED__SERVICES, null, msgs );
+            return basicSetServices( ( Services ) otherEnd, msgs );
+        case SclPackage.IED__PARENT_SCL:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSCL( ( SCL ) otherEnd, msgs );
+        case SclPackage.IED__REFERRED_BY_IED_NAME:
+            if( referredByIEDName != null )
+                msgs = ( ( InternalEObject ) referredByIEDName ).eInverseRemove( this,
+                        SclPackage.IED_NAME__REFERS_TO_IED, IEDName.class, msgs );
+            return basicSetReferredByIEDName( ( IEDName ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1197,19 +1249,19 @@ public class IEDImpl extends UnNamingImpl implements IED {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.IED__ACCESS_POINT:
-                return ((InternalEList<?>)getAccessPoint()).basicRemove(otherEnd, msgs);
-            case SclPackage.IED__KDC:
-                return ((InternalEList<?>)getKDC()).basicRemove(otherEnd, msgs);
-            case SclPackage.IED__SERVICES:
-                return basicUnsetServices(msgs);
-            case SclPackage.IED__PARENT_SCL:
-                return basicSetParentSCL(null, msgs);
-            case SclPackage.IED__REFERRED_BY_IED_NAME:
-                return basicUnsetReferredByIEDName(msgs);
+        switch( featureID ) {
+        case SclPackage.IED__ACCESS_POINT:
+            return ( ( InternalEList< ? > ) getAccessPoint() ).basicRemove( otherEnd, msgs );
+        case SclPackage.IED__KDC:
+            return ( ( InternalEList< ? > ) getKDC() ).basicRemove( otherEnd, msgs );
+        case SclPackage.IED__SERVICES:
+            return basicUnsetServices( msgs );
+        case SclPackage.IED__PARENT_SCL:
+            return basicSetParentSCL( null, msgs );
+        case SclPackage.IED__REFERRED_BY_IED_NAME:
+            return basicUnsetReferredByIEDName( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1219,11 +1271,11 @@ public class IEDImpl extends UnNamingImpl implements IED {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.IED__PARENT_SCL:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SCL__IED, SCL.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.IED__PARENT_SCL:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SCL__IED, SCL.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -1233,37 +1285,37 @@ public class IEDImpl extends UnNamingImpl implements IED {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.IED__CONFIG_VERSION:
-                return getConfigVersion();
-            case SclPackage.IED__ENG_RIGHT:
-                return getEngRight();
-            case SclPackage.IED__MANUFACTURER:
-                return getManufacturer();
-            case SclPackage.IED__ORIGINAL_SCL_REVISION:
-                return getOriginalSclRevision();
-            case SclPackage.IED__ORIGINAL_SCL_VERSION:
-                return getOriginalSclVersion();
-            case SclPackage.IED__OWNER:
-                return getOwner();
-            case SclPackage.IED__TYPE:
-                return getType();
-            case SclPackage.IED__ACCESS_POINT:
-                return getAccessPoint();
-            case SclPackage.IED__KDC:
-                return getKDC();
-            case SclPackage.IED__SERVICES:
-                return getServices();
-            case SclPackage.IED__PARENT_SCL:
-                return getParentSCL();
-            case SclPackage.IED__NAME:
-                return getName();
-            case SclPackage.IED__ORIGINAL_SCL_RELEASE:
-                return getOriginalSclRelease();
-            case SclPackage.IED__REFERRED_BY_IED_NAME:
-                return getReferredByIEDName();
+        switch( featureID ) {
+        case SclPackage.IED__CONFIG_VERSION:
+            return getConfigVersion();
+        case SclPackage.IED__ENG_RIGHT:
+            return getEngRight();
+        case SclPackage.IED__MANUFACTURER:
+            return getManufacturer();
+        case SclPackage.IED__ORIGINAL_SCL_REVISION:
+            return getOriginalSclRevision();
+        case SclPackage.IED__ORIGINAL_SCL_VERSION:
+            return getOriginalSclVersion();
+        case SclPackage.IED__OWNER:
+            return getOwner();
+        case SclPackage.IED__TYPE:
+            return getType();
+        case SclPackage.IED__ACCESS_POINT:
+            return getAccessPoint();
+        case SclPackage.IED__KDC:
+            return getKDC();
+        case SclPackage.IED__SERVICES:
+            return getServices();
+        case SclPackage.IED__PARENT_SCL:
+            return getParentSCL();
+        case SclPackage.IED__NAME:
+            return getName();
+        case SclPackage.IED__ORIGINAL_SCL_RELEASE:
+            return getOriginalSclRelease();
+        case SclPackage.IED__REFERRED_BY_IED_NAME:
+            return getReferredByIEDName();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -1274,53 +1326,53 @@ public class IEDImpl extends UnNamingImpl implements IED {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.IED__CONFIG_VERSION:
-                setConfigVersion((String)newValue);
-                return;
-            case SclPackage.IED__ENG_RIGHT:
-                setEngRight((String)newValue);
-                return;
-            case SclPackage.IED__MANUFACTURER:
-                setManufacturer((String)newValue);
-                return;
-            case SclPackage.IED__ORIGINAL_SCL_REVISION:
-                setOriginalSclRevision((String)newValue);
-                return;
-            case SclPackage.IED__ORIGINAL_SCL_VERSION:
-                setOriginalSclVersion((String)newValue);
-                return;
-            case SclPackage.IED__OWNER:
-                setOwner((String)newValue);
-                return;
-            case SclPackage.IED__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.IED__ACCESS_POINT:
-                getAccessPoint().clear();
-                getAccessPoint().addAll((Collection<? extends AccessPoint>)newValue);
-                return;
-            case SclPackage.IED__KDC:
-                getKDC().clear();
-                getKDC().addAll((Collection<? extends KDC>)newValue);
-                return;
-            case SclPackage.IED__SERVICES:
-                setServices((Services)newValue);
-                return;
-            case SclPackage.IED__PARENT_SCL:
-                setParentSCL((SCL)newValue);
-                return;
-            case SclPackage.IED__NAME:
-                setName((String)newValue);
-                return;
-            case SclPackage.IED__ORIGINAL_SCL_RELEASE:
-                setOriginalSclRelease((Integer)newValue);
-                return;
-            case SclPackage.IED__REFERRED_BY_IED_NAME:
-                setReferredByIEDName((IEDName)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.IED__CONFIG_VERSION:
+            setConfigVersion( ( String ) newValue );
+            return;
+        case SclPackage.IED__ENG_RIGHT:
+            setEngRight( ( String ) newValue );
+            return;
+        case SclPackage.IED__MANUFACTURER:
+            setManufacturer( ( String ) newValue );
+            return;
+        case SclPackage.IED__ORIGINAL_SCL_REVISION:
+            setOriginalSclRevision( ( String ) newValue );
+            return;
+        case SclPackage.IED__ORIGINAL_SCL_VERSION:
+            setOriginalSclVersion( ( String ) newValue );
+            return;
+        case SclPackage.IED__OWNER:
+            setOwner( ( String ) newValue );
+            return;
+        case SclPackage.IED__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.IED__ACCESS_POINT:
+            getAccessPoint().clear();
+            getAccessPoint().addAll( ( Collection< ? extends AccessPoint > ) newValue );
+            return;
+        case SclPackage.IED__KDC:
+            getKDC().clear();
+            getKDC().addAll( ( Collection< ? extends KDC > ) newValue );
+            return;
+        case SclPackage.IED__SERVICES:
+            setServices( ( Services ) newValue );
+            return;
+        case SclPackage.IED__PARENT_SCL:
+            setParentSCL( ( SCL ) newValue );
+            return;
+        case SclPackage.IED__NAME:
+            setName( ( String ) newValue );
+            return;
+        case SclPackage.IED__ORIGINAL_SCL_RELEASE:
+            setOriginalSclRelease( ( Integer ) newValue );
+            return;
+        case SclPackage.IED__REFERRED_BY_IED_NAME:
+            setReferredByIEDName( ( IEDName ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -1330,51 +1382,51 @@ public class IEDImpl extends UnNamingImpl implements IED {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.IED__CONFIG_VERSION:
-                unsetConfigVersion();
-                return;
-            case SclPackage.IED__ENG_RIGHT:
-                unsetEngRight();
-                return;
-            case SclPackage.IED__MANUFACTURER:
-                unsetManufacturer();
-                return;
-            case SclPackage.IED__ORIGINAL_SCL_REVISION:
-                unsetOriginalSclRevision();
-                return;
-            case SclPackage.IED__ORIGINAL_SCL_VERSION:
-                unsetOriginalSclVersion();
-                return;
-            case SclPackage.IED__OWNER:
-                unsetOwner();
-                return;
-            case SclPackage.IED__TYPE:
-                unsetType();
-                return;
-            case SclPackage.IED__ACCESS_POINT:
-                unsetAccessPoint();
-                return;
-            case SclPackage.IED__KDC:
-                unsetKDC();
-                return;
-            case SclPackage.IED__SERVICES:
-                unsetServices();
-                return;
-            case SclPackage.IED__PARENT_SCL:
-                setParentSCL((SCL)null);
-                return;
-            case SclPackage.IED__NAME:
-                unsetName();
-                return;
-            case SclPackage.IED__ORIGINAL_SCL_RELEASE:
-                unsetOriginalSclRelease();
-                return;
-            case SclPackage.IED__REFERRED_BY_IED_NAME:
-                unsetReferredByIEDName();
-                return;
+        switch( featureID ) {
+        case SclPackage.IED__CONFIG_VERSION:
+            unsetConfigVersion();
+            return;
+        case SclPackage.IED__ENG_RIGHT:
+            unsetEngRight();
+            return;
+        case SclPackage.IED__MANUFACTURER:
+            unsetManufacturer();
+            return;
+        case SclPackage.IED__ORIGINAL_SCL_REVISION:
+            unsetOriginalSclRevision();
+            return;
+        case SclPackage.IED__ORIGINAL_SCL_VERSION:
+            unsetOriginalSclVersion();
+            return;
+        case SclPackage.IED__OWNER:
+            unsetOwner();
+            return;
+        case SclPackage.IED__TYPE:
+            unsetType();
+            return;
+        case SclPackage.IED__ACCESS_POINT:
+            unsetAccessPoint();
+            return;
+        case SclPackage.IED__KDC:
+            unsetKDC();
+            return;
+        case SclPackage.IED__SERVICES:
+            unsetServices();
+            return;
+        case SclPackage.IED__PARENT_SCL:
+            setParentSCL( ( SCL ) null );
+            return;
+        case SclPackage.IED__NAME:
+            unsetName();
+            return;
+        case SclPackage.IED__ORIGINAL_SCL_RELEASE:
+            unsetOriginalSclRelease();
+            return;
+        case SclPackage.IED__REFERRED_BY_IED_NAME:
+            unsetReferredByIEDName();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -1384,37 +1436,37 @@ public class IEDImpl extends UnNamingImpl implements IED {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.IED__CONFIG_VERSION:
-                return isSetConfigVersion();
-            case SclPackage.IED__ENG_RIGHT:
-                return isSetEngRight();
-            case SclPackage.IED__MANUFACTURER:
-                return isSetManufacturer();
-            case SclPackage.IED__ORIGINAL_SCL_REVISION:
-                return isSetOriginalSclRevision();
-            case SclPackage.IED__ORIGINAL_SCL_VERSION:
-                return isSetOriginalSclVersion();
-            case SclPackage.IED__OWNER:
-                return isSetOwner();
-            case SclPackage.IED__TYPE:
-                return isSetType();
-            case SclPackage.IED__ACCESS_POINT:
-                return isSetAccessPoint();
-            case SclPackage.IED__KDC:
-                return isSetKDC();
-            case SclPackage.IED__SERVICES:
-                return isSetServices();
-            case SclPackage.IED__PARENT_SCL:
-                return getParentSCL() != null;
-            case SclPackage.IED__NAME:
-                return isSetName();
-            case SclPackage.IED__ORIGINAL_SCL_RELEASE:
-                return isSetOriginalSclRelease();
-            case SclPackage.IED__REFERRED_BY_IED_NAME:
-                return isSetReferredByIEDName();
+        switch( featureID ) {
+        case SclPackage.IED__CONFIG_VERSION:
+            return isSetConfigVersion();
+        case SclPackage.IED__ENG_RIGHT:
+            return isSetEngRight();
+        case SclPackage.IED__MANUFACTURER:
+            return isSetManufacturer();
+        case SclPackage.IED__ORIGINAL_SCL_REVISION:
+            return isSetOriginalSclRevision();
+        case SclPackage.IED__ORIGINAL_SCL_VERSION:
+            return isSetOriginalSclVersion();
+        case SclPackage.IED__OWNER:
+            return isSetOwner();
+        case SclPackage.IED__TYPE:
+            return isSetType();
+        case SclPackage.IED__ACCESS_POINT:
+            return isSetAccessPoint();
+        case SclPackage.IED__KDC:
+            return isSetKDC();
+        case SclPackage.IED__SERVICES:
+            return isSetServices();
+        case SclPackage.IED__PARENT_SCL:
+            return getParentSCL() != null;
+        case SclPackage.IED__NAME:
+            return isSetName();
+        case SclPackage.IED__ORIGINAL_SCL_RELEASE:
+            return isSetOriginalSclRelease();
+        case SclPackage.IED__REFERRED_BY_IED_NAME:
+            return isSetReferredByIEDName();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -1424,28 +1476,55 @@ public class IEDImpl extends UnNamingImpl implements IED {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (configVersion: ");
-        if (configVersionESet) result.append(configVersion); else result.append("<unset>");
-        result.append(", engRight: ");
-        if (engRightESet) result.append(engRight); else result.append("<unset>");
-        result.append(", manufacturer: ");
-        if (manufacturerESet) result.append(manufacturer); else result.append("<unset>");
-        result.append(", originalSclRevision: ");
-        if (originalSclRevisionESet) result.append(originalSclRevision); else result.append("<unset>");
-        result.append(", originalSclVersion: ");
-        if (originalSclVersionESet) result.append(originalSclVersion); else result.append("<unset>");
-        result.append(", owner: ");
-        if (ownerESet) result.append(owner); else result.append("<unset>");
-        result.append(", type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(", name: ");
-        if (nameESet) result.append(name); else result.append("<unset>");
-        result.append(", originalSclRelease: ");
-        if (originalSclReleaseESet) result.append(originalSclRelease); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (configVersion: " );
+        if( configVersionESet )
+            result.append( configVersion );
+        else
+            result.append( "<unset>" );
+        result.append( ", engRight: " );
+        if( engRightESet )
+            result.append( engRight );
+        else
+            result.append( "<unset>" );
+        result.append( ", manufacturer: " );
+        if( manufacturerESet )
+            result.append( manufacturer );
+        else
+            result.append( "<unset>" );
+        result.append( ", originalSclRevision: " );
+        if( originalSclRevisionESet )
+            result.append( originalSclRevision );
+        else
+            result.append( "<unset>" );
+        result.append( ", originalSclVersion: " );
+        if( originalSclVersionESet )
+            result.append( originalSclVersion );
+        else
+            result.append( "<unset>" );
+        result.append( ", owner: " );
+        if( ownerESet )
+            result.append( owner );
+        else
+            result.append( "<unset>" );
+        result.append( ", type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ", name: " );
+        if( nameESet )
+            result.append( name );
+        else
+            result.append( "<unset>" );
+        result.append( ", originalSclRelease: " );
+        if( originalSclReleaseESet )
+            result.append( originalSclRelease );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java
index 0acf645..795af52 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java
@@ -332,8 +332,9 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
         apRef = newApRef;
         boolean oldApRefESet = apRefESet;
         apRefESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED_NAME__AP_REF, oldApRef, apRef, !oldApRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED_NAME__AP_REF, oldApRef, apRef,
+                    !oldApRefESet ) );
     }
 
     /**
@@ -347,8 +348,9 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
         boolean oldApRefESet = apRefESet;
         apRef = AP_REF_EDEFAULT;
         apRefESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED_NAME__AP_REF, oldApRef, AP_REF_EDEFAULT, oldApRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED_NAME__AP_REF, oldApRef,
+                    AP_REF_EDEFAULT, oldApRefESet ) );
     }
 
     /**
@@ -382,8 +384,9 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
         ldInst = newLdInst;
         boolean oldLdInstESet = ldInstESet;
         ldInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED_NAME__LD_INST, oldLdInst, ldInst, !oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED_NAME__LD_INST, oldLdInst, ldInst,
+                    !oldLdInstESet ) );
     }
 
     /**
@@ -397,8 +400,9 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
         boolean oldLdInstESet = ldInstESet;
         ldInst = LD_INST_EDEFAULT;
         ldInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED_NAME__LD_INST, oldLdInst, LD_INST_EDEFAULT, oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED_NAME__LD_INST, oldLdInst,
+                    LD_INST_EDEFAULT, oldLdInstESet ) );
     }
 
     /**
@@ -432,8 +436,9 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
         lnClass = newLnClass;
         boolean oldLnClassESet = lnClassESet;
         lnClassESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED_NAME__LN_CLASS, oldLnClass, lnClass, !oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED_NAME__LN_CLASS, oldLnClass, lnClass,
+                    !oldLnClassESet ) );
     }
 
     /**
@@ -447,8 +452,9 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
         boolean oldLnClassESet = lnClassESet;
         lnClass = LN_CLASS_EDEFAULT;
         lnClassESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED_NAME__LN_CLASS, oldLnClass, LN_CLASS_EDEFAULT, oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED_NAME__LN_CLASS, oldLnClass,
+                    LN_CLASS_EDEFAULT, oldLnClassESet ) );
     }
 
     /**
@@ -482,8 +488,9 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
         lnInst = newLnInst;
         boolean oldLnInstESet = lnInstESet;
         lnInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED_NAME__LN_INST, oldLnInst, lnInst, !oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED_NAME__LN_INST, oldLnInst, lnInst,
+                    !oldLnInstESet ) );
     }
 
     /**
@@ -497,8 +504,9 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
         boolean oldLnInstESet = lnInstESet;
         lnInst = LN_INST_EDEFAULT;
         lnInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED_NAME__LN_INST, oldLnInst, LN_INST_EDEFAULT, oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED_NAME__LN_INST, oldLnInst,
+                    LN_INST_EDEFAULT, oldLnInstESet ) );
     }
 
     /**
@@ -532,8 +540,9 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
         prefix = newPrefix;
         boolean oldPrefixESet = prefixESet;
         prefixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED_NAME__PREFIX, oldPrefix, prefix, !oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED_NAME__PREFIX, oldPrefix, prefix,
+                    !oldPrefixESet ) );
     }
 
     /**
@@ -547,8 +556,9 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
         boolean oldPrefixESet = prefixESet;
         prefix = PREFIX_EDEFAULT;
         prefixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED_NAME__PREFIX, oldPrefix, PREFIX_EDEFAULT, oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED_NAME__PREFIX, oldPrefix,
+                    PREFIX_EDEFAULT, oldPrefixESet ) );
     }
 
     /**
@@ -568,8 +578,8 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      */
     @Override
     public ControlWithIEDName getParentControlWithIEDName() {
-        if (eContainerFeatureID() != SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME) return null;
-        return (ControlWithIEDName)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME ) return null;
+        return ( ControlWithIEDName ) eInternalContainer();
     }
 
     /**
@@ -577,8 +587,10 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentControlWithIEDName(ControlWithIEDName newParentControlWithIEDName, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentControlWithIEDName, SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME, msgs);
+    public NotificationChain basicSetParentControlWithIEDName( ControlWithIEDName newParentControlWithIEDName,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentControlWithIEDName,
+                SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME, msgs );
         return msgs;
     }
 
@@ -588,20 +600,24 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      * @generated
      */
     @Override
-    public void setParentControlWithIEDName(ControlWithIEDName newParentControlWithIEDName) {
-        if (newParentControlWithIEDName != eInternalContainer() || (eContainerFeatureID() != SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME && newParentControlWithIEDName != null)) {
-            if (EcoreUtil.isAncestor(this, newParentControlWithIEDName))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentControlWithIEDName( ControlWithIEDName newParentControlWithIEDName ) {
+        if( newParentControlWithIEDName != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME
+                        && newParentControlWithIEDName != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentControlWithIEDName ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentControlWithIEDName != null)
-                msgs = ((InternalEObject)newParentControlWithIEDName).eInverseAdd(this, SclPackage.CONTROL_WITH_IED_NAME__IED_NAME, ControlWithIEDName.class, msgs);
-            msgs = basicSetParentControlWithIEDName(newParentControlWithIEDName, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentControlWithIEDName != null )
+                msgs = ( ( InternalEObject ) newParentControlWithIEDName ).eInverseAdd( this,
+                        SclPackage.CONTROL_WITH_IED_NAME__IED_NAME, ControlWithIEDName.class, msgs );
+            msgs = basicSetParentControlWithIEDName( newParentControlWithIEDName, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME, newParentControlWithIEDName, newParentControlWithIEDName));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME,
+                    newParentControlWithIEDName, newParentControlWithIEDName ) );
     }
 
     /**
@@ -619,14 +635,18 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToAnyLN(AnyLN newRefersToAnyLN, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToAnyLN( AnyLN newRefersToAnyLN, NotificationChain msgs ) {
         AnyLN oldRefersToAnyLN = refersToAnyLN;
         refersToAnyLN = newRefersToAnyLN;
         boolean oldRefersToAnyLNESet = refersToAnyLNESet;
         refersToAnyLNESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.IED_NAME__REFERS_TO_ANY_LN, oldRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.IED_NAME__REFERS_TO_ANY_LN, oldRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -637,21 +657,24 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      * @generated
      */
     @Override
-    public void setRefersToAnyLN(AnyLN newRefersToAnyLN) {
-        if (newRefersToAnyLN != refersToAnyLN) {
+    public void setRefersToAnyLN( AnyLN newRefersToAnyLN ) {
+        if( newRefersToAnyLN != refersToAnyLN ) {
             NotificationChain msgs = null;
-            if (refersToAnyLN != null)
-                msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_IED_NAME, AnyLN.class, msgs);
-            if (newRefersToAnyLN != null)
-                msgs = ((InternalEObject)newRefersToAnyLN).eInverseAdd(this, SclPackage.ANY_LN__REFERRED_BY_IED_NAME, AnyLN.class, msgs);
-            msgs = basicSetRefersToAnyLN(newRefersToAnyLN, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToAnyLN != null )
+                msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this,
+                        SclPackage.ANY_LN__REFERRED_BY_IED_NAME, AnyLN.class, msgs );
+            if( newRefersToAnyLN != null )
+                msgs = ( ( InternalEObject ) newRefersToAnyLN ).eInverseAdd( this,
+                        SclPackage.ANY_LN__REFERRED_BY_IED_NAME, AnyLN.class, msgs );
+            msgs = basicSetRefersToAnyLN( newRefersToAnyLN, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAnyLNESet = refersToAnyLNESet;
             refersToAnyLNESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED_NAME__REFERS_TO_ANY_LN, newRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED_NAME__REFERS_TO_ANY_LN,
+                        newRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet ) );
         }
     }
 
@@ -660,14 +683,18 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToAnyLN(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToAnyLN( NotificationChain msgs ) {
         AnyLN oldRefersToAnyLN = refersToAnyLN;
         refersToAnyLN = null;
         boolean oldRefersToAnyLNESet = refersToAnyLNESet;
         refersToAnyLNESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.IED_NAME__REFERS_TO_ANY_LN, oldRefersToAnyLN, null, oldRefersToAnyLNESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.IED_NAME__REFERS_TO_ANY_LN, oldRefersToAnyLN, null, oldRefersToAnyLNESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -679,17 +706,19 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      */
     @Override
     public void unsetRefersToAnyLN() {
-        if (refersToAnyLN != null) {
+        if( refersToAnyLN != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_IED_NAME, AnyLN.class, msgs);
-            msgs = basicUnsetRefersToAnyLN(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this, SclPackage.ANY_LN__REFERRED_BY_IED_NAME,
+                    AnyLN.class, msgs );
+            msgs = basicUnsetRefersToAnyLN( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAnyLNESet = refersToAnyLNESet;
             refersToAnyLNESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED_NAME__REFERS_TO_ANY_LN, null, null, oldRefersToAnyLNESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED_NAME__REFERS_TO_ANY_LN, null,
+                        null, oldRefersToAnyLNESet ) );
         }
     }
 
@@ -719,13 +748,14 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      * @generated
      */
     @Override
-    public void setValue(String newValue) {
+    public void setValue( String newValue ) {
         String oldValue = value;
         value = newValue;
         boolean oldValueESet = valueESet;
         valueESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED_NAME__VALUE, oldValue, value, !oldValueESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED_NAME__VALUE, oldValue, value,
+                    !oldValueESet ) );
     }
 
     /**
@@ -739,8 +769,9 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
         boolean oldValueESet = valueESet;
         value = VALUE_EDEFAULT;
         valueESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED_NAME__VALUE, oldValue, VALUE_EDEFAULT, oldValueESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED_NAME__VALUE, oldValue,
+                    VALUE_EDEFAULT, oldValueESet ) );
     }
 
     /**
@@ -768,14 +799,18 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToIED(IED newRefersToIED, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToIED( IED newRefersToIED, NotificationChain msgs ) {
         IED oldRefersToIED = refersToIED;
         refersToIED = newRefersToIED;
         boolean oldRefersToIEDESet = refersToIEDESet;
         refersToIEDESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.IED_NAME__REFERS_TO_IED, oldRefersToIED, newRefersToIED, !oldRefersToIEDESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.IED_NAME__REFERS_TO_IED, oldRefersToIED, newRefersToIED, !oldRefersToIEDESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -786,21 +821,24 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      * @generated
      */
     @Override
-    public void setRefersToIED(IED newRefersToIED) {
-        if (newRefersToIED != refersToIED) {
+    public void setRefersToIED( IED newRefersToIED ) {
+        if( newRefersToIED != refersToIED ) {
             NotificationChain msgs = null;
-            if (refersToIED != null)
-                msgs = ((InternalEObject)refersToIED).eInverseRemove(this, SclPackage.IED__REFERRED_BY_IED_NAME, IED.class, msgs);
-            if (newRefersToIED != null)
-                msgs = ((InternalEObject)newRefersToIED).eInverseAdd(this, SclPackage.IED__REFERRED_BY_IED_NAME, IED.class, msgs);
-            msgs = basicSetRefersToIED(newRefersToIED, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToIED != null )
+                msgs = ( ( InternalEObject ) refersToIED ).eInverseRemove( this, SclPackage.IED__REFERRED_BY_IED_NAME,
+                        IED.class, msgs );
+            if( newRefersToIED != null )
+                msgs = ( ( InternalEObject ) newRefersToIED ).eInverseAdd( this, SclPackage.IED__REFERRED_BY_IED_NAME,
+                        IED.class, msgs );
+            msgs = basicSetRefersToIED( newRefersToIED, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToIEDESet = refersToIEDESet;
             refersToIEDESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED_NAME__REFERS_TO_IED, newRefersToIED, newRefersToIED, !oldRefersToIEDESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED_NAME__REFERS_TO_IED,
+                        newRefersToIED, newRefersToIED, !oldRefersToIEDESet ) );
         }
     }
 
@@ -809,14 +847,18 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToIED(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToIED( NotificationChain msgs ) {
         IED oldRefersToIED = refersToIED;
         refersToIED = null;
         boolean oldRefersToIEDESet = refersToIEDESet;
         refersToIEDESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.IED_NAME__REFERS_TO_IED, oldRefersToIED, null, oldRefersToIEDESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.IED_NAME__REFERS_TO_IED, oldRefersToIED, null, oldRefersToIEDESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -828,17 +870,19 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      */
     @Override
     public void unsetRefersToIED() {
-        if (refersToIED != null) {
+        if( refersToIED != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToIED).eInverseRemove(this, SclPackage.IED__REFERRED_BY_IED_NAME, IED.class, msgs);
-            msgs = basicUnsetRefersToIED(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToIED ).eInverseRemove( this, SclPackage.IED__REFERRED_BY_IED_NAME,
+                    IED.class, msgs );
+            msgs = basicUnsetRefersToIED( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToIEDESet = refersToIEDESet;
             refersToIEDESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED_NAME__REFERS_TO_IED, null, null, oldRefersToIEDESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED_NAME__REFERS_TO_IED, null,
+                        null, oldRefersToIEDESet ) );
         }
     }
 
@@ -867,14 +911,19 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToLDevice(LDevice newRefersToLDevice, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToLDevice( LDevice newRefersToLDevice, NotificationChain msgs ) {
         LDevice oldRefersToLDevice = refersToLDevice;
         refersToLDevice = newRefersToLDevice;
         boolean oldRefersToLDeviceESet = refersToLDeviceESet;
         refersToLDeviceESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.IED_NAME__REFERS_TO_LDEVICE, oldRefersToLDevice, newRefersToLDevice, !oldRefersToLDeviceESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.IED_NAME__REFERS_TO_LDEVICE, oldRefersToLDevice, newRefersToLDevice,
+                    !oldRefersToLDeviceESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -885,21 +934,24 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      * @generated
      */
     @Override
-    public void setRefersToLDevice(LDevice newRefersToLDevice) {
-        if (newRefersToLDevice != refersToLDevice) {
+    public void setRefersToLDevice( LDevice newRefersToLDevice ) {
+        if( newRefersToLDevice != refersToLDevice ) {
             NotificationChain msgs = null;
-            if (refersToLDevice != null)
-                msgs = ((InternalEObject)refersToLDevice).eInverseRemove(this, SclPackage.LDEVICE__REFERRED_BY_IED_NAME, LDevice.class, msgs);
-            if (newRefersToLDevice != null)
-                msgs = ((InternalEObject)newRefersToLDevice).eInverseAdd(this, SclPackage.LDEVICE__REFERRED_BY_IED_NAME, LDevice.class, msgs);
-            msgs = basicSetRefersToLDevice(newRefersToLDevice, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToLDevice != null )
+                msgs = ( ( InternalEObject ) refersToLDevice ).eInverseRemove( this,
+                        SclPackage.LDEVICE__REFERRED_BY_IED_NAME, LDevice.class, msgs );
+            if( newRefersToLDevice != null )
+                msgs = ( ( InternalEObject ) newRefersToLDevice ).eInverseAdd( this,
+                        SclPackage.LDEVICE__REFERRED_BY_IED_NAME, LDevice.class, msgs );
+            msgs = basicSetRefersToLDevice( newRefersToLDevice, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToLDeviceESet = refersToLDeviceESet;
             refersToLDeviceESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.IED_NAME__REFERS_TO_LDEVICE, newRefersToLDevice, newRefersToLDevice, !oldRefersToLDeviceESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.IED_NAME__REFERS_TO_LDEVICE,
+                        newRefersToLDevice, newRefersToLDevice, !oldRefersToLDeviceESet ) );
         }
     }
 
@@ -908,14 +960,18 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToLDevice(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToLDevice( NotificationChain msgs ) {
         LDevice oldRefersToLDevice = refersToLDevice;
         refersToLDevice = null;
         boolean oldRefersToLDeviceESet = refersToLDeviceESet;
         refersToLDeviceESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.IED_NAME__REFERS_TO_LDEVICE, oldRefersToLDevice, null, oldRefersToLDeviceESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.IED_NAME__REFERS_TO_LDEVICE, oldRefersToLDevice, null, oldRefersToLDeviceESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -927,17 +983,19 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      */
     @Override
     public void unsetRefersToLDevice() {
-        if (refersToLDevice != null) {
+        if( refersToLDevice != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToLDevice).eInverseRemove(this, SclPackage.LDEVICE__REFERRED_BY_IED_NAME, LDevice.class, msgs);
-            msgs = basicUnsetRefersToLDevice(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToLDevice ).eInverseRemove( this,
+                    SclPackage.LDEVICE__REFERRED_BY_IED_NAME, LDevice.class, msgs );
+            msgs = basicUnsetRefersToLDevice( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToLDeviceESet = refersToLDeviceESet;
             refersToLDeviceESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.IED_NAME__REFERS_TO_LDEVICE, null, null, oldRefersToLDeviceESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.IED_NAME__REFERS_TO_LDEVICE, null,
+                        null, oldRefersToLDeviceESet ) );
         }
     }
 
@@ -958,25 +1016,28 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentControlWithIEDName((ControlWithIEDName)otherEnd, msgs);
-            case SclPackage.IED_NAME__REFERS_TO_ANY_LN:
-                if (refersToAnyLN != null)
-                    msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_IED_NAME, AnyLN.class, msgs);
-                return basicSetRefersToAnyLN((AnyLN)otherEnd, msgs);
-            case SclPackage.IED_NAME__REFERS_TO_IED:
-                if (refersToIED != null)
-                    msgs = ((InternalEObject)refersToIED).eInverseRemove(this, SclPackage.IED__REFERRED_BY_IED_NAME, IED.class, msgs);
-                return basicSetRefersToIED((IED)otherEnd, msgs);
-            case SclPackage.IED_NAME__REFERS_TO_LDEVICE:
-                if (refersToLDevice != null)
-                    msgs = ((InternalEObject)refersToLDevice).eInverseRemove(this, SclPackage.LDEVICE__REFERRED_BY_IED_NAME, LDevice.class, msgs);
-                return basicSetRefersToLDevice((LDevice)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentControlWithIEDName( ( ControlWithIEDName ) otherEnd, msgs );
+        case SclPackage.IED_NAME__REFERS_TO_ANY_LN:
+            if( refersToAnyLN != null )
+                msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this,
+                        SclPackage.ANY_LN__REFERRED_BY_IED_NAME, AnyLN.class, msgs );
+            return basicSetRefersToAnyLN( ( AnyLN ) otherEnd, msgs );
+        case SclPackage.IED_NAME__REFERS_TO_IED:
+            if( refersToIED != null )
+                msgs = ( ( InternalEObject ) refersToIED ).eInverseRemove( this, SclPackage.IED__REFERRED_BY_IED_NAME,
+                        IED.class, msgs );
+            return basicSetRefersToIED( ( IED ) otherEnd, msgs );
+        case SclPackage.IED_NAME__REFERS_TO_LDEVICE:
+            if( refersToLDevice != null )
+                msgs = ( ( InternalEObject ) refersToLDevice ).eInverseRemove( this,
+                        SclPackage.LDEVICE__REFERRED_BY_IED_NAME, LDevice.class, msgs );
+            return basicSetRefersToLDevice( ( LDevice ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -986,17 +1047,17 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME:
-                return basicSetParentControlWithIEDName(null, msgs);
-            case SclPackage.IED_NAME__REFERS_TO_ANY_LN:
-                return basicUnsetRefersToAnyLN(msgs);
-            case SclPackage.IED_NAME__REFERS_TO_IED:
-                return basicUnsetRefersToIED(msgs);
-            case SclPackage.IED_NAME__REFERS_TO_LDEVICE:
-                return basicUnsetRefersToLDevice(msgs);
+        switch( featureID ) {
+        case SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME:
+            return basicSetParentControlWithIEDName( null, msgs );
+        case SclPackage.IED_NAME__REFERS_TO_ANY_LN:
+            return basicUnsetRefersToAnyLN( msgs );
+        case SclPackage.IED_NAME__REFERS_TO_IED:
+            return basicUnsetRefersToIED( msgs );
+        case SclPackage.IED_NAME__REFERS_TO_LDEVICE:
+            return basicUnsetRefersToLDevice( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1006,11 +1067,12 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME:
-                return eInternalContainer().eInverseRemove(this, SclPackage.CONTROL_WITH_IED_NAME__IED_NAME, ControlWithIEDName.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME:
+            return eInternalContainer().eInverseRemove( this, SclPackage.CONTROL_WITH_IED_NAME__IED_NAME,
+                    ControlWithIEDName.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -1020,29 +1082,29 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.IED_NAME__AP_REF:
-                return getApRef();
-            case SclPackage.IED_NAME__LD_INST:
-                return getLdInst();
-            case SclPackage.IED_NAME__LN_CLASS:
-                return getLnClass();
-            case SclPackage.IED_NAME__LN_INST:
-                return getLnInst();
-            case SclPackage.IED_NAME__PREFIX:
-                return getPrefix();
-            case SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME:
-                return getParentControlWithIEDName();
-            case SclPackage.IED_NAME__REFERS_TO_ANY_LN:
-                return getRefersToAnyLN();
-            case SclPackage.IED_NAME__VALUE:
-                return getValue();
-            case SclPackage.IED_NAME__REFERS_TO_IED:
-                return getRefersToIED();
-            case SclPackage.IED_NAME__REFERS_TO_LDEVICE:
-                return getRefersToLDevice();
+        switch( featureID ) {
+        case SclPackage.IED_NAME__AP_REF:
+            return getApRef();
+        case SclPackage.IED_NAME__LD_INST:
+            return getLdInst();
+        case SclPackage.IED_NAME__LN_CLASS:
+            return getLnClass();
+        case SclPackage.IED_NAME__LN_INST:
+            return getLnInst();
+        case SclPackage.IED_NAME__PREFIX:
+            return getPrefix();
+        case SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME:
+            return getParentControlWithIEDName();
+        case SclPackage.IED_NAME__REFERS_TO_ANY_LN:
+            return getRefersToAnyLN();
+        case SclPackage.IED_NAME__VALUE:
+            return getValue();
+        case SclPackage.IED_NAME__REFERS_TO_IED:
+            return getRefersToIED();
+        case SclPackage.IED_NAME__REFERS_TO_LDEVICE:
+            return getRefersToLDevice();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -1052,39 +1114,39 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.IED_NAME__AP_REF:
-                setApRef((String)newValue);
-                return;
-            case SclPackage.IED_NAME__LD_INST:
-                setLdInst((String)newValue);
-                return;
-            case SclPackage.IED_NAME__LN_CLASS:
-                setLnClass((String)newValue);
-                return;
-            case SclPackage.IED_NAME__LN_INST:
-                setLnInst((String)newValue);
-                return;
-            case SclPackage.IED_NAME__PREFIX:
-                setPrefix((String)newValue);
-                return;
-            case SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME:
-                setParentControlWithIEDName((ControlWithIEDName)newValue);
-                return;
-            case SclPackage.IED_NAME__REFERS_TO_ANY_LN:
-                setRefersToAnyLN((AnyLN)newValue);
-                return;
-            case SclPackage.IED_NAME__VALUE:
-                setValue((String)newValue);
-                return;
-            case SclPackage.IED_NAME__REFERS_TO_IED:
-                setRefersToIED((IED)newValue);
-                return;
-            case SclPackage.IED_NAME__REFERS_TO_LDEVICE:
-                setRefersToLDevice((LDevice)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.IED_NAME__AP_REF:
+            setApRef( ( String ) newValue );
+            return;
+        case SclPackage.IED_NAME__LD_INST:
+            setLdInst( ( String ) newValue );
+            return;
+        case SclPackage.IED_NAME__LN_CLASS:
+            setLnClass( ( String ) newValue );
+            return;
+        case SclPackage.IED_NAME__LN_INST:
+            setLnInst( ( String ) newValue );
+            return;
+        case SclPackage.IED_NAME__PREFIX:
+            setPrefix( ( String ) newValue );
+            return;
+        case SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME:
+            setParentControlWithIEDName( ( ControlWithIEDName ) newValue );
+            return;
+        case SclPackage.IED_NAME__REFERS_TO_ANY_LN:
+            setRefersToAnyLN( ( AnyLN ) newValue );
+            return;
+        case SclPackage.IED_NAME__VALUE:
+            setValue( ( String ) newValue );
+            return;
+        case SclPackage.IED_NAME__REFERS_TO_IED:
+            setRefersToIED( ( IED ) newValue );
+            return;
+        case SclPackage.IED_NAME__REFERS_TO_LDEVICE:
+            setRefersToLDevice( ( LDevice ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -1094,39 +1156,39 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.IED_NAME__AP_REF:
-                unsetApRef();
-                return;
-            case SclPackage.IED_NAME__LD_INST:
-                unsetLdInst();
-                return;
-            case SclPackage.IED_NAME__LN_CLASS:
-                unsetLnClass();
-                return;
-            case SclPackage.IED_NAME__LN_INST:
-                unsetLnInst();
-                return;
-            case SclPackage.IED_NAME__PREFIX:
-                unsetPrefix();
-                return;
-            case SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME:
-                setParentControlWithIEDName((ControlWithIEDName)null);
-                return;
-            case SclPackage.IED_NAME__REFERS_TO_ANY_LN:
-                unsetRefersToAnyLN();
-                return;
-            case SclPackage.IED_NAME__VALUE:
-                unsetValue();
-                return;
-            case SclPackage.IED_NAME__REFERS_TO_IED:
-                unsetRefersToIED();
-                return;
-            case SclPackage.IED_NAME__REFERS_TO_LDEVICE:
-                unsetRefersToLDevice();
-                return;
+        switch( featureID ) {
+        case SclPackage.IED_NAME__AP_REF:
+            unsetApRef();
+            return;
+        case SclPackage.IED_NAME__LD_INST:
+            unsetLdInst();
+            return;
+        case SclPackage.IED_NAME__LN_CLASS:
+            unsetLnClass();
+            return;
+        case SclPackage.IED_NAME__LN_INST:
+            unsetLnInst();
+            return;
+        case SclPackage.IED_NAME__PREFIX:
+            unsetPrefix();
+            return;
+        case SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME:
+            setParentControlWithIEDName( ( ControlWithIEDName ) null );
+            return;
+        case SclPackage.IED_NAME__REFERS_TO_ANY_LN:
+            unsetRefersToAnyLN();
+            return;
+        case SclPackage.IED_NAME__VALUE:
+            unsetValue();
+            return;
+        case SclPackage.IED_NAME__REFERS_TO_IED:
+            unsetRefersToIED();
+            return;
+        case SclPackage.IED_NAME__REFERS_TO_LDEVICE:
+            unsetRefersToLDevice();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -1136,29 +1198,29 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.IED_NAME__AP_REF:
-                return isSetApRef();
-            case SclPackage.IED_NAME__LD_INST:
-                return isSetLdInst();
-            case SclPackage.IED_NAME__LN_CLASS:
-                return isSetLnClass();
-            case SclPackage.IED_NAME__LN_INST:
-                return isSetLnInst();
-            case SclPackage.IED_NAME__PREFIX:
-                return isSetPrefix();
-            case SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME:
-                return getParentControlWithIEDName() != null;
-            case SclPackage.IED_NAME__REFERS_TO_ANY_LN:
-                return isSetRefersToAnyLN();
-            case SclPackage.IED_NAME__VALUE:
-                return isSetValue();
-            case SclPackage.IED_NAME__REFERS_TO_IED:
-                return isSetRefersToIED();
-            case SclPackage.IED_NAME__REFERS_TO_LDEVICE:
-                return isSetRefersToLDevice();
+        switch( featureID ) {
+        case SclPackage.IED_NAME__AP_REF:
+            return isSetApRef();
+        case SclPackage.IED_NAME__LD_INST:
+            return isSetLdInst();
+        case SclPackage.IED_NAME__LN_CLASS:
+            return isSetLnClass();
+        case SclPackage.IED_NAME__LN_INST:
+            return isSetLnInst();
+        case SclPackage.IED_NAME__PREFIX:
+            return isSetPrefix();
+        case SclPackage.IED_NAME__PARENT_CONTROL_WITH_IED_NAME:
+            return getParentControlWithIEDName() != null;
+        case SclPackage.IED_NAME__REFERS_TO_ANY_LN:
+            return isSetRefersToAnyLN();
+        case SclPackage.IED_NAME__VALUE:
+            return isSetValue();
+        case SclPackage.IED_NAME__REFERS_TO_IED:
+            return isSetRefersToIED();
+        case SclPackage.IED_NAME__REFERS_TO_LDEVICE:
+            return isSetRefersToLDevice();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -1168,22 +1230,40 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (apRef: ");
-        if (apRefESet) result.append(apRef); else result.append("<unset>");
-        result.append(", ldInst: ");
-        if (ldInstESet) result.append(ldInst); else result.append("<unset>");
-        result.append(", lnClass: ");
-        if (lnClassESet) result.append(lnClass); else result.append("<unset>");
-        result.append(", lnInst: ");
-        if (lnInstESet) result.append(lnInst); else result.append("<unset>");
-        result.append(", prefix: ");
-        if (prefixESet) result.append(prefix); else result.append("<unset>");
-        result.append(", value: ");
-        if (valueESet) result.append(value); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (apRef: " );
+        if( apRefESet )
+            result.append( apRef );
+        else
+            result.append( "<unset>" );
+        result.append( ", ldInst: " );
+        if( ldInstESet )
+            result.append( ldInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnClass: " );
+        if( lnClassESet )
+            result.append( lnClass );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnInst: " );
+        if( lnInstESet )
+            result.append( lnInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", prefix: " );
+        if( prefixESet )
+            result.append( prefix );
+        else
+            result.append( "<unset>" );
+        result.append( ", value: " );
+        if( valueESet )
+            result.append( value );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -1191,22 +1271,22 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         // apRef        The reference to the access point on the IED, via which the data shall flow. Optional, only needed if the IED has more than one access point.
         // ldInst       Identifies the destination LD in the IED. Optional.
         // prefix       Destination LN prefix. Optional
         // lnClass      Destination LN class, optional. If missing, no destination LN at all
         // lnInst       Destination LN instance number, optional. If missing, either no destination LN, or lnClass = LLN0.
-        
+
         // We only set the most precise RefersTo (IED / LDevice / AnyLN)
-        
+
         String messagePrefix = "[SCL links] while resolving link from IEDName on line " + getLineNumber() + ": ";
 
-        if(( getValue() == null ) || getValue().isEmpty() ) {
+        if( ( getValue() == null ) || getValue().isEmpty() ) {
             console.warning( messagePrefix, "value is missing" );
             return;
         }
-        
+
         // find an IED with
         //   IED.name == value
         Pair< IED, Integer > ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getValue() );
@@ -1215,23 +1295,26 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess1, ied.getRight() );
             return;
         }
-        
-        if(( getLdInst() == null ) || getLdInst().isEmpty() ) {
+
+        if( ( getLdInst() == null ) || getLdInst().isEmpty() ) {
             setRefersToIED( ied.getLeft() );
-            console.info( "IEDName on line ", getLineNumber(), " refers to ", mess1, " on line ", ied.getLeft().getLineNumber() );
+            console.info( "IEDName on line ", getLineNumber(), " refers to ", mess1, " on line ",
+                    ied.getLeft().getLineNumber() );
             return;
         }
-        
+
         console.verbose( messagePrefix, "found ", mess1, " on line ", ied.getLeft().getLineNumber() );
-        
+
         Pair< AccessPoint, Integer > ap = null;
-        if(( getApRef() == null ) || getApRef().isEmpty() ) {
+        if( ( getApRef() == null ) || getApRef().isEmpty() ) {
             if( ied.getLeft().getAccessPoint().size() == 0 ) {
-                console.warning( messagePrefix, "no AccessPoint found in ied ( name = ", ied.getLeft().getName(), " )" );
+                console.warning( messagePrefix, "no AccessPoint found in ied ( name = ", ied.getLeft().getName(),
+                        " )" );
                 return;
             }
             if( ied.getLeft().getAccessPoint().size() > 1 ) {
-                console.warning( messagePrefix, "found several AccessPoint in ied ( name = ", ied.getLeft().getName(), " ) but apRef not specified" );
+                console.warning( messagePrefix, "found several AccessPoint in ied ( name = ", ied.getLeft().getName(),
+                        " ) but apRef not specified" );
                 return;
             }
             ap = Pair.of( ied.getLeft().getAccessPoint().get( 0 ), 1 );
@@ -1250,15 +1333,17 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
         if( lDevice.getLeft() == null ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess3, lDevice.getRight() );
             return;
-        }        
-        if(( getLnClass() == null ) || getLnClass().isEmpty() ) {
+        }
+        if( ( getLnClass() == null ) || getLnClass().isEmpty() ) {
             setRefersToLDevice( lDevice.getLeft() );
-            console.info( "IEDName on line ", getLineNumber(), " refers to ", mess3, " on line ", getRefersToLDevice().getLineNumber() );
+            console.info( "IEDName on line ", getLineNumber(), " refers to ", mess3, " on line ",
+                    getRefersToLDevice().getLineNumber() );
             return;
         }
         console.verbose( messagePrefix, "found ", mess3, " on line ", lDevice.getLeft().getLineNumber() );
 
-        Pair< AnyLN,Integer > anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(), getPrefix() );
+        Pair< AnyLN, Integer > anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(),
+                getPrefix() );
         String mess4 = "LN( lnClass = " + getLnClass();
         if( getLnInst() != null ) {
             mess4 += ", inst = " + getLnInst();
@@ -1270,7 +1355,8 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
             return;
         }
         setRefersToAnyLN( anyLN.getLeft() );
-        console.info( "[SCL links] ClientLN on line ", getLineNumber(), " refers to ", mess4, " on line ", getRefersToAnyLN().getLineNumber() );
+        console.info( "[SCL links] ClientLN on line ", getLineNumber(), " refers to ", mess4, " on line ",
+                getRefersToAnyLN().getLineNumber() );
     }
 
 } //IEDNameImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/InputsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/InputsImpl.java
index 1e230fa..96c470f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/InputsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/InputsImpl.java
@@ -59,7 +59,7 @@ public class InputsImpl extends UnNamingImpl implements Inputs {
      * @generated
      * @ordered
      */
-    protected EList<ExtRef> extRef;
+    protected EList< ExtRef > extRef;
 
     /**
      * <!-- begin-user-doc -->
@@ -87,8 +87,8 @@ public class InputsImpl extends UnNamingImpl implements Inputs {
      */
     @Override
     public AnyLN getParentAnyLN() {
-        if (eContainerFeatureID() != SclPackage.INPUTS__PARENT_ANY_LN) return null;
-        return (AnyLN)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.INPUTS__PARENT_ANY_LN ) return null;
+        return ( AnyLN ) eInternalContainer();
     }
 
     /**
@@ -96,8 +96,8 @@ public class InputsImpl extends UnNamingImpl implements Inputs {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAnyLN(AnyLN newParentAnyLN, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAnyLN, SclPackage.INPUTS__PARENT_ANY_LN, msgs);
+    public NotificationChain basicSetParentAnyLN( AnyLN newParentAnyLN, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAnyLN, SclPackage.INPUTS__PARENT_ANY_LN, msgs );
         return msgs;
     }
 
@@ -107,20 +107,23 @@ public class InputsImpl extends UnNamingImpl implements Inputs {
      * @generated
      */
     @Override
-    public void setParentAnyLN(AnyLN newParentAnyLN) {
-        if (newParentAnyLN != eInternalContainer() || (eContainerFeatureID() != SclPackage.INPUTS__PARENT_ANY_LN && newParentAnyLN != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAnyLN))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAnyLN( AnyLN newParentAnyLN ) {
+        if( newParentAnyLN != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.INPUTS__PARENT_ANY_LN && newParentAnyLN != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAnyLN ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAnyLN != null)
-                msgs = ((InternalEObject)newParentAnyLN).eInverseAdd(this, SclPackage.ANY_LN__INPUTS, AnyLN.class, msgs);
-            msgs = basicSetParentAnyLN(newParentAnyLN, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAnyLN != null )
+                msgs = ( ( InternalEObject ) newParentAnyLN ).eInverseAdd( this, SclPackage.ANY_LN__INPUTS, AnyLN.class,
+                        msgs );
+            msgs = basicSetParentAnyLN( newParentAnyLN, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.INPUTS__PARENT_ANY_LN, newParentAnyLN, newParentAnyLN));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.INPUTS__PARENT_ANY_LN, newParentAnyLN,
+                    newParentAnyLN ) );
     }
 
     /**
@@ -129,9 +132,10 @@ public class InputsImpl extends UnNamingImpl implements Inputs {
      * @generated
      */
     @Override
-    public EList<ExtRef> getExtRef() {
-        if (extRef == null) {
-            extRef = new EObjectContainmentWithInverseEList.Unsettable<ExtRef>(ExtRef.class, this, SclPackage.INPUTS__EXT_REF, SclPackage.EXT_REF__PARENT_INPUTS);
+    public EList< ExtRef > getExtRef() {
+        if( extRef == null ) {
+            extRef = new EObjectContainmentWithInverseEList.Unsettable< ExtRef >( ExtRef.class, this,
+                    SclPackage.INPUTS__EXT_REF, SclPackage.EXT_REF__PARENT_INPUTS );
         }
         return extRef;
     }
@@ -143,7 +147,7 @@ public class InputsImpl extends UnNamingImpl implements Inputs {
      */
     @Override
     public void unsetExtRef() {
-        if (extRef != null) ((InternalEList.Unsettable<?>)extRef).unset();
+        if( extRef != null ) ( ( InternalEList.Unsettable< ? > ) extRef ).unset();
     }
 
     /**
@@ -153,7 +157,7 @@ public class InputsImpl extends UnNamingImpl implements Inputs {
      */
     @Override
     public boolean isSetExtRef() {
-        return extRef != null && ((InternalEList.Unsettable<?>)extRef).isSet();
+        return extRef != null && ( ( InternalEList.Unsettable< ? > ) extRef ).isSet();
     }
 
     /**
@@ -164,15 +168,16 @@ public class InputsImpl extends UnNamingImpl implements Inputs {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.INPUTS__PARENT_ANY_LN:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAnyLN((AnyLN)otherEnd, msgs);
-            case SclPackage.INPUTS__EXT_REF:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getExtRef()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.INPUTS__PARENT_ANY_LN:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAnyLN( ( AnyLN ) otherEnd, msgs );
+        case SclPackage.INPUTS__EXT_REF:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getExtRef() ).basicAdd( otherEnd,
+                    msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -182,13 +187,13 @@ public class InputsImpl extends UnNamingImpl implements Inputs {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.INPUTS__PARENT_ANY_LN:
-                return basicSetParentAnyLN(null, msgs);
-            case SclPackage.INPUTS__EXT_REF:
-                return ((InternalEList<?>)getExtRef()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.INPUTS__PARENT_ANY_LN:
+            return basicSetParentAnyLN( null, msgs );
+        case SclPackage.INPUTS__EXT_REF:
+            return ( ( InternalEList< ? > ) getExtRef() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -198,11 +203,11 @@ public class InputsImpl extends UnNamingImpl implements Inputs {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.INPUTS__PARENT_ANY_LN:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ANY_LN__INPUTS, AnyLN.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.INPUTS__PARENT_ANY_LN:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ANY_LN__INPUTS, AnyLN.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -212,13 +217,13 @@ public class InputsImpl extends UnNamingImpl implements Inputs {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.INPUTS__PARENT_ANY_LN:
-                return getParentAnyLN();
-            case SclPackage.INPUTS__EXT_REF:
-                return getExtRef();
+        switch( featureID ) {
+        case SclPackage.INPUTS__PARENT_ANY_LN:
+            return getParentAnyLN();
+        case SclPackage.INPUTS__EXT_REF:
+            return getExtRef();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -229,16 +234,16 @@ public class InputsImpl extends UnNamingImpl implements Inputs {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.INPUTS__PARENT_ANY_LN:
-                setParentAnyLN((AnyLN)newValue);
-                return;
-            case SclPackage.INPUTS__EXT_REF:
-                getExtRef().clear();
-                getExtRef().addAll((Collection<? extends ExtRef>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.INPUTS__PARENT_ANY_LN:
+            setParentAnyLN( ( AnyLN ) newValue );
+            return;
+        case SclPackage.INPUTS__EXT_REF:
+            getExtRef().clear();
+            getExtRef().addAll( ( Collection< ? extends ExtRef > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -248,15 +253,15 @@ public class InputsImpl extends UnNamingImpl implements Inputs {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.INPUTS__PARENT_ANY_LN:
-                setParentAnyLN((AnyLN)null);
-                return;
-            case SclPackage.INPUTS__EXT_REF:
-                unsetExtRef();
-                return;
+        switch( featureID ) {
+        case SclPackage.INPUTS__PARENT_ANY_LN:
+            setParentAnyLN( ( AnyLN ) null );
+            return;
+        case SclPackage.INPUTS__EXT_REF:
+            unsetExtRef();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -266,13 +271,13 @@ public class InputsImpl extends UnNamingImpl implements Inputs {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.INPUTS__PARENT_ANY_LN:
-                return getParentAnyLN() != null;
-            case SclPackage.INPUTS__EXT_REF:
-                return isSetExtRef();
+        switch( featureID ) {
+        case SclPackage.INPUTS__PARENT_ANY_LN:
+            return getParentAnyLN() != null;
+        case SclPackage.INPUTS__EXT_REF:
+            return isSetExtRef();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //InputsImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IssuerNameImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IssuerNameImpl.java
index b687729..482b9c7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IssuerNameImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IssuerNameImpl.java
@@ -71,8 +71,8 @@ public class IssuerNameImpl extends CertImpl implements IssuerName {
      */
     @Override
     public Certificate getParentCertificate() {
-        if (eContainerFeatureID() != SclPackage.ISSUER_NAME__PARENT_CERTIFICATE) return null;
-        return (Certificate)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.ISSUER_NAME__PARENT_CERTIFICATE ) return null;
+        return ( Certificate ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class IssuerNameImpl extends CertImpl implements IssuerName {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentCertificate(Certificate newParentCertificate, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentCertificate, SclPackage.ISSUER_NAME__PARENT_CERTIFICATE, msgs);
+    public NotificationChain basicSetParentCertificate( Certificate newParentCertificate, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentCertificate, SclPackage.ISSUER_NAME__PARENT_CERTIFICATE,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class IssuerNameImpl extends CertImpl implements IssuerName {
      * @generated
      */
     @Override
-    public void setParentCertificate(Certificate newParentCertificate) {
-        if (newParentCertificate != eInternalContainer() || (eContainerFeatureID() != SclPackage.ISSUER_NAME__PARENT_CERTIFICATE && newParentCertificate != null)) {
-            if (EcoreUtil.isAncestor(this, newParentCertificate))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentCertificate( Certificate newParentCertificate ) {
+        if( newParentCertificate != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.ISSUER_NAME__PARENT_CERTIFICATE
+                        && newParentCertificate != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentCertificate ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentCertificate != null)
-                msgs = ((InternalEObject)newParentCertificate).eInverseAdd(this, SclPackage.CERTIFICATE__ISSUER_NAME, Certificate.class, msgs);
-            msgs = basicSetParentCertificate(newParentCertificate, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentCertificate != null )
+                msgs = ( ( InternalEObject ) newParentCertificate ).eInverseAdd( this,
+                        SclPackage.CERTIFICATE__ISSUER_NAME, Certificate.class, msgs );
+            msgs = basicSetParentCertificate( newParentCertificate, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.ISSUER_NAME__PARENT_CERTIFICATE, newParentCertificate, newParentCertificate));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ISSUER_NAME__PARENT_CERTIFICATE,
+                    newParentCertificate, newParentCertificate ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class IssuerNameImpl extends CertImpl implements IssuerName {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ISSUER_NAME__PARENT_CERTIFICATE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentCertificate((Certificate)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.ISSUER_NAME__PARENT_CERTIFICATE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentCertificate( ( Certificate ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class IssuerNameImpl extends CertImpl implements IssuerName {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.ISSUER_NAME__PARENT_CERTIFICATE:
-                return basicSetParentCertificate(null, msgs);
+        switch( featureID ) {
+        case SclPackage.ISSUER_NAME__PARENT_CERTIFICATE:
+            return basicSetParentCertificate( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class IssuerNameImpl extends CertImpl implements IssuerName {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.ISSUER_NAME__PARENT_CERTIFICATE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.CERTIFICATE__ISSUER_NAME, Certificate.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.ISSUER_NAME__PARENT_CERTIFICATE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.CERTIFICATE__ISSUER_NAME, Certificate.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class IssuerNameImpl extends CertImpl implements IssuerName {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.ISSUER_NAME__PARENT_CERTIFICATE:
-                return getParentCertificate();
+        switch( featureID ) {
+        case SclPackage.ISSUER_NAME__PARENT_CERTIFICATE:
+            return getParentCertificate();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class IssuerNameImpl extends CertImpl implements IssuerName {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.ISSUER_NAME__PARENT_CERTIFICATE:
-                setParentCertificate((Certificate)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.ISSUER_NAME__PARENT_CERTIFICATE:
+            setParentCertificate( ( Certificate ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class IssuerNameImpl extends CertImpl implements IssuerName {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ISSUER_NAME__PARENT_CERTIFICATE:
-                setParentCertificate((Certificate)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.ISSUER_NAME__PARENT_CERTIFICATE:
+            setParentCertificate( ( Certificate ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class IssuerNameImpl extends CertImpl implements IssuerName {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.ISSUER_NAME__PARENT_CERTIFICATE:
-                return getParentCertificate() != null;
+        switch( featureID ) {
+        case SclPackage.ISSUER_NAME__PARENT_CERTIFICATE:
+            return getParentCertificate() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //IssuerNameImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java
index c7440cf..8c01993 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java
@@ -169,8 +169,9 @@ public class KDCImpl extends SclObjectImpl implements KDC {
         apName = newApName;
         boolean oldApNameESet = apNameESet;
         apNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.KDC__AP_NAME, oldApName, apName, !oldApNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.KDC__AP_NAME, oldApName, apName,
+                    !oldApNameESet ) );
     }
 
     /**
@@ -184,8 +185,9 @@ public class KDCImpl extends SclObjectImpl implements KDC {
         boolean oldApNameESet = apNameESet;
         apName = AP_NAME_EDEFAULT;
         apNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.KDC__AP_NAME, oldApName, AP_NAME_EDEFAULT, oldApNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.KDC__AP_NAME, oldApName,
+                    AP_NAME_EDEFAULT, oldApNameESet ) );
     }
 
     /**
@@ -219,8 +221,9 @@ public class KDCImpl extends SclObjectImpl implements KDC {
         iedName = newIedName;
         boolean oldIedNameESet = iedNameESet;
         iedNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.KDC__IED_NAME, oldIedName, iedName, !oldIedNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.KDC__IED_NAME, oldIedName, iedName,
+                    !oldIedNameESet ) );
     }
 
     /**
@@ -234,8 +237,9 @@ public class KDCImpl extends SclObjectImpl implements KDC {
         boolean oldIedNameESet = iedNameESet;
         iedName = IED_NAME_EDEFAULT;
         iedNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.KDC__IED_NAME, oldIedName, IED_NAME_EDEFAULT, oldIedNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.KDC__IED_NAME, oldIedName,
+                    IED_NAME_EDEFAULT, oldIedNameESet ) );
     }
 
     /**
@@ -255,8 +259,8 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      */
     @Override
     public IED getParentIED() {
-        if (eContainerFeatureID() != SclPackage.KDC__PARENT_IED) return null;
-        return (IED)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.KDC__PARENT_IED ) return null;
+        return ( IED ) eInternalContainer();
     }
 
     /**
@@ -264,8 +268,8 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentIED(IED newParentIED, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentIED, SclPackage.KDC__PARENT_IED, msgs);
+    public NotificationChain basicSetParentIED( IED newParentIED, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentIED, SclPackage.KDC__PARENT_IED, msgs );
         return msgs;
     }
 
@@ -275,20 +279,22 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      * @generated
      */
     @Override
-    public void setParentIED(IED newParentIED) {
-        if (newParentIED != eInternalContainer() || (eContainerFeatureID() != SclPackage.KDC__PARENT_IED && newParentIED != null)) {
-            if (EcoreUtil.isAncestor(this, newParentIED))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentIED( IED newParentIED ) {
+        if( newParentIED != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.KDC__PARENT_IED && newParentIED != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentIED ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentIED != null)
-                msgs = ((InternalEObject)newParentIED).eInverseAdd(this, SclPackage.IED__KDC, IED.class, msgs);
-            msgs = basicSetParentIED(newParentIED, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentIED != null )
+                msgs = ( ( InternalEObject ) newParentIED ).eInverseAdd( this, SclPackage.IED__KDC, IED.class, msgs );
+            msgs = basicSetParentIED( newParentIED, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.KDC__PARENT_IED, newParentIED, newParentIED));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.KDC__PARENT_IED, newParentIED,
+                    newParentIED ) );
     }
 
     /**
@@ -306,14 +312,19 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToAccessPoint(AccessPoint newRefersToAccessPoint, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToAccessPoint( AccessPoint newRefersToAccessPoint, NotificationChain msgs ) {
         AccessPoint oldRefersToAccessPoint = refersToAccessPoint;
         refersToAccessPoint = newRefersToAccessPoint;
         boolean oldRefersToAccessPointESet = refersToAccessPointESet;
         refersToAccessPointESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.KDC__REFERS_TO_ACCESS_POINT, oldRefersToAccessPoint, newRefersToAccessPoint, !oldRefersToAccessPointESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.KDC__REFERS_TO_ACCESS_POINT, oldRefersToAccessPoint, newRefersToAccessPoint,
+                    !oldRefersToAccessPointESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -324,21 +335,24 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      * @generated
      */
     @Override
-    public void setRefersToAccessPoint(AccessPoint newRefersToAccessPoint) {
-        if (newRefersToAccessPoint != refersToAccessPoint) {
+    public void setRefersToAccessPoint( AccessPoint newRefersToAccessPoint ) {
+        if( newRefersToAccessPoint != refersToAccessPoint ) {
             NotificationChain msgs = null;
-            if (refersToAccessPoint != null)
-                msgs = ((InternalEObject)refersToAccessPoint).eInverseRemove(this, SclPackage.ACCESS_POINT__REFERRED_BY_KDC, AccessPoint.class, msgs);
-            if (newRefersToAccessPoint != null)
-                msgs = ((InternalEObject)newRefersToAccessPoint).eInverseAdd(this, SclPackage.ACCESS_POINT__REFERRED_BY_KDC, AccessPoint.class, msgs);
-            msgs = basicSetRefersToAccessPoint(newRefersToAccessPoint, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToAccessPoint != null )
+                msgs = ( ( InternalEObject ) refersToAccessPoint ).eInverseRemove( this,
+                        SclPackage.ACCESS_POINT__REFERRED_BY_KDC, AccessPoint.class, msgs );
+            if( newRefersToAccessPoint != null )
+                msgs = ( ( InternalEObject ) newRefersToAccessPoint ).eInverseAdd( this,
+                        SclPackage.ACCESS_POINT__REFERRED_BY_KDC, AccessPoint.class, msgs );
+            msgs = basicSetRefersToAccessPoint( newRefersToAccessPoint, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAccessPointESet = refersToAccessPointESet;
             refersToAccessPointESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.KDC__REFERS_TO_ACCESS_POINT, newRefersToAccessPoint, newRefersToAccessPoint, !oldRefersToAccessPointESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.KDC__REFERS_TO_ACCESS_POINT,
+                        newRefersToAccessPoint, newRefersToAccessPoint, !oldRefersToAccessPointESet ) );
         }
     }
 
@@ -347,14 +361,18 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToAccessPoint(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToAccessPoint( NotificationChain msgs ) {
         AccessPoint oldRefersToAccessPoint = refersToAccessPoint;
         refersToAccessPoint = null;
         boolean oldRefersToAccessPointESet = refersToAccessPointESet;
         refersToAccessPointESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.KDC__REFERS_TO_ACCESS_POINT, oldRefersToAccessPoint, null, oldRefersToAccessPointESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.KDC__REFERS_TO_ACCESS_POINT, oldRefersToAccessPoint, null, oldRefersToAccessPointESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -366,17 +384,19 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      */
     @Override
     public void unsetRefersToAccessPoint() {
-        if (refersToAccessPoint != null) {
+        if( refersToAccessPoint != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToAccessPoint).eInverseRemove(this, SclPackage.ACCESS_POINT__REFERRED_BY_KDC, AccessPoint.class, msgs);
-            msgs = basicUnsetRefersToAccessPoint(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToAccessPoint ).eInverseRemove( this,
+                    SclPackage.ACCESS_POINT__REFERRED_BY_KDC, AccessPoint.class, msgs );
+            msgs = basicUnsetRefersToAccessPoint( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAccessPointESet = refersToAccessPointESet;
             refersToAccessPointESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.KDC__REFERS_TO_ACCESS_POINT, null, null, oldRefersToAccessPointESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.KDC__REFERS_TO_ACCESS_POINT, null,
+                        null, oldRefersToAccessPointESet ) );
         }
     }
 
@@ -397,17 +417,18 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.KDC__PARENT_IED:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentIED((IED)otherEnd, msgs);
-            case SclPackage.KDC__REFERS_TO_ACCESS_POINT:
-                if (refersToAccessPoint != null)
-                    msgs = ((InternalEObject)refersToAccessPoint).eInverseRemove(this, SclPackage.ACCESS_POINT__REFERRED_BY_KDC, AccessPoint.class, msgs);
-                return basicSetRefersToAccessPoint((AccessPoint)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.KDC__PARENT_IED:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentIED( ( IED ) otherEnd, msgs );
+        case SclPackage.KDC__REFERS_TO_ACCESS_POINT:
+            if( refersToAccessPoint != null )
+                msgs = ( ( InternalEObject ) refersToAccessPoint ).eInverseRemove( this,
+                        SclPackage.ACCESS_POINT__REFERRED_BY_KDC, AccessPoint.class, msgs );
+            return basicSetRefersToAccessPoint( ( AccessPoint ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -417,13 +438,13 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.KDC__PARENT_IED:
-                return basicSetParentIED(null, msgs);
-            case SclPackage.KDC__REFERS_TO_ACCESS_POINT:
-                return basicUnsetRefersToAccessPoint(msgs);
+        switch( featureID ) {
+        case SclPackage.KDC__PARENT_IED:
+            return basicSetParentIED( null, msgs );
+        case SclPackage.KDC__REFERS_TO_ACCESS_POINT:
+            return basicUnsetRefersToAccessPoint( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -433,11 +454,11 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.KDC__PARENT_IED:
-                return eInternalContainer().eInverseRemove(this, SclPackage.IED__KDC, IED.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.KDC__PARENT_IED:
+            return eInternalContainer().eInverseRemove( this, SclPackage.IED__KDC, IED.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -447,17 +468,17 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.KDC__AP_NAME:
-                return getApName();
-            case SclPackage.KDC__IED_NAME:
-                return getIedName();
-            case SclPackage.KDC__PARENT_IED:
-                return getParentIED();
-            case SclPackage.KDC__REFERS_TO_ACCESS_POINT:
-                return getRefersToAccessPoint();
+        switch( featureID ) {
+        case SclPackage.KDC__AP_NAME:
+            return getApName();
+        case SclPackage.KDC__IED_NAME:
+            return getIedName();
+        case SclPackage.KDC__PARENT_IED:
+            return getParentIED();
+        case SclPackage.KDC__REFERS_TO_ACCESS_POINT:
+            return getRefersToAccessPoint();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -467,21 +488,21 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.KDC__AP_NAME:
-                setApName((String)newValue);
-                return;
-            case SclPackage.KDC__IED_NAME:
-                setIedName((String)newValue);
-                return;
-            case SclPackage.KDC__PARENT_IED:
-                setParentIED((IED)newValue);
-                return;
-            case SclPackage.KDC__REFERS_TO_ACCESS_POINT:
-                setRefersToAccessPoint((AccessPoint)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.KDC__AP_NAME:
+            setApName( ( String ) newValue );
+            return;
+        case SclPackage.KDC__IED_NAME:
+            setIedName( ( String ) newValue );
+            return;
+        case SclPackage.KDC__PARENT_IED:
+            setParentIED( ( IED ) newValue );
+            return;
+        case SclPackage.KDC__REFERS_TO_ACCESS_POINT:
+            setRefersToAccessPoint( ( AccessPoint ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -491,21 +512,21 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.KDC__AP_NAME:
-                unsetApName();
-                return;
-            case SclPackage.KDC__IED_NAME:
-                unsetIedName();
-                return;
-            case SclPackage.KDC__PARENT_IED:
-                setParentIED((IED)null);
-                return;
-            case SclPackage.KDC__REFERS_TO_ACCESS_POINT:
-                unsetRefersToAccessPoint();
-                return;
+        switch( featureID ) {
+        case SclPackage.KDC__AP_NAME:
+            unsetApName();
+            return;
+        case SclPackage.KDC__IED_NAME:
+            unsetIedName();
+            return;
+        case SclPackage.KDC__PARENT_IED:
+            setParentIED( ( IED ) null );
+            return;
+        case SclPackage.KDC__REFERS_TO_ACCESS_POINT:
+            unsetRefersToAccessPoint();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -515,17 +536,17 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.KDC__AP_NAME:
-                return isSetApName();
-            case SclPackage.KDC__IED_NAME:
-                return isSetIedName();
-            case SclPackage.KDC__PARENT_IED:
-                return getParentIED() != null;
-            case SclPackage.KDC__REFERS_TO_ACCESS_POINT:
-                return isSetRefersToAccessPoint();
+        switch( featureID ) {
+        case SclPackage.KDC__AP_NAME:
+            return isSetApName();
+        case SclPackage.KDC__IED_NAME:
+            return isSetIedName();
+        case SclPackage.KDC__PARENT_IED:
+            return getParentIED() != null;
+        case SclPackage.KDC__REFERS_TO_ACCESS_POINT:
+            return isSetRefersToAccessPoint();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -535,14 +556,20 @@ public class KDCImpl extends SclObjectImpl implements KDC {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (apName: ");
-        if (apNameESet) result.append(apName); else result.append("<unset>");
-        result.append(", iedName: ");
-        if (iedNameESet) result.append(iedName); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (apName: " );
+        if( apNameESet )
+            result.append( apName );
+        else
+            result.append( "<unset>" );
+        result.append( ", iedName: " );
+        if( iedNameESet )
+            result.append( iedName );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -550,14 +577,14 @@ public class KDCImpl extends SclObjectImpl implements KDC {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         String messagePrefix = "[SCL links] while resolving link from KDC on line " + getLineNumber() + ": ";
 
-        if(( getIedName() == null ) || getIedName().isEmpty() ) {
+        if( ( getIedName() == null ) || getIedName().isEmpty() ) {
             console.warning( messagePrefix, "iedName is missing" );
             return;
         }
-        if(( getApName() == null ) || getApName().isEmpty() ) {
+        if( ( getApName() == null ) || getApName().isEmpty() ) {
             console.warning( messagePrefix, "apName is missing" );
             return;
         }
@@ -571,7 +598,7 @@ public class KDCImpl extends SclObjectImpl implements KDC {
             return;
         }
         console.verbose( messagePrefix, "found ", mess1, " on line ", ied.getLeft().getLineNumber() );
-        
+
         Pair< AccessPoint, Integer > ap = SclUtilities.getAccessPoint( ied.getLeft(), getApName() );
         String mess2 = "AccessPoint( name = " + getApName() + " )";
         if( ap.getLeft() == null ) {
@@ -579,7 +606,8 @@ public class KDCImpl extends SclObjectImpl implements KDC {
             return;
         }
         setRefersToAccessPoint( ap.getLeft() );
-        console.info( "[SCL links] KDC on line ", getLineNumber(), " refers to ", mess2, " on line ", getRefersToAccessPoint().getLineNumber() );
+        console.info( "[SCL links] KDC on line ", getLineNumber(), " refers to ", mess2, " on line ",
+                getRefersToAccessPoint().getLineNumber() );
     }
 
 } //KDCImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LDeviceImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LDeviceImpl.java
index b6928d7..8fbdabe 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LDeviceImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LDeviceImpl.java
@@ -216,8 +216,9 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
         inst = newInst;
         boolean oldInstESet = instESet;
         instESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LDEVICE__INST, oldInst, inst, !oldInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LDEVICE__INST, oldInst, inst,
+                    !oldInstESet ) );
     }
 
     /**
@@ -231,8 +232,9 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
         boolean oldInstESet = instESet;
         inst = INST_EDEFAULT;
         instESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LDEVICE__INST, oldInst, INST_EDEFAULT, oldInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LDEVICE__INST, oldInst, INST_EDEFAULT,
+                    oldInstESet ) );
     }
 
     /**
@@ -250,6 +252,7 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      * <!-- end-user-doc -->
      * @generated NOT because the default value must be computed
      */
+    @Override
     public String getLdName() {
         // the default is the IED name concatenated with the inst
         if( isSetLdName() ) {
@@ -269,8 +272,9 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
         ldName = newLdName;
         boolean oldLdNameESet = ldNameESet;
         ldNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LDEVICE__LD_NAME, oldLdName, ldName, !oldLdNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LDEVICE__LD_NAME, oldLdName, ldName,
+                    !oldLdNameESet ) );
     }
 
     /**
@@ -284,8 +288,9 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
         boolean oldLdNameESet = ldNameESet;
         ldName = LD_NAME_EDEFAULT;
         ldNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LDEVICE__LD_NAME, oldLdName, LD_NAME_EDEFAULT, oldLdNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LDEVICE__LD_NAME, oldLdName,
+                    LD_NAME_EDEFAULT, oldLdNameESet ) );
     }
 
     /**
@@ -318,9 +323,13 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
         accessControl = newAccessControl;
         boolean oldAccessControlESet = accessControlESet;
         accessControlESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.LDEVICE__ACCESS_CONTROL, oldAccessControl, newAccessControl, !oldAccessControlESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.LDEVICE__ACCESS_CONTROL, oldAccessControl, newAccessControl, !oldAccessControlESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -332,20 +341,23 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public void setAccessControl( AccessControl newAccessControl ) {
-        if (newAccessControl != accessControl) {
+        if( newAccessControl != accessControl ) {
             NotificationChain msgs = null;
-            if (accessControl != null)
-                msgs = ((InternalEObject)accessControl).eInverseRemove(this, SclPackage.ACCESS_CONTROL__PARENT_LDEVICE, AccessControl.class, msgs);
-            if (newAccessControl != null)
-                msgs = ((InternalEObject)newAccessControl).eInverseAdd(this, SclPackage.ACCESS_CONTROL__PARENT_LDEVICE, AccessControl.class, msgs);
-            msgs = basicSetAccessControl(newAccessControl, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( accessControl != null )
+                msgs = ( ( InternalEObject ) accessControl ).eInverseRemove( this,
+                        SclPackage.ACCESS_CONTROL__PARENT_LDEVICE, AccessControl.class, msgs );
+            if( newAccessControl != null )
+                msgs = ( ( InternalEObject ) newAccessControl ).eInverseAdd( this,
+                        SclPackage.ACCESS_CONTROL__PARENT_LDEVICE, AccessControl.class, msgs );
+            msgs = basicSetAccessControl( newAccessControl, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldAccessControlESet = accessControlESet;
             accessControlESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LDEVICE__ACCESS_CONTROL, newAccessControl, newAccessControl, !oldAccessControlESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LDEVICE__ACCESS_CONTROL,
+                        newAccessControl, newAccessControl, !oldAccessControlESet ) );
         }
     }
 
@@ -359,9 +371,13 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
         accessControl = null;
         boolean oldAccessControlESet = accessControlESet;
         accessControlESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.LDEVICE__ACCESS_CONTROL, oldAccessControl, null, oldAccessControlESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.LDEVICE__ACCESS_CONTROL, oldAccessControl, null, oldAccessControlESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -373,17 +389,19 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public void unsetAccessControl() {
-        if (accessControl != null) {
+        if( accessControl != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)accessControl).eInverseRemove(this, SclPackage.ACCESS_CONTROL__PARENT_LDEVICE, AccessControl.class, msgs);
-            msgs = basicUnsetAccessControl(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) accessControl ).eInverseRemove( this,
+                    SclPackage.ACCESS_CONTROL__PARENT_LDEVICE, AccessControl.class, msgs );
+            msgs = basicUnsetAccessControl( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldAccessControlESet = accessControlESet;
             accessControlESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LDEVICE__ACCESS_CONTROL, null, null, oldAccessControlESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LDEVICE__ACCESS_CONTROL, null,
+                        null, oldAccessControlESet ) );
         }
     }
 
@@ -404,8 +422,8 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public Server getParentServer() {
-        if (eContainerFeatureID() != SclPackage.LDEVICE__PARENT_SERVER) return null;
-        return (Server)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.LDEVICE__PARENT_SERVER ) return null;
+        return ( Server ) eInternalContainer();
     }
 
     /**
@@ -413,8 +431,8 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServer(Server newParentServer, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServer, SclPackage.LDEVICE__PARENT_SERVER, msgs);
+    public NotificationChain basicSetParentServer( Server newParentServer, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServer, SclPackage.LDEVICE__PARENT_SERVER, msgs );
         return msgs;
     }
 
@@ -424,20 +442,23 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      * @generated
      */
     @Override
-    public void setParentServer(Server newParentServer) {
-        if (newParentServer != eInternalContainer() || (eContainerFeatureID() != SclPackage.LDEVICE__PARENT_SERVER && newParentServer != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServer))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServer( Server newParentServer ) {
+        if( newParentServer != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.LDEVICE__PARENT_SERVER && newParentServer != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServer ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServer != null)
-                msgs = ((InternalEObject)newParentServer).eInverseAdd(this, SclPackage.SERVER__LDEVICE, Server.class, msgs);
-            msgs = basicSetParentServer(newParentServer, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServer != null )
+                msgs = ( ( InternalEObject ) newParentServer ).eInverseAdd( this, SclPackage.SERVER__LDEVICE,
+                        Server.class, msgs );
+            msgs = basicSetParentServer( newParentServer, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LDEVICE__PARENT_SERVER, newParentServer, newParentServer));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LDEVICE__PARENT_SERVER, newParentServer,
+                    newParentServer ) );
     }
 
     /**
@@ -447,8 +468,8 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public FeatureMap getAnyLN() {
-        if (anyLN == null) {
-            anyLN = new BasicFeatureMap(this, SclPackage.LDEVICE__ANY_LN);
+        if( anyLN == null ) {
+            anyLN = new BasicFeatureMap( this, SclPackage.LDEVICE__ANY_LN );
         }
         return anyLN;
     }
@@ -459,8 +480,8 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      * @generated
      */
     @Override
-    public EList<LN> getLN() {
-        return getAnyLN().list(SclPackage.eINSTANCE.getLDevice_LN());
+    public EList< LN > getLN() {
+        return getAnyLN().list( SclPackage.eINSTANCE.getLDevice_LN() );
     }
 
     /**
@@ -470,7 +491,7 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public void unsetLN() {
-        ((FeatureMap.Internal)getAnyLN()).clear(SclPackage.eINSTANCE.getLDevice_LN());
+        ( ( FeatureMap.Internal ) getAnyLN() ).clear( SclPackage.eINSTANCE.getLDevice_LN() );
     }
 
     /**
@@ -480,7 +501,7 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public boolean isSetLN() {
-        return !((FeatureMap.Internal)getAnyLN()).isEmpty(SclPackage.eINSTANCE.getLDevice_LN());
+        return !( ( FeatureMap.Internal ) getAnyLN() ).isEmpty( SclPackage.eINSTANCE.getLDevice_LN() );
     }
 
     /**
@@ -498,14 +519,19 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetReferredByIEDName(IEDName newReferredByIEDName, NotificationChain msgs) {
+    public NotificationChain basicSetReferredByIEDName( IEDName newReferredByIEDName, NotificationChain msgs ) {
         IEDName oldReferredByIEDName = referredByIEDName;
         referredByIEDName = newReferredByIEDName;
         boolean oldReferredByIEDNameESet = referredByIEDNameESet;
         referredByIEDNameESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.LDEVICE__REFERRED_BY_IED_NAME, oldReferredByIEDName, newReferredByIEDName, !oldReferredByIEDNameESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.LDEVICE__REFERRED_BY_IED_NAME, oldReferredByIEDName, newReferredByIEDName,
+                    !oldReferredByIEDNameESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -516,21 +542,24 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      * @generated
      */
     @Override
-    public void setReferredByIEDName(IEDName newReferredByIEDName) {
-        if (newReferredByIEDName != referredByIEDName) {
+    public void setReferredByIEDName( IEDName newReferredByIEDName ) {
+        if( newReferredByIEDName != referredByIEDName ) {
             NotificationChain msgs = null;
-            if (referredByIEDName != null)
-                msgs = ((InternalEObject)referredByIEDName).eInverseRemove(this, SclPackage.IED_NAME__REFERS_TO_LDEVICE, IEDName.class, msgs);
-            if (newReferredByIEDName != null)
-                msgs = ((InternalEObject)newReferredByIEDName).eInverseAdd(this, SclPackage.IED_NAME__REFERS_TO_LDEVICE, IEDName.class, msgs);
-            msgs = basicSetReferredByIEDName(newReferredByIEDName, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( referredByIEDName != null )
+                msgs = ( ( InternalEObject ) referredByIEDName ).eInverseRemove( this,
+                        SclPackage.IED_NAME__REFERS_TO_LDEVICE, IEDName.class, msgs );
+            if( newReferredByIEDName != null )
+                msgs = ( ( InternalEObject ) newReferredByIEDName ).eInverseAdd( this,
+                        SclPackage.IED_NAME__REFERS_TO_LDEVICE, IEDName.class, msgs );
+            msgs = basicSetReferredByIEDName( newReferredByIEDName, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldReferredByIEDNameESet = referredByIEDNameESet;
             referredByIEDNameESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LDEVICE__REFERRED_BY_IED_NAME, newReferredByIEDName, newReferredByIEDName, !oldReferredByIEDNameESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LDEVICE__REFERRED_BY_IED_NAME,
+                        newReferredByIEDName, newReferredByIEDName, !oldReferredByIEDNameESet ) );
         }
     }
 
@@ -539,14 +568,18 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetReferredByIEDName(NotificationChain msgs) {
+    public NotificationChain basicUnsetReferredByIEDName( NotificationChain msgs ) {
         IEDName oldReferredByIEDName = referredByIEDName;
         referredByIEDName = null;
         boolean oldReferredByIEDNameESet = referredByIEDNameESet;
         referredByIEDNameESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.LDEVICE__REFERRED_BY_IED_NAME, oldReferredByIEDName, null, oldReferredByIEDNameESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.LDEVICE__REFERRED_BY_IED_NAME, oldReferredByIEDName, null, oldReferredByIEDNameESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -558,17 +591,19 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public void unsetReferredByIEDName() {
-        if (referredByIEDName != null) {
+        if( referredByIEDName != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)referredByIEDName).eInverseRemove(this, SclPackage.IED_NAME__REFERS_TO_LDEVICE, IEDName.class, msgs);
-            msgs = basicUnsetReferredByIEDName(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) referredByIEDName ).eInverseRemove( this,
+                    SclPackage.IED_NAME__REFERS_TO_LDEVICE, IEDName.class, msgs );
+            msgs = basicUnsetReferredByIEDName( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldReferredByIEDNameESet = referredByIEDNameESet;
             referredByIEDNameESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LDEVICE__REFERRED_BY_IED_NAME, null, null, oldReferredByIEDNameESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LDEVICE__REFERRED_BY_IED_NAME,
+                        null, null, oldReferredByIEDNameESet ) );
         }
     }
 
@@ -590,80 +625,76 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
     @Override
     public String getNamespace() {
         if( getLN0() == null ) return null;
-        List< DOI > namPltDoi =
-                getLN0()
+        List< DOI > namPltDoi = getLN0()
                 .getDOI()
                 .stream()
-                .filter( doi -> "NamPlt".equals( doi.getName() ))
+                .filter( doi -> "NamPlt".equals( doi.getName() ) )
                 .collect( Collectors.toList() );
         if( namPltDoi.size() == 1 ) {
-            List< DAI > ldNsDai =
-                    namPltDoi
+            List< DAI > ldNsDai = namPltDoi
                     .get( 0 )
                     .getDAI()
                     .stream()
-                    .filter( dai -> "ldNs".equals(  dai.getName() ))
+                    .filter( dai -> "ldNs".equals( dai.getName() ) )
                     .collect( Collectors.toList() );
             if( ldNsDai.size() == 1 ) {
-                if((         ldNsDai.get( 0 ).getVal().size() == 1 )
+                if( ( ldNsDai.get( 0 ).getVal().size() == 1 )
                         && ( ldNsDai.get( 0 ).getVal().get( 0 ).getValue() != null )
-                        && ( ldNsDai.get( 0 ).getVal().get( 0 ).getValue().length() != 0 )) {
+                        && ( ldNsDai.get( 0 ).getVal().get( 0 ).getValue().length() != 0 ) ) {
                     return ldNsDai.get( 0 ).getVal().get( 0 ).getValue();
                 }
-                if((         ldNsDai.get( 0 ).getRefersToAbstractDataAttribute() != null )
+                if( ( ldNsDai.get( 0 ).getRefersToAbstractDataAttribute() != null )
                         && ( ldNsDai.get( 0 ).getRefersToAbstractDataAttribute().getVal().size() == 1 )
                         && ( ldNsDai.get( 0 ).getRefersToAbstractDataAttribute().getVal().get( 0 ).getValue() != null )
-                        && ( ldNsDai.get( 0 ).getRefersToAbstractDataAttribute().getVal().get( 0 ).getValue().length() != 0 )) {
+                        && ( ldNsDai.get( 0 ).getRefersToAbstractDataAttribute().getVal().get( 0 ).getValue()
+                                .length() != 0 ) ) {
                     return ldNsDai.get( 0 ).getRefersToAbstractDataAttribute().getVal().get( 0 ).getValue();
                 }
             }
             if( namPltDoi.get( 0 ).getRefersToDO() != null ) {
-                List< DA > lnNsDa =
-                        namPltDoi
+                List< DA > lnNsDa = namPltDoi
                         .get( 0 )
                         .getRefersToDO()
                         .getRefersToDOType()
                         .getDA()
                         .stream()
-                        .filter( da -> "ldNs".equals(  da.getName() ))
+                        .filter( da -> "ldNs".equals( da.getName() ) )
                         .collect( Collectors.toList() );
                 if( lnNsDa.size() == 1 ) {
-                    if((         lnNsDa.get( 0 ).getVal().size() == 1 )
+                    if( ( lnNsDa.get( 0 ).getVal().size() == 1 )
                             && ( lnNsDa.get( 0 ).getVal().get( 0 ).getValue() != null )
-                            && ( lnNsDa.get( 0 ).getVal().get( 0 ).getValue().length() != 0 )) {
+                            && ( lnNsDa.get( 0 ).getVal().get( 0 ).getValue().length() != 0 ) ) {
                         return lnNsDa.get( 0 ).getVal().get( 0 ).getValue();
                     }
                 }
             }
         }
-        
+
         if( getLN0().getRefersToLNodeType() == null ) return null;
-        List< DO > namPltDo =
-                getLN0()
+        List< DO > namPltDo = getLN0()
                 .getRefersToLNodeType()
                 .getDO()
                 .stream()
-                .filter( do_ -> "NamPlt".equals( do_.getName() ))
+                .filter( do_ -> "NamPlt".equals( do_.getName() ) )
                 .collect( Collectors.toList() );
         if( namPltDo.size() == 1 ) {
             if( namPltDo.get( 0 ).getRefersToDOType() == null ) return null;
-            List< DA > ldNsDa =
-                    namPltDo
+            List< DA > ldNsDa = namPltDo
                     .get( 0 )
                     .getRefersToDOType()
                     .getDA()
                     .stream()
-                    .filter( da -> "ldNs".equals(  da.getName() ))
+                    .filter( da -> "ldNs".equals( da.getName() ) )
                     .collect( Collectors.toList() );
             if( ldNsDa.size() == 1 ) {
-                if((         ldNsDa.get( 0 ).getVal().size() == 1 )
+                if( ( ldNsDa.get( 0 ).getVal().size() == 1 )
                         && ( ldNsDa.get( 0 ).getVal().get( 0 ).getValue() != null )
-                        && ( ldNsDa.get( 0 ).getVal().get( 0 ).getValue().length() != 0 )) {
+                        && ( ldNsDa.get( 0 ).getVal().get( 0 ).getValue().length() != 0 ) ) {
                     return ldNsDa.get( 0 ).getVal().get( 0 ).getValue();
                 }
             }
         }
-        
+
         return null;
     }
 
@@ -674,7 +705,7 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public LN0 getLN0() {
-        return (LN0)getAnyLN().get(SclPackage.eINSTANCE.getLDevice_LN0(), true);
+        return ( LN0 ) getAnyLN().get( SclPackage.eINSTANCE.getLDevice_LN0(), true );
     }
 
     /**
@@ -683,7 +714,7 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      * @generated
      */
     public NotificationChain basicSetLN0( LN0 newLN0, NotificationChain msgs ) {
-        return ((FeatureMap.Internal)getAnyLN()).basicAdd(SclPackage.eINSTANCE.getLDevice_LN0(), newLN0, msgs);
+        return ( ( FeatureMap.Internal ) getAnyLN() ).basicAdd( SclPackage.eINSTANCE.getLDevice_LN0(), newLN0, msgs );
     }
 
     /**
@@ -693,7 +724,7 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public void setLN0( LN0 newLN0 ) {
-        ((FeatureMap.Internal)getAnyLN()).set(SclPackage.eINSTANCE.getLDevice_LN0(), newLN0);
+        ( ( FeatureMap.Internal ) getAnyLN() ).set( SclPackage.eINSTANCE.getLDevice_LN0(), newLN0 );
     }
 
     /**
@@ -706,7 +737,8 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
         getAnyLN().remove( oldLN0 );
         boolean oldLN0ESet = isSetLN0();
         if( eNotificationRequired() ) {
-            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.LDEVICE__LN0, oldLN0, null, oldLN0ESet );
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.LDEVICE__LN0,
+                    oldLN0, null, oldLN0ESet );
             if( msgs == null )
                 msgs = notification;
             else
@@ -722,7 +754,7 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public void unsetLN0() {
-        ((FeatureMap.Internal)getAnyLN()).clear(SclPackage.eINSTANCE.getLDevice_LN0());
+        ( ( FeatureMap.Internal ) getAnyLN() ).clear( SclPackage.eINSTANCE.getLDevice_LN0() );
     }
 
     /**
@@ -732,7 +764,7 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public boolean isSetLN0() {
-        return !((FeatureMap.Internal)getAnyLN()).isEmpty(SclPackage.eINSTANCE.getLDevice_LN0());
+        return !( ( FeatureMap.Internal ) getAnyLN() ).isEmpty( SclPackage.eINSTANCE.getLDevice_LN0() );
     }
 
     /**
@@ -743,28 +775,31 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LDEVICE__ACCESS_CONTROL:
-                if (accessControl != null)
-                    msgs = ((InternalEObject)accessControl).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.LDEVICE__ACCESS_CONTROL, null, msgs);
-                return basicSetAccessControl((AccessControl)otherEnd, msgs);
-            case SclPackage.LDEVICE__PARENT_SERVER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServer((Server)otherEnd, msgs);
-            case SclPackage.LDEVICE__LN0:
-                LN0 ln0 = getLN0();
-                if (ln0 != null)
-                    msgs = ((InternalEObject)ln0).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.LDEVICE__LN0, null, msgs);
-                return basicSetLN0((LN0)otherEnd, msgs);
-            case SclPackage.LDEVICE__LN:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getLN()).basicAdd(otherEnd, msgs);
-            case SclPackage.LDEVICE__REFERRED_BY_IED_NAME:
-                if (referredByIEDName != null)
-                    msgs = ((InternalEObject)referredByIEDName).eInverseRemove(this, SclPackage.IED_NAME__REFERS_TO_LDEVICE, IEDName.class, msgs);
-                return basicSetReferredByIEDName((IEDName)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.LDEVICE__ACCESS_CONTROL:
+            if( accessControl != null )
+                msgs = ( ( InternalEObject ) accessControl ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.LDEVICE__ACCESS_CONTROL, null, msgs );
+            return basicSetAccessControl( ( AccessControl ) otherEnd, msgs );
+        case SclPackage.LDEVICE__PARENT_SERVER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServer( ( Server ) otherEnd, msgs );
+        case SclPackage.LDEVICE__LN0:
+            LN0 ln0 = getLN0();
+            if( ln0 != null )
+                msgs = ( ( InternalEObject ) ln0 ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.LDEVICE__LN0, null, msgs );
+            return basicSetLN0( ( LN0 ) otherEnd, msgs );
+        case SclPackage.LDEVICE__LN:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getLN() ).basicAdd( otherEnd, msgs );
+        case SclPackage.LDEVICE__REFERRED_BY_IED_NAME:
+            if( referredByIEDName != null )
+                msgs = ( ( InternalEObject ) referredByIEDName ).eInverseRemove( this,
+                        SclPackage.IED_NAME__REFERS_TO_LDEVICE, IEDName.class, msgs );
+            return basicSetReferredByIEDName( ( IEDName ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -774,21 +809,21 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LDEVICE__ACCESS_CONTROL:
-                return basicUnsetAccessControl(msgs);
-            case SclPackage.LDEVICE__PARENT_SERVER:
-                return basicSetParentServer(null, msgs);
-            case SclPackage.LDEVICE__ANY_LN:
-                return ((InternalEList<?>)getAnyLN()).basicRemove(otherEnd, msgs);
-            case SclPackage.LDEVICE__LN0:
-                return basicUnsetLN0(msgs);
-            case SclPackage.LDEVICE__LN:
-                return ((InternalEList<?>)getLN()).basicRemove(otherEnd, msgs);
-            case SclPackage.LDEVICE__REFERRED_BY_IED_NAME:
-                return basicUnsetReferredByIEDName(msgs);
+        switch( featureID ) {
+        case SclPackage.LDEVICE__ACCESS_CONTROL:
+            return basicUnsetAccessControl( msgs );
+        case SclPackage.LDEVICE__PARENT_SERVER:
+            return basicSetParentServer( null, msgs );
+        case SclPackage.LDEVICE__ANY_LN:
+            return ( ( InternalEList< ? > ) getAnyLN() ).basicRemove( otherEnd, msgs );
+        case SclPackage.LDEVICE__LN0:
+            return basicUnsetLN0( msgs );
+        case SclPackage.LDEVICE__LN:
+            return ( ( InternalEList< ? > ) getLN() ).basicRemove( otherEnd, msgs );
+        case SclPackage.LDEVICE__REFERRED_BY_IED_NAME:
+            return basicUnsetReferredByIEDName( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -798,11 +833,11 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.LDEVICE__PARENT_SERVER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVER__LDEVICE, Server.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.LDEVICE__PARENT_SERVER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVER__LDEVICE, Server.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -812,26 +847,26 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.LDEVICE__INST:
-                return getInst();
-            case SclPackage.LDEVICE__LD_NAME:
-                return getLdName();
-            case SclPackage.LDEVICE__ACCESS_CONTROL:
-                return getAccessControl();
-            case SclPackage.LDEVICE__PARENT_SERVER:
-                return getParentServer();
-            case SclPackage.LDEVICE__ANY_LN:
-                if (coreType) return getAnyLN();
-                return ((FeatureMap.Internal)getAnyLN()).getWrapper();
-            case SclPackage.LDEVICE__LN0:
-                return getLN0();
-            case SclPackage.LDEVICE__LN:
-                return getLN();
-            case SclPackage.LDEVICE__REFERRED_BY_IED_NAME:
-                return getReferredByIEDName();
+        switch( featureID ) {
+        case SclPackage.LDEVICE__INST:
+            return getInst();
+        case SclPackage.LDEVICE__LD_NAME:
+            return getLdName();
+        case SclPackage.LDEVICE__ACCESS_CONTROL:
+            return getAccessControl();
+        case SclPackage.LDEVICE__PARENT_SERVER:
+            return getParentServer();
+        case SclPackage.LDEVICE__ANY_LN:
+            if( coreType ) return getAnyLN();
+            return ( ( FeatureMap.Internal ) getAnyLN() ).getWrapper();
+        case SclPackage.LDEVICE__LN0:
+            return getLN0();
+        case SclPackage.LDEVICE__LN:
+            return getLN();
+        case SclPackage.LDEVICE__REFERRED_BY_IED_NAME:
+            return getReferredByIEDName();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -842,34 +877,34 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.LDEVICE__INST:
-                setInst((String)newValue);
-                return;
-            case SclPackage.LDEVICE__LD_NAME:
-                setLdName((String)newValue);
-                return;
-            case SclPackage.LDEVICE__ACCESS_CONTROL:
-                setAccessControl((AccessControl)newValue);
-                return;
-            case SclPackage.LDEVICE__PARENT_SERVER:
-                setParentServer((Server)newValue);
-                return;
-            case SclPackage.LDEVICE__ANY_LN:
-                ((FeatureMap.Internal)getAnyLN()).set(newValue);
-                return;
-            case SclPackage.LDEVICE__LN0:
-                setLN0((LN0)newValue);
-                return;
-            case SclPackage.LDEVICE__LN:
-                getLN().clear();
-                getLN().addAll((Collection<? extends LN>)newValue);
-                return;
-            case SclPackage.LDEVICE__REFERRED_BY_IED_NAME:
-                setReferredByIEDName((IEDName)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.LDEVICE__INST:
+            setInst( ( String ) newValue );
+            return;
+        case SclPackage.LDEVICE__LD_NAME:
+            setLdName( ( String ) newValue );
+            return;
+        case SclPackage.LDEVICE__ACCESS_CONTROL:
+            setAccessControl( ( AccessControl ) newValue );
+            return;
+        case SclPackage.LDEVICE__PARENT_SERVER:
+            setParentServer( ( Server ) newValue );
+            return;
+        case SclPackage.LDEVICE__ANY_LN:
+            ( ( FeatureMap.Internal ) getAnyLN() ).set( newValue );
+            return;
+        case SclPackage.LDEVICE__LN0:
+            setLN0( ( LN0 ) newValue );
+            return;
+        case SclPackage.LDEVICE__LN:
+            getLN().clear();
+            getLN().addAll( ( Collection< ? extends LN > ) newValue );
+            return;
+        case SclPackage.LDEVICE__REFERRED_BY_IED_NAME:
+            setReferredByIEDName( ( IEDName ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -879,33 +914,33 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LDEVICE__INST:
-                unsetInst();
-                return;
-            case SclPackage.LDEVICE__LD_NAME:
-                unsetLdName();
-                return;
-            case SclPackage.LDEVICE__ACCESS_CONTROL:
-                unsetAccessControl();
-                return;
-            case SclPackage.LDEVICE__PARENT_SERVER:
-                setParentServer((Server)null);
-                return;
-            case SclPackage.LDEVICE__ANY_LN:
-                getAnyLN().clear();
-                return;
-            case SclPackage.LDEVICE__LN0:
-                unsetLN0();
-                return;
-            case SclPackage.LDEVICE__LN:
-                unsetLN();
-                return;
-            case SclPackage.LDEVICE__REFERRED_BY_IED_NAME:
-                unsetReferredByIEDName();
-                return;
+        switch( featureID ) {
+        case SclPackage.LDEVICE__INST:
+            unsetInst();
+            return;
+        case SclPackage.LDEVICE__LD_NAME:
+            unsetLdName();
+            return;
+        case SclPackage.LDEVICE__ACCESS_CONTROL:
+            unsetAccessControl();
+            return;
+        case SclPackage.LDEVICE__PARENT_SERVER:
+            setParentServer( ( Server ) null );
+            return;
+        case SclPackage.LDEVICE__ANY_LN:
+            getAnyLN().clear();
+            return;
+        case SclPackage.LDEVICE__LN0:
+            unsetLN0();
+            return;
+        case SclPackage.LDEVICE__LN:
+            unsetLN();
+            return;
+        case SclPackage.LDEVICE__REFERRED_BY_IED_NAME:
+            unsetReferredByIEDName();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -915,25 +950,25 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LDEVICE__INST:
-                return isSetInst();
-            case SclPackage.LDEVICE__LD_NAME:
-                return isSetLdName();
-            case SclPackage.LDEVICE__ACCESS_CONTROL:
-                return isSetAccessControl();
-            case SclPackage.LDEVICE__PARENT_SERVER:
-                return getParentServer() != null;
-            case SclPackage.LDEVICE__ANY_LN:
-                return anyLN != null && !anyLN.isEmpty();
-            case SclPackage.LDEVICE__LN0:
-                return isSetLN0();
-            case SclPackage.LDEVICE__LN:
-                return isSetLN();
-            case SclPackage.LDEVICE__REFERRED_BY_IED_NAME:
-                return isSetReferredByIEDName();
+        switch( featureID ) {
+        case SclPackage.LDEVICE__INST:
+            return isSetInst();
+        case SclPackage.LDEVICE__LD_NAME:
+            return isSetLdName();
+        case SclPackage.LDEVICE__ACCESS_CONTROL:
+            return isSetAccessControl();
+        case SclPackage.LDEVICE__PARENT_SERVER:
+            return getParentServer() != null;
+        case SclPackage.LDEVICE__ANY_LN:
+            return anyLN != null && !anyLN.isEmpty();
+        case SclPackage.LDEVICE__LN0:
+            return isSetLN0();
+        case SclPackage.LDEVICE__LN:
+            return isSetLN();
+        case SclPackage.LDEVICE__REFERRED_BY_IED_NAME:
+            return isSetReferredByIEDName();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -942,12 +977,12 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      * @generated
      */
     @Override
-    public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-        switch (operationID) {
-            case SclPackage.LDEVICE___GET_NAMESPACE:
-                return getNamespace();
+    public Object eInvoke( int operationID, EList< ? > arguments ) throws InvocationTargetException {
+        switch( operationID ) {
+        case SclPackage.LDEVICE___GET_NAMESPACE:
+            return getNamespace();
         }
-        return super.eInvoke(operationID, arguments);
+        return super.eInvoke( operationID, arguments );
     }
 
     /**
@@ -957,16 +992,22 @@ public class LDeviceImpl extends UnNamingImpl implements LDevice {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (inst: ");
-        if (instESet) result.append(inst); else result.append("<unset>");
-        result.append(", ldName: ");
-        if (ldNameESet) result.append(ldName); else result.append("<unset>");
-        result.append(", AnyLN: ");
-        result.append(anyLN);
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (inst: " );
+        if( instESet )
+            result.append( inst );
+        else
+            result.append( "<unset>" );
+        result.append( ", ldName: " );
+        if( ldNameESet )
+            result.append( ldName );
+        else
+            result.append( "<unset>" );
+        result.append( ", AnyLN: " );
+        result.append( anyLN );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LN0Impl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LN0Impl.java
index eba5682..989d5e7 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LN0Impl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LN0Impl.java
@@ -100,8 +100,8 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      * @generated
      */
     @Override
-    public EList<GSEControl> getGSEControl() {
-        return getControlWithIEDName().list(SclPackage.eINSTANCE.getLN0_GSEControl());
+    public EList< GSEControl > getGSEControl() {
+        return getControlWithIEDName().list( SclPackage.eINSTANCE.getLN0_GSEControl() );
     }
 
     /**
@@ -111,7 +111,7 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      */
     @Override
     public void unsetGSEControl() {
-        ((FeatureMap.Internal)getControlWithIEDName()).clear(SclPackage.eINSTANCE.getLN0_GSEControl());
+        ( ( FeatureMap.Internal ) getControlWithIEDName() ).clear( SclPackage.eINSTANCE.getLN0_GSEControl() );
     }
 
     /**
@@ -121,7 +121,7 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      */
     @Override
     public boolean isSetGSEControl() {
-        return !((FeatureMap.Internal)getControlWithIEDName()).isEmpty(SclPackage.eINSTANCE.getLN0_GSEControl());
+        return !( ( FeatureMap.Internal ) getControlWithIEDName() ).isEmpty( SclPackage.eINSTANCE.getLN0_GSEControl() );
     }
 
     /**
@@ -131,8 +131,8 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      */
     @Override
     public LDevice getParentLDevice() {
-        if (eContainerFeatureID() != SclPackage.LN0__PARENT_LDEVICE) return null;
-        return (LDevice)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.LN0__PARENT_LDEVICE ) return null;
+        return ( LDevice ) eInternalContainer();
     }
 
     /**
@@ -140,8 +140,8 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentLDevice(LDevice newParentLDevice, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentLDevice, SclPackage.LN0__PARENT_LDEVICE, msgs);
+    public NotificationChain basicSetParentLDevice( LDevice newParentLDevice, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentLDevice, SclPackage.LN0__PARENT_LDEVICE, msgs );
         return msgs;
     }
 
@@ -151,20 +151,23 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      * @generated
      */
     @Override
-    public void setParentLDevice(LDevice newParentLDevice) {
-        if (newParentLDevice != eInternalContainer() || (eContainerFeatureID() != SclPackage.LN0__PARENT_LDEVICE && newParentLDevice != null)) {
-            if (EcoreUtil.isAncestor(this, newParentLDevice))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentLDevice( LDevice newParentLDevice ) {
+        if( newParentLDevice != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.LN0__PARENT_LDEVICE && newParentLDevice != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentLDevice ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentLDevice != null)
-                msgs = ((InternalEObject)newParentLDevice).eInverseAdd(this, SclPackage.LDEVICE__LN0, LDevice.class, msgs);
-            msgs = basicSetParentLDevice(newParentLDevice, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentLDevice != null )
+                msgs = ( ( InternalEObject ) newParentLDevice ).eInverseAdd( this, SclPackage.LDEVICE__LN0,
+                        LDevice.class, msgs );
+            msgs = basicSetParentLDevice( newParentLDevice, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LN0__PARENT_LDEVICE, newParentLDevice, newParentLDevice));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LN0__PARENT_LDEVICE, newParentLDevice,
+                    newParentLDevice ) );
     }
 
     /**
@@ -173,8 +176,8 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      * @generated
      */
     @Override
-    public EList<SampledValueControl> getSampledValueControl() {
-        return getControlWithIEDName().list(SclPackage.eINSTANCE.getLN0_SampledValueControl());
+    public EList< SampledValueControl > getSampledValueControl() {
+        return getControlWithIEDName().list( SclPackage.eINSTANCE.getLN0_SampledValueControl() );
     }
 
     /**
@@ -184,7 +187,7 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      */
     @Override
     public void unsetSampledValueControl() {
-        ((FeatureMap.Internal)getControlWithIEDName()).clear(SclPackage.eINSTANCE.getLN0_SampledValueControl());
+        ( ( FeatureMap.Internal ) getControlWithIEDName() ).clear( SclPackage.eINSTANCE.getLN0_SampledValueControl() );
     }
 
     /**
@@ -194,7 +197,8 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      */
     @Override
     public boolean isSetSampledValueControl() {
-        return !((FeatureMap.Internal)getControlWithIEDName()).isEmpty(SclPackage.eINSTANCE.getLN0_SampledValueControl());
+        return !( ( FeatureMap.Internal ) getControlWithIEDName() )
+                .isEmpty( SclPackage.eINSTANCE.getLN0_SampledValueControl() );
     }
 
     /**
@@ -217,9 +221,13 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
         settingControl = newSettingControl;
         boolean oldSettingControlESet = settingControlESet;
         settingControlESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.LN0__SETTING_CONTROL, oldSettingControl, newSettingControl, !oldSettingControlESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.LN0__SETTING_CONTROL, oldSettingControl, newSettingControl, !oldSettingControlESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -231,20 +239,23 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      */
     @Override
     public void setSettingControl( SettingControl newSettingControl ) {
-        if (newSettingControl != settingControl) {
+        if( newSettingControl != settingControl ) {
             NotificationChain msgs = null;
-            if (settingControl != null)
-                msgs = ((InternalEObject)settingControl).eInverseRemove(this, SclPackage.SETTING_CONTROL__PARENT_LN0, SettingControl.class, msgs);
-            if (newSettingControl != null)
-                msgs = ((InternalEObject)newSettingControl).eInverseAdd(this, SclPackage.SETTING_CONTROL__PARENT_LN0, SettingControl.class, msgs);
-            msgs = basicSetSettingControl(newSettingControl, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( settingControl != null )
+                msgs = ( ( InternalEObject ) settingControl ).eInverseRemove( this,
+                        SclPackage.SETTING_CONTROL__PARENT_LN0, SettingControl.class, msgs );
+            if( newSettingControl != null )
+                msgs = ( ( InternalEObject ) newSettingControl ).eInverseAdd( this,
+                        SclPackage.SETTING_CONTROL__PARENT_LN0, SettingControl.class, msgs );
+            msgs = basicSetSettingControl( newSettingControl, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSettingControlESet = settingControlESet;
             settingControlESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LN0__SETTING_CONTROL, newSettingControl, newSettingControl, !oldSettingControlESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LN0__SETTING_CONTROL,
+                        newSettingControl, newSettingControl, !oldSettingControlESet ) );
         }
     }
 
@@ -258,9 +269,13 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
         settingControl = null;
         boolean oldSettingControlESet = settingControlESet;
         settingControlESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.LN0__SETTING_CONTROL, oldSettingControl, null, oldSettingControlESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.LN0__SETTING_CONTROL, oldSettingControl, null, oldSettingControlESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -272,17 +287,19 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      */
     @Override
     public void unsetSettingControl() {
-        if (settingControl != null) {
+        if( settingControl != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)settingControl).eInverseRemove(this, SclPackage.SETTING_CONTROL__PARENT_LN0, SettingControl.class, msgs);
-            msgs = basicUnsetSettingControl(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) settingControl ).eInverseRemove( this, SclPackage.SETTING_CONTROL__PARENT_LN0,
+                    SettingControl.class, msgs );
+            msgs = basicUnsetSettingControl( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSettingControlESet = settingControlESet;
             settingControlESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LN0__SETTING_CONTROL, null, null, oldSettingControlESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LN0__SETTING_CONTROL, null, null,
+                        oldSettingControlESet ) );
         }
     }
 
@@ -303,7 +320,8 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      */
     @Override
     public FeatureMap getControlWithIEDName() {
-        return (FeatureMap)getControl().<FeatureMap.Entry>list(SclPackage.eINSTANCE.getLN0_ControlWithIEDName());
+        return ( FeatureMap ) getControl().< FeatureMap.Entry > list(
+                SclPackage.eINSTANCE.getLN0_ControlWithIEDName() );
     }
 
     /**
@@ -313,7 +331,7 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      */
     @Override
     public void unsetControlWithIEDName() {
-        ((FeatureMap.Internal)getControl()).clear(SclPackage.eINSTANCE.getLN0_ControlWithIEDName());
+        ( ( FeatureMap.Internal ) getControl() ).clear( SclPackage.eINSTANCE.getLN0_ControlWithIEDName() );
     }
 
     /**
@@ -323,7 +341,7 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      */
     @Override
     public boolean isSetControlWithIEDName() {
-        return !((FeatureMap.Internal)getControl()).isEmpty(SclPackage.eINSTANCE.getLN0_ControlWithIEDName());
+        return !( ( FeatureMap.Internal ) getControl() ).isEmpty( SclPackage.eINSTANCE.getLN0_ControlWithIEDName() );
     }
 
     /**
@@ -334,21 +352,24 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LN0__GSE_CONTROL:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getGSEControl()).basicAdd(otherEnd, msgs);
-            case SclPackage.LN0__PARENT_LDEVICE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentLDevice((LDevice)otherEnd, msgs);
-            case SclPackage.LN0__SAMPLED_VALUE_CONTROL:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSampledValueControl()).basicAdd(otherEnd, msgs);
-            case SclPackage.LN0__SETTING_CONTROL:
-                if (settingControl != null)
-                    msgs = ((InternalEObject)settingControl).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.LN0__SETTING_CONTROL, null, msgs);
-                return basicSetSettingControl((SettingControl)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.LN0__GSE_CONTROL:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getGSEControl() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.LN0__PARENT_LDEVICE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentLDevice( ( LDevice ) otherEnd, msgs );
+        case SclPackage.LN0__SAMPLED_VALUE_CONTROL:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSampledValueControl() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.LN0__SETTING_CONTROL:
+            if( settingControl != null )
+                msgs = ( ( InternalEObject ) settingControl ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.LN0__SETTING_CONTROL, null, msgs );
+            return basicSetSettingControl( ( SettingControl ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -358,19 +379,19 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LN0__GSE_CONTROL:
-                return ((InternalEList<?>)getGSEControl()).basicRemove(otherEnd, msgs);
-            case SclPackage.LN0__PARENT_LDEVICE:
-                return basicSetParentLDevice(null, msgs);
-            case SclPackage.LN0__SAMPLED_VALUE_CONTROL:
-                return ((InternalEList<?>)getSampledValueControl()).basicRemove(otherEnd, msgs);
-            case SclPackage.LN0__SETTING_CONTROL:
-                return basicUnsetSettingControl(msgs);
-            case SclPackage.LN0__CONTROL_WITH_IED_NAME:
-                return ((InternalEList<?>)getControlWithIEDName()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.LN0__GSE_CONTROL:
+            return ( ( InternalEList< ? > ) getGSEControl() ).basicRemove( otherEnd, msgs );
+        case SclPackage.LN0__PARENT_LDEVICE:
+            return basicSetParentLDevice( null, msgs );
+        case SclPackage.LN0__SAMPLED_VALUE_CONTROL:
+            return ( ( InternalEList< ? > ) getSampledValueControl() ).basicRemove( otherEnd, msgs );
+        case SclPackage.LN0__SETTING_CONTROL:
+            return basicUnsetSettingControl( msgs );
+        case SclPackage.LN0__CONTROL_WITH_IED_NAME:
+            return ( ( InternalEList< ? > ) getControlWithIEDName() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -379,12 +400,12 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      * @generated
      */
     @Override
-    public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.LN0__PARENT_LDEVICE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.LDEVICE__LN0, LDevice.class, msgs);
+    public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
+        switch( eContainerFeatureID() ) {
+        case SclPackage.LN0__PARENT_LDEVICE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.LDEVICE__LN0, LDevice.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -394,20 +415,20 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.LN0__GSE_CONTROL:
-                return getGSEControl();
-            case SclPackage.LN0__PARENT_LDEVICE:
-                return getParentLDevice();
-            case SclPackage.LN0__SAMPLED_VALUE_CONTROL:
-                return getSampledValueControl();
-            case SclPackage.LN0__SETTING_CONTROL:
-                return getSettingControl();
-            case SclPackage.LN0__CONTROL_WITH_IED_NAME:
-                if (coreType) return getControlWithIEDName();
-                return ((FeatureMap.Internal)getControlWithIEDName()).getWrapper();
+        switch( featureID ) {
+        case SclPackage.LN0__GSE_CONTROL:
+            return getGSEControl();
+        case SclPackage.LN0__PARENT_LDEVICE:
+            return getParentLDevice();
+        case SclPackage.LN0__SAMPLED_VALUE_CONTROL:
+            return getSampledValueControl();
+        case SclPackage.LN0__SETTING_CONTROL:
+            return getSettingControl();
+        case SclPackage.LN0__CONTROL_WITH_IED_NAME:
+            if( coreType ) return getControlWithIEDName();
+            return ( ( FeatureMap.Internal ) getControlWithIEDName() ).getWrapper();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -418,26 +439,26 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.LN0__GSE_CONTROL:
-                getGSEControl().clear();
-                getGSEControl().addAll((Collection<? extends GSEControl>)newValue);
-                return;
-            case SclPackage.LN0__PARENT_LDEVICE:
-                setParentLDevice((LDevice)newValue);
-                return;
-            case SclPackage.LN0__SAMPLED_VALUE_CONTROL:
-                getSampledValueControl().clear();
-                getSampledValueControl().addAll((Collection<? extends SampledValueControl>)newValue);
-                return;
-            case SclPackage.LN0__SETTING_CONTROL:
-                setSettingControl((SettingControl)newValue);
-                return;
-            case SclPackage.LN0__CONTROL_WITH_IED_NAME:
-                ((FeatureMap.Internal)getControlWithIEDName()).set(newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.LN0__GSE_CONTROL:
+            getGSEControl().clear();
+            getGSEControl().addAll( ( Collection< ? extends GSEControl > ) newValue );
+            return;
+        case SclPackage.LN0__PARENT_LDEVICE:
+            setParentLDevice( ( LDevice ) newValue );
+            return;
+        case SclPackage.LN0__SAMPLED_VALUE_CONTROL:
+            getSampledValueControl().clear();
+            getSampledValueControl().addAll( ( Collection< ? extends SampledValueControl > ) newValue );
+            return;
+        case SclPackage.LN0__SETTING_CONTROL:
+            setSettingControl( ( SettingControl ) newValue );
+            return;
+        case SclPackage.LN0__CONTROL_WITH_IED_NAME:
+            ( ( FeatureMap.Internal ) getControlWithIEDName() ).set( newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -447,24 +468,24 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LN0__GSE_CONTROL:
-                unsetGSEControl();
-                return;
-            case SclPackage.LN0__PARENT_LDEVICE:
-                setParentLDevice((LDevice)null);
-                return;
-            case SclPackage.LN0__SAMPLED_VALUE_CONTROL:
-                unsetSampledValueControl();
-                return;
-            case SclPackage.LN0__SETTING_CONTROL:
-                unsetSettingControl();
-                return;
-            case SclPackage.LN0__CONTROL_WITH_IED_NAME:
-                unsetControlWithIEDName();
-                return;
+        switch( featureID ) {
+        case SclPackage.LN0__GSE_CONTROL:
+            unsetGSEControl();
+            return;
+        case SclPackage.LN0__PARENT_LDEVICE:
+            setParentLDevice( ( LDevice ) null );
+            return;
+        case SclPackage.LN0__SAMPLED_VALUE_CONTROL:
+            unsetSampledValueControl();
+            return;
+        case SclPackage.LN0__SETTING_CONTROL:
+            unsetSettingControl();
+            return;
+        case SclPackage.LN0__CONTROL_WITH_IED_NAME:
+            unsetControlWithIEDName();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -474,19 +495,19 @@ public class LN0Impl extends AnyLNImpl implements LN0 {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LN0__GSE_CONTROL:
-                return isSetGSEControl();
-            case SclPackage.LN0__PARENT_LDEVICE:
-                return getParentLDevice() != null;
-            case SclPackage.LN0__SAMPLED_VALUE_CONTROL:
-                return isSetSampledValueControl();
-            case SclPackage.LN0__SETTING_CONTROL:
-                return isSetSettingControl();
-            case SclPackage.LN0__CONTROL_WITH_IED_NAME:
-                return isSetControlWithIEDName();
+        switch( featureID ) {
+        case SclPackage.LN0__GSE_CONTROL:
+            return isSetGSEControl();
+        case SclPackage.LN0__PARENT_LDEVICE:
+            return getParentLDevice() != null;
+        case SclPackage.LN0__SAMPLED_VALUE_CONTROL:
+            return isSetSampledValueControl();
+        case SclPackage.LN0__SETTING_CONTROL:
+            return isSetSettingControl();
+        case SclPackage.LN0__CONTROL_WITH_IED_NAME:
+            return isSetControlWithIEDName();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //LN0Impl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNImpl.java
index 3b59430..c537769 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNImpl.java
@@ -116,8 +116,9 @@ public class LNImpl extends AnyLNImpl implements LN {
         prefix = newPrefix;
         boolean oldPrefixESet = prefixESet;
         prefixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LN__PREFIX, oldPrefix, prefix, !oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LN__PREFIX, oldPrefix, prefix,
+                    !oldPrefixESet ) );
     }
 
     /**
@@ -131,8 +132,9 @@ public class LNImpl extends AnyLNImpl implements LN {
         boolean oldPrefixESet = prefixESet;
         prefix = PREFIX_EDEFAULT;
         prefixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LN__PREFIX, oldPrefix, PREFIX_EDEFAULT, oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LN__PREFIX, oldPrefix, PREFIX_EDEFAULT,
+                    oldPrefixESet ) );
     }
 
     /**
@@ -152,8 +154,8 @@ public class LNImpl extends AnyLNImpl implements LN {
      */
     @Override
     public AccessPoint getParentAccessPoint() {
-        if (eContainerFeatureID() != SclPackage.LN__PARENT_ACCESS_POINT) return null;
-        return (AccessPoint)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.LN__PARENT_ACCESS_POINT ) return null;
+        return ( AccessPoint ) eInternalContainer();
     }
 
     /**
@@ -161,8 +163,8 @@ public class LNImpl extends AnyLNImpl implements LN {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAccessPoint(AccessPoint newParentAccessPoint, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAccessPoint, SclPackage.LN__PARENT_ACCESS_POINT, msgs);
+    public NotificationChain basicSetParentAccessPoint( AccessPoint newParentAccessPoint, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAccessPoint, SclPackage.LN__PARENT_ACCESS_POINT, msgs );
         return msgs;
     }
 
@@ -172,20 +174,23 @@ public class LNImpl extends AnyLNImpl implements LN {
      * @generated
      */
     @Override
-    public void setParentAccessPoint(AccessPoint newParentAccessPoint) {
-        if (newParentAccessPoint != eInternalContainer() || (eContainerFeatureID() != SclPackage.LN__PARENT_ACCESS_POINT && newParentAccessPoint != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAccessPoint))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAccessPoint( AccessPoint newParentAccessPoint ) {
+        if( newParentAccessPoint != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.LN__PARENT_ACCESS_POINT && newParentAccessPoint != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAccessPoint ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAccessPoint != null)
-                msgs = ((InternalEObject)newParentAccessPoint).eInverseAdd(this, SclPackage.ACCESS_POINT__LN, AccessPoint.class, msgs);
-            msgs = basicSetParentAccessPoint(newParentAccessPoint, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAccessPoint != null )
+                msgs = ( ( InternalEObject ) newParentAccessPoint ).eInverseAdd( this, SclPackage.ACCESS_POINT__LN,
+                        AccessPoint.class, msgs );
+            msgs = basicSetParentAccessPoint( newParentAccessPoint, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LN__PARENT_ACCESS_POINT, newParentAccessPoint, newParentAccessPoint));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LN__PARENT_ACCESS_POINT,
+                    newParentAccessPoint, newParentAccessPoint ) );
     }
 
     /**
@@ -195,8 +200,8 @@ public class LNImpl extends AnyLNImpl implements LN {
      */
     @Override
     public LDevice getParentLDevice() {
-        if (eContainerFeatureID() != SclPackage.LN__PARENT_LDEVICE) return null;
-        return (LDevice)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.LN__PARENT_LDEVICE ) return null;
+        return ( LDevice ) eInternalContainer();
     }
 
     /**
@@ -204,8 +209,8 @@ public class LNImpl extends AnyLNImpl implements LN {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentLDevice(LDevice newParentLDevice, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentLDevice, SclPackage.LN__PARENT_LDEVICE, msgs);
+    public NotificationChain basicSetParentLDevice( LDevice newParentLDevice, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentLDevice, SclPackage.LN__PARENT_LDEVICE, msgs );
         return msgs;
     }
 
@@ -215,20 +220,23 @@ public class LNImpl extends AnyLNImpl implements LN {
      * @generated
      */
     @Override
-    public void setParentLDevice(LDevice newParentLDevice) {
-        if (newParentLDevice != eInternalContainer() || (eContainerFeatureID() != SclPackage.LN__PARENT_LDEVICE && newParentLDevice != null)) {
-            if (EcoreUtil.isAncestor(this, newParentLDevice))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentLDevice( LDevice newParentLDevice ) {
+        if( newParentLDevice != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.LN__PARENT_LDEVICE && newParentLDevice != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentLDevice ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentLDevice != null)
-                msgs = ((InternalEObject)newParentLDevice).eInverseAdd(this, SclPackage.LDEVICE__LN, LDevice.class, msgs);
-            msgs = basicSetParentLDevice(newParentLDevice, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentLDevice != null )
+                msgs = ( ( InternalEObject ) newParentLDevice ).eInverseAdd( this, SclPackage.LDEVICE__LN,
+                        LDevice.class, msgs );
+            msgs = basicSetParentLDevice( newParentLDevice, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LN__PARENT_LDEVICE, newParentLDevice, newParentLDevice));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LN__PARENT_LDEVICE, newParentLDevice,
+                    newParentLDevice ) );
     }
 
     /**
@@ -238,17 +246,17 @@ public class LNImpl extends AnyLNImpl implements LN {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LN__PARENT_ACCESS_POINT:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAccessPoint((AccessPoint)otherEnd, msgs);
-            case SclPackage.LN__PARENT_LDEVICE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentLDevice((LDevice)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.LN__PARENT_ACCESS_POINT:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAccessPoint( ( AccessPoint ) otherEnd, msgs );
+        case SclPackage.LN__PARENT_LDEVICE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentLDevice( ( LDevice ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -258,13 +266,13 @@ public class LNImpl extends AnyLNImpl implements LN {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LN__PARENT_ACCESS_POINT:
-                return basicSetParentAccessPoint(null, msgs);
-            case SclPackage.LN__PARENT_LDEVICE:
-                return basicSetParentLDevice(null, msgs);
+        switch( featureID ) {
+        case SclPackage.LN__PARENT_ACCESS_POINT:
+            return basicSetParentAccessPoint( null, msgs );
+        case SclPackage.LN__PARENT_LDEVICE:
+            return basicSetParentLDevice( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -274,13 +282,13 @@ public class LNImpl extends AnyLNImpl implements LN {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.LN__PARENT_ACCESS_POINT:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ACCESS_POINT__LN, AccessPoint.class, msgs);
-            case SclPackage.LN__PARENT_LDEVICE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.LDEVICE__LN, LDevice.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.LN__PARENT_ACCESS_POINT:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ACCESS_POINT__LN, AccessPoint.class, msgs );
+        case SclPackage.LN__PARENT_LDEVICE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.LDEVICE__LN, LDevice.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -290,15 +298,15 @@ public class LNImpl extends AnyLNImpl implements LN {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.LN__PREFIX:
-                return getPrefix();
-            case SclPackage.LN__PARENT_ACCESS_POINT:
-                return getParentAccessPoint();
-            case SclPackage.LN__PARENT_LDEVICE:
-                return getParentLDevice();
+        switch( featureID ) {
+        case SclPackage.LN__PREFIX:
+            return getPrefix();
+        case SclPackage.LN__PARENT_ACCESS_POINT:
+            return getParentAccessPoint();
+        case SclPackage.LN__PARENT_LDEVICE:
+            return getParentLDevice();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -308,18 +316,18 @@ public class LNImpl extends AnyLNImpl implements LN {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.LN__PREFIX:
-                setPrefix((String)newValue);
-                return;
-            case SclPackage.LN__PARENT_ACCESS_POINT:
-                setParentAccessPoint((AccessPoint)newValue);
-                return;
-            case SclPackage.LN__PARENT_LDEVICE:
-                setParentLDevice((LDevice)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.LN__PREFIX:
+            setPrefix( ( String ) newValue );
+            return;
+        case SclPackage.LN__PARENT_ACCESS_POINT:
+            setParentAccessPoint( ( AccessPoint ) newValue );
+            return;
+        case SclPackage.LN__PARENT_LDEVICE:
+            setParentLDevice( ( LDevice ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -329,18 +337,18 @@ public class LNImpl extends AnyLNImpl implements LN {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LN__PREFIX:
-                unsetPrefix();
-                return;
-            case SclPackage.LN__PARENT_ACCESS_POINT:
-                setParentAccessPoint((AccessPoint)null);
-                return;
-            case SclPackage.LN__PARENT_LDEVICE:
-                setParentLDevice((LDevice)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.LN__PREFIX:
+            unsetPrefix();
+            return;
+        case SclPackage.LN__PARENT_ACCESS_POINT:
+            setParentAccessPoint( ( AccessPoint ) null );
+            return;
+        case SclPackage.LN__PARENT_LDEVICE:
+            setParentLDevice( ( LDevice ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -350,15 +358,15 @@ public class LNImpl extends AnyLNImpl implements LN {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LN__PREFIX:
-                return isSetPrefix();
-            case SclPackage.LN__PARENT_ACCESS_POINT:
-                return getParentAccessPoint() != null;
-            case SclPackage.LN__PARENT_LDEVICE:
-                return getParentLDevice() != null;
+        switch( featureID ) {
+        case SclPackage.LN__PREFIX:
+            return isSetPrefix();
+        case SclPackage.LN__PARENT_ACCESS_POINT:
+            return getParentAccessPoint() != null;
+        case SclPackage.LN__PARENT_LDEVICE:
+            return getParentLDevice() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -368,12 +376,15 @@ public class LNImpl extends AnyLNImpl implements LN {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (prefix: ");
-        if (prefixESet) result.append(prefix); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (prefix: " );
+        if( prefixESet )
+            result.append( prefix );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeContainerImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeContainerImpl.java
index 9cb1041..72e6a31 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeContainerImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeContainerImpl.java
@@ -58,7 +58,7 @@ public class LNodeContainerImpl extends NamingImpl implements LNodeContainer {
      * @generated
      * @ordered
      */
-    protected EList<LNode> lNode;
+    protected EList< LNode > lNode;
 
     /**
      * <!-- begin-user-doc -->
@@ -85,9 +85,10 @@ public class LNodeContainerImpl extends NamingImpl implements LNodeContainer {
      * @generated
      */
     @Override
-    public EList<LNode> getLNode() {
-        if (lNode == null) {
-            lNode = new EObjectContainmentWithInverseEList.Unsettable<LNode>(LNode.class, this, SclPackage.LNODE_CONTAINER__LNODE, SclPackage.LNODE__PARENT_LNODE_CONTAINER);
+    public EList< LNode > getLNode() {
+        if( lNode == null ) {
+            lNode = new EObjectContainmentWithInverseEList.Unsettable< LNode >( LNode.class, this,
+                    SclPackage.LNODE_CONTAINER__LNODE, SclPackage.LNODE__PARENT_LNODE_CONTAINER );
         }
         return lNode;
     }
@@ -99,7 +100,7 @@ public class LNodeContainerImpl extends NamingImpl implements LNodeContainer {
      */
     @Override
     public void unsetLNode() {
-        if (lNode != null) ((InternalEList.Unsettable<?>)lNode).unset();
+        if( lNode != null ) ( ( InternalEList.Unsettable< ? > ) lNode ).unset();
     }
 
     /**
@@ -109,7 +110,7 @@ public class LNodeContainerImpl extends NamingImpl implements LNodeContainer {
      */
     @Override
     public boolean isSetLNode() {
-        return lNode != null && ((InternalEList.Unsettable<?>)lNode).isSet();
+        return lNode != null && ( ( InternalEList.Unsettable< ? > ) lNode ).isSet();
     }
 
     /**
@@ -120,11 +121,12 @@ public class LNodeContainerImpl extends NamingImpl implements LNodeContainer {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LNODE_CONTAINER__LNODE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getLNode()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.LNODE_CONTAINER__LNODE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getLNode() ).basicAdd( otherEnd,
+                    msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -134,11 +136,11 @@ public class LNodeContainerImpl extends NamingImpl implements LNodeContainer {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LNODE_CONTAINER__LNODE:
-                return ((InternalEList<?>)getLNode()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.LNODE_CONTAINER__LNODE:
+            return ( ( InternalEList< ? > ) getLNode() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -148,11 +150,11 @@ public class LNodeContainerImpl extends NamingImpl implements LNodeContainer {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.LNODE_CONTAINER__LNODE:
-                return getLNode();
+        switch( featureID ) {
+        case SclPackage.LNODE_CONTAINER__LNODE:
+            return getLNode();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -163,13 +165,13 @@ public class LNodeContainerImpl extends NamingImpl implements LNodeContainer {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.LNODE_CONTAINER__LNODE:
-                getLNode().clear();
-                getLNode().addAll((Collection<? extends LNode>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.LNODE_CONTAINER__LNODE:
+            getLNode().clear();
+            getLNode().addAll( ( Collection< ? extends LNode > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -179,12 +181,12 @@ public class LNodeContainerImpl extends NamingImpl implements LNodeContainer {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LNODE_CONTAINER__LNODE:
-                unsetLNode();
-                return;
+        switch( featureID ) {
+        case SclPackage.LNODE_CONTAINER__LNODE:
+            unsetLNode();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -194,11 +196,11 @@ public class LNodeContainerImpl extends NamingImpl implements LNodeContainer {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LNODE_CONTAINER__LNODE:
-                return isSetLNode();
+        switch( featureID ) {
+        case SclPackage.LNODE_CONTAINER__LNODE:
+            return isSetLNode();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //LNodeContainerImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java
index 4832f6f..3e82968 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java
@@ -316,8 +316,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
         iedName = newIedName;
         boolean oldIedNameESet = iedNameESet;
         iedNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LNODE__IED_NAME, oldIedName, iedName, !oldIedNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LNODE__IED_NAME, oldIedName, iedName,
+                    !oldIedNameESet ) );
     }
 
     /**
@@ -331,8 +332,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
         boolean oldIedNameESet = iedNameESet;
         iedName = IED_NAME_EDEFAULT;
         iedNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LNODE__IED_NAME, oldIedName, IED_NAME_EDEFAULT, oldIedNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LNODE__IED_NAME, oldIedName,
+                    IED_NAME_EDEFAULT, oldIedNameESet ) );
     }
 
     /**
@@ -366,8 +368,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
         ldInst = newLdInst;
         boolean oldLdInstESet = ldInstESet;
         ldInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LNODE__LD_INST, oldLdInst, ldInst, !oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LNODE__LD_INST, oldLdInst, ldInst,
+                    !oldLdInstESet ) );
     }
 
     /**
@@ -381,8 +384,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
         boolean oldLdInstESet = ldInstESet;
         ldInst = LD_INST_EDEFAULT;
         ldInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LNODE__LD_INST, oldLdInst, LD_INST_EDEFAULT, oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LNODE__LD_INST, oldLdInst,
+                    LD_INST_EDEFAULT, oldLdInstESet ) );
     }
 
     /**
@@ -416,8 +420,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
         lnClass = newLnClass;
         boolean oldLnClassESet = lnClassESet;
         lnClassESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LNODE__LN_CLASS, oldLnClass, lnClass, !oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LNODE__LN_CLASS, oldLnClass, lnClass,
+                    !oldLnClassESet ) );
     }
 
     /**
@@ -431,8 +436,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
         boolean oldLnClassESet = lnClassESet;
         lnClass = LN_CLASS_EDEFAULT;
         lnClassESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LNODE__LN_CLASS, oldLnClass, LN_CLASS_EDEFAULT, oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LNODE__LN_CLASS, oldLnClass,
+                    LN_CLASS_EDEFAULT, oldLnClassESet ) );
     }
 
     /**
@@ -466,8 +472,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
         lnInst = newLnInst;
         boolean oldLnInstESet = lnInstESet;
         lnInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LNODE__LN_INST, oldLnInst, lnInst, !oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LNODE__LN_INST, oldLnInst, lnInst,
+                    !oldLnInstESet ) );
     }
 
     /**
@@ -481,8 +488,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
         boolean oldLnInstESet = lnInstESet;
         lnInst = LN_INST_EDEFAULT;
         lnInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LNODE__LN_INST, oldLnInst, LN_INST_EDEFAULT, oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LNODE__LN_INST, oldLnInst,
+                    LN_INST_EDEFAULT, oldLnInstESet ) );
     }
 
     /**
@@ -516,8 +524,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
         lnType = newLnType;
         boolean oldLnTypeESet = lnTypeESet;
         lnTypeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LNODE__LN_TYPE, oldLnType, lnType, !oldLnTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LNODE__LN_TYPE, oldLnType, lnType,
+                    !oldLnTypeESet ) );
     }
 
     /**
@@ -531,8 +540,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
         boolean oldLnTypeESet = lnTypeESet;
         lnType = LN_TYPE_EDEFAULT;
         lnTypeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LNODE__LN_TYPE, oldLnType, LN_TYPE_EDEFAULT, oldLnTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LNODE__LN_TYPE, oldLnType,
+                    LN_TYPE_EDEFAULT, oldLnTypeESet ) );
     }
 
     /**
@@ -566,8 +576,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
         prefix = newPrefix;
         boolean oldPrefixESet = prefixESet;
         prefixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LNODE__PREFIX, oldPrefix, prefix, !oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LNODE__PREFIX, oldPrefix, prefix,
+                    !oldPrefixESet ) );
     }
 
     /**
@@ -581,8 +592,9 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
         boolean oldPrefixESet = prefixESet;
         prefix = PREFIX_EDEFAULT;
         prefixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LNODE__PREFIX, oldPrefix, PREFIX_EDEFAULT, oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LNODE__PREFIX, oldPrefix,
+                    PREFIX_EDEFAULT, oldPrefixESet ) );
     }
 
     /**
@@ -610,14 +622,18 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToAnyLN(AnyLN newRefersToAnyLN, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToAnyLN( AnyLN newRefersToAnyLN, NotificationChain msgs ) {
         AnyLN oldRefersToAnyLN = refersToAnyLN;
         refersToAnyLN = newRefersToAnyLN;
         boolean oldRefersToAnyLNESet = refersToAnyLNESet;
         refersToAnyLNESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.LNODE__REFERS_TO_ANY_LN, oldRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.LNODE__REFERS_TO_ANY_LN, oldRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -628,21 +644,24 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      * @generated
      */
     @Override
-    public void setRefersToAnyLN(AnyLN newRefersToAnyLN) {
-        if (newRefersToAnyLN != refersToAnyLN) {
+    public void setRefersToAnyLN( AnyLN newRefersToAnyLN ) {
+        if( newRefersToAnyLN != refersToAnyLN ) {
             NotificationChain msgs = null;
-            if (refersToAnyLN != null)
-                msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_LNODE, AnyLN.class, msgs);
-            if (newRefersToAnyLN != null)
-                msgs = ((InternalEObject)newRefersToAnyLN).eInverseAdd(this, SclPackage.ANY_LN__REFERRED_BY_LNODE, AnyLN.class, msgs);
-            msgs = basicSetRefersToAnyLN(newRefersToAnyLN, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToAnyLN != null )
+                msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this, SclPackage.ANY_LN__REFERRED_BY_LNODE,
+                        AnyLN.class, msgs );
+            if( newRefersToAnyLN != null )
+                msgs = ( ( InternalEObject ) newRefersToAnyLN ).eInverseAdd( this, SclPackage.ANY_LN__REFERRED_BY_LNODE,
+                        AnyLN.class, msgs );
+            msgs = basicSetRefersToAnyLN( newRefersToAnyLN, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAnyLNESet = refersToAnyLNESet;
             refersToAnyLNESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LNODE__REFERS_TO_ANY_LN, newRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LNODE__REFERS_TO_ANY_LN,
+                        newRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet ) );
         }
     }
 
@@ -651,14 +670,18 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToAnyLN(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToAnyLN( NotificationChain msgs ) {
         AnyLN oldRefersToAnyLN = refersToAnyLN;
         refersToAnyLN = null;
         boolean oldRefersToAnyLNESet = refersToAnyLNESet;
         refersToAnyLNESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.LNODE__REFERS_TO_ANY_LN, oldRefersToAnyLN, null, oldRefersToAnyLNESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.LNODE__REFERS_TO_ANY_LN, oldRefersToAnyLN, null, oldRefersToAnyLNESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -670,17 +693,19 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      */
     @Override
     public void unsetRefersToAnyLN() {
-        if (refersToAnyLN != null) {
+        if( refersToAnyLN != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_LNODE, AnyLN.class, msgs);
-            msgs = basicUnsetRefersToAnyLN(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this, SclPackage.ANY_LN__REFERRED_BY_LNODE,
+                    AnyLN.class, msgs );
+            msgs = basicUnsetRefersToAnyLN( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAnyLNESet = refersToAnyLNESet;
             refersToAnyLNESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LNODE__REFERS_TO_ANY_LN, null, null, oldRefersToAnyLNESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LNODE__REFERS_TO_ANY_LN, null,
+                        null, oldRefersToAnyLNESet ) );
         }
     }
 
@@ -701,8 +726,8 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      */
     @Override
     public LNodeContainer getParentLNodeContainer() {
-        if (eContainerFeatureID() != SclPackage.LNODE__PARENT_LNODE_CONTAINER) return null;
-        return (LNodeContainer)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.LNODE__PARENT_LNODE_CONTAINER ) return null;
+        return ( LNodeContainer ) eInternalContainer();
     }
 
     /**
@@ -710,8 +735,10 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentLNodeContainer(LNodeContainer newParentLNodeContainer, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentLNodeContainer, SclPackage.LNODE__PARENT_LNODE_CONTAINER, msgs);
+    public NotificationChain basicSetParentLNodeContainer( LNodeContainer newParentLNodeContainer,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentLNodeContainer,
+                SclPackage.LNODE__PARENT_LNODE_CONTAINER, msgs );
         return msgs;
     }
 
@@ -721,20 +748,24 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      * @generated
      */
     @Override
-    public void setParentLNodeContainer(LNodeContainer newParentLNodeContainer) {
-        if (newParentLNodeContainer != eInternalContainer() || (eContainerFeatureID() != SclPackage.LNODE__PARENT_LNODE_CONTAINER && newParentLNodeContainer != null)) {
-            if (EcoreUtil.isAncestor(this, newParentLNodeContainer))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentLNodeContainer( LNodeContainer newParentLNodeContainer ) {
+        if( newParentLNodeContainer != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.LNODE__PARENT_LNODE_CONTAINER
+                        && newParentLNodeContainer != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentLNodeContainer ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentLNodeContainer != null)
-                msgs = ((InternalEObject)newParentLNodeContainer).eInverseAdd(this, SclPackage.LNODE_CONTAINER__LNODE, LNodeContainer.class, msgs);
-            msgs = basicSetParentLNodeContainer(newParentLNodeContainer, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentLNodeContainer != null )
+                msgs = ( ( InternalEObject ) newParentLNodeContainer ).eInverseAdd( this,
+                        SclPackage.LNODE_CONTAINER__LNODE, LNodeContainer.class, msgs );
+            msgs = basicSetParentLNodeContainer( newParentLNodeContainer, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LNODE__PARENT_LNODE_CONTAINER, newParentLNodeContainer, newParentLNodeContainer));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LNODE__PARENT_LNODE_CONTAINER,
+                    newParentLNodeContainer, newParentLNodeContainer ) );
     }
 
     /**
@@ -752,14 +783,19 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToLNodeType(LNodeType newRefersToLNodeType, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToLNodeType( LNodeType newRefersToLNodeType, NotificationChain msgs ) {
         LNodeType oldRefersToLNodeType = refersToLNodeType;
         refersToLNodeType = newRefersToLNodeType;
         boolean oldRefersToLNodeTypeESet = refersToLNodeTypeESet;
         refersToLNodeTypeESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.LNODE__REFERS_TO_LNODE_TYPE, oldRefersToLNodeType, newRefersToLNodeType, !oldRefersToLNodeTypeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.LNODE__REFERS_TO_LNODE_TYPE, oldRefersToLNodeType, newRefersToLNodeType,
+                    !oldRefersToLNodeTypeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -770,21 +806,24 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      * @generated
      */
     @Override
-    public void setRefersToLNodeType(LNodeType newRefersToLNodeType) {
-        if (newRefersToLNodeType != refersToLNodeType) {
+    public void setRefersToLNodeType( LNodeType newRefersToLNodeType ) {
+        if( newRefersToLNodeType != refersToLNodeType ) {
             NotificationChain msgs = null;
-            if (refersToLNodeType != null)
-                msgs = ((InternalEObject)refersToLNodeType).eInverseRemove(this, SclPackage.LNODE_TYPE__REFERRED_BY_LNODE, LNodeType.class, msgs);
-            if (newRefersToLNodeType != null)
-                msgs = ((InternalEObject)newRefersToLNodeType).eInverseAdd(this, SclPackage.LNODE_TYPE__REFERRED_BY_LNODE, LNodeType.class, msgs);
-            msgs = basicSetRefersToLNodeType(newRefersToLNodeType, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToLNodeType != null )
+                msgs = ( ( InternalEObject ) refersToLNodeType ).eInverseRemove( this,
+                        SclPackage.LNODE_TYPE__REFERRED_BY_LNODE, LNodeType.class, msgs );
+            if( newRefersToLNodeType != null )
+                msgs = ( ( InternalEObject ) newRefersToLNodeType ).eInverseAdd( this,
+                        SclPackage.LNODE_TYPE__REFERRED_BY_LNODE, LNodeType.class, msgs );
+            msgs = basicSetRefersToLNodeType( newRefersToLNodeType, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToLNodeTypeESet = refersToLNodeTypeESet;
             refersToLNodeTypeESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LNODE__REFERS_TO_LNODE_TYPE, newRefersToLNodeType, newRefersToLNodeType, !oldRefersToLNodeTypeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LNODE__REFERS_TO_LNODE_TYPE,
+                        newRefersToLNodeType, newRefersToLNodeType, !oldRefersToLNodeTypeESet ) );
         }
     }
 
@@ -793,14 +832,18 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToLNodeType(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToLNodeType( NotificationChain msgs ) {
         LNodeType oldRefersToLNodeType = refersToLNodeType;
         refersToLNodeType = null;
         boolean oldRefersToLNodeTypeESet = refersToLNodeTypeESet;
         refersToLNodeTypeESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.LNODE__REFERS_TO_LNODE_TYPE, oldRefersToLNodeType, null, oldRefersToLNodeTypeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.LNODE__REFERS_TO_LNODE_TYPE, oldRefersToLNodeType, null, oldRefersToLNodeTypeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -812,17 +855,19 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      */
     @Override
     public void unsetRefersToLNodeType() {
-        if (refersToLNodeType != null) {
+        if( refersToLNodeType != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToLNodeType).eInverseRemove(this, SclPackage.LNODE_TYPE__REFERRED_BY_LNODE, LNodeType.class, msgs);
-            msgs = basicUnsetRefersToLNodeType(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToLNodeType ).eInverseRemove( this,
+                    SclPackage.LNODE_TYPE__REFERRED_BY_LNODE, LNodeType.class, msgs );
+            msgs = basicUnsetRefersToLNodeType( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToLNodeTypeESet = refersToLNodeTypeESet;
             refersToLNodeTypeESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LNODE__REFERS_TO_LNODE_TYPE, null, null, oldRefersToLNodeTypeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LNODE__REFERS_TO_LNODE_TYPE, null,
+                        null, oldRefersToLNodeTypeESet ) );
         }
     }
 
@@ -843,21 +888,23 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LNODE__REFERS_TO_ANY_LN:
-                if (refersToAnyLN != null)
-                    msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_LNODE, AnyLN.class, msgs);
-                return basicSetRefersToAnyLN((AnyLN)otherEnd, msgs);
-            case SclPackage.LNODE__PARENT_LNODE_CONTAINER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentLNodeContainer((LNodeContainer)otherEnd, msgs);
-            case SclPackage.LNODE__REFERS_TO_LNODE_TYPE:
-                if (refersToLNodeType != null)
-                    msgs = ((InternalEObject)refersToLNodeType).eInverseRemove(this, SclPackage.LNODE_TYPE__REFERRED_BY_LNODE, LNodeType.class, msgs);
-                return basicSetRefersToLNodeType((LNodeType)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.LNODE__REFERS_TO_ANY_LN:
+            if( refersToAnyLN != null )
+                msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this, SclPackage.ANY_LN__REFERRED_BY_LNODE,
+                        AnyLN.class, msgs );
+            return basicSetRefersToAnyLN( ( AnyLN ) otherEnd, msgs );
+        case SclPackage.LNODE__PARENT_LNODE_CONTAINER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentLNodeContainer( ( LNodeContainer ) otherEnd, msgs );
+        case SclPackage.LNODE__REFERS_TO_LNODE_TYPE:
+            if( refersToLNodeType != null )
+                msgs = ( ( InternalEObject ) refersToLNodeType ).eInverseRemove( this,
+                        SclPackage.LNODE_TYPE__REFERRED_BY_LNODE, LNodeType.class, msgs );
+            return basicSetRefersToLNodeType( ( LNodeType ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -867,15 +914,15 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LNODE__REFERS_TO_ANY_LN:
-                return basicUnsetRefersToAnyLN(msgs);
-            case SclPackage.LNODE__PARENT_LNODE_CONTAINER:
-                return basicSetParentLNodeContainer(null, msgs);
-            case SclPackage.LNODE__REFERS_TO_LNODE_TYPE:
-                return basicUnsetRefersToLNodeType(msgs);
+        switch( featureID ) {
+        case SclPackage.LNODE__REFERS_TO_ANY_LN:
+            return basicUnsetRefersToAnyLN( msgs );
+        case SclPackage.LNODE__PARENT_LNODE_CONTAINER:
+            return basicSetParentLNodeContainer( null, msgs );
+        case SclPackage.LNODE__REFERS_TO_LNODE_TYPE:
+            return basicUnsetRefersToLNodeType( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -885,11 +932,12 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.LNODE__PARENT_LNODE_CONTAINER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.LNODE_CONTAINER__LNODE, LNodeContainer.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.LNODE__PARENT_LNODE_CONTAINER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.LNODE_CONTAINER__LNODE, LNodeContainer.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -899,27 +947,27 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.LNODE__IED_NAME:
-                return getIedName();
-            case SclPackage.LNODE__LD_INST:
-                return getLdInst();
-            case SclPackage.LNODE__LN_CLASS:
-                return getLnClass();
-            case SclPackage.LNODE__LN_INST:
-                return getLnInst();
-            case SclPackage.LNODE__LN_TYPE:
-                return getLnType();
-            case SclPackage.LNODE__PREFIX:
-                return getPrefix();
-            case SclPackage.LNODE__REFERS_TO_ANY_LN:
-                return getRefersToAnyLN();
-            case SclPackage.LNODE__PARENT_LNODE_CONTAINER:
-                return getParentLNodeContainer();
-            case SclPackage.LNODE__REFERS_TO_LNODE_TYPE:
-                return getRefersToLNodeType();
+        switch( featureID ) {
+        case SclPackage.LNODE__IED_NAME:
+            return getIedName();
+        case SclPackage.LNODE__LD_INST:
+            return getLdInst();
+        case SclPackage.LNODE__LN_CLASS:
+            return getLnClass();
+        case SclPackage.LNODE__LN_INST:
+            return getLnInst();
+        case SclPackage.LNODE__LN_TYPE:
+            return getLnType();
+        case SclPackage.LNODE__PREFIX:
+            return getPrefix();
+        case SclPackage.LNODE__REFERS_TO_ANY_LN:
+            return getRefersToAnyLN();
+        case SclPackage.LNODE__PARENT_LNODE_CONTAINER:
+            return getParentLNodeContainer();
+        case SclPackage.LNODE__REFERS_TO_LNODE_TYPE:
+            return getRefersToLNodeType();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -929,36 +977,36 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.LNODE__IED_NAME:
-                setIedName((String)newValue);
-                return;
-            case SclPackage.LNODE__LD_INST:
-                setLdInst((String)newValue);
-                return;
-            case SclPackage.LNODE__LN_CLASS:
-                setLnClass((String)newValue);
-                return;
-            case SclPackage.LNODE__LN_INST:
-                setLnInst((String)newValue);
-                return;
-            case SclPackage.LNODE__LN_TYPE:
-                setLnType((String)newValue);
-                return;
-            case SclPackage.LNODE__PREFIX:
-                setPrefix((String)newValue);
-                return;
-            case SclPackage.LNODE__REFERS_TO_ANY_LN:
-                setRefersToAnyLN((AnyLN)newValue);
-                return;
-            case SclPackage.LNODE__PARENT_LNODE_CONTAINER:
-                setParentLNodeContainer((LNodeContainer)newValue);
-                return;
-            case SclPackage.LNODE__REFERS_TO_LNODE_TYPE:
-                setRefersToLNodeType((LNodeType)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.LNODE__IED_NAME:
+            setIedName( ( String ) newValue );
+            return;
+        case SclPackage.LNODE__LD_INST:
+            setLdInst( ( String ) newValue );
+            return;
+        case SclPackage.LNODE__LN_CLASS:
+            setLnClass( ( String ) newValue );
+            return;
+        case SclPackage.LNODE__LN_INST:
+            setLnInst( ( String ) newValue );
+            return;
+        case SclPackage.LNODE__LN_TYPE:
+            setLnType( ( String ) newValue );
+            return;
+        case SclPackage.LNODE__PREFIX:
+            setPrefix( ( String ) newValue );
+            return;
+        case SclPackage.LNODE__REFERS_TO_ANY_LN:
+            setRefersToAnyLN( ( AnyLN ) newValue );
+            return;
+        case SclPackage.LNODE__PARENT_LNODE_CONTAINER:
+            setParentLNodeContainer( ( LNodeContainer ) newValue );
+            return;
+        case SclPackage.LNODE__REFERS_TO_LNODE_TYPE:
+            setRefersToLNodeType( ( LNodeType ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -968,36 +1016,36 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LNODE__IED_NAME:
-                unsetIedName();
-                return;
-            case SclPackage.LNODE__LD_INST:
-                unsetLdInst();
-                return;
-            case SclPackage.LNODE__LN_CLASS:
-                unsetLnClass();
-                return;
-            case SclPackage.LNODE__LN_INST:
-                unsetLnInst();
-                return;
-            case SclPackage.LNODE__LN_TYPE:
-                unsetLnType();
-                return;
-            case SclPackage.LNODE__PREFIX:
-                unsetPrefix();
-                return;
-            case SclPackage.LNODE__REFERS_TO_ANY_LN:
-                unsetRefersToAnyLN();
-                return;
-            case SclPackage.LNODE__PARENT_LNODE_CONTAINER:
-                setParentLNodeContainer((LNodeContainer)null);
-                return;
-            case SclPackage.LNODE__REFERS_TO_LNODE_TYPE:
-                unsetRefersToLNodeType();
-                return;
+        switch( featureID ) {
+        case SclPackage.LNODE__IED_NAME:
+            unsetIedName();
+            return;
+        case SclPackage.LNODE__LD_INST:
+            unsetLdInst();
+            return;
+        case SclPackage.LNODE__LN_CLASS:
+            unsetLnClass();
+            return;
+        case SclPackage.LNODE__LN_INST:
+            unsetLnInst();
+            return;
+        case SclPackage.LNODE__LN_TYPE:
+            unsetLnType();
+            return;
+        case SclPackage.LNODE__PREFIX:
+            unsetPrefix();
+            return;
+        case SclPackage.LNODE__REFERS_TO_ANY_LN:
+            unsetRefersToAnyLN();
+            return;
+        case SclPackage.LNODE__PARENT_LNODE_CONTAINER:
+            setParentLNodeContainer( ( LNodeContainer ) null );
+            return;
+        case SclPackage.LNODE__REFERS_TO_LNODE_TYPE:
+            unsetRefersToLNodeType();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -1007,27 +1055,27 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LNODE__IED_NAME:
-                return isSetIedName();
-            case SclPackage.LNODE__LD_INST:
-                return isSetLdInst();
-            case SclPackage.LNODE__LN_CLASS:
-                return isSetLnClass();
-            case SclPackage.LNODE__LN_INST:
-                return isSetLnInst();
-            case SclPackage.LNODE__LN_TYPE:
-                return isSetLnType();
-            case SclPackage.LNODE__PREFIX:
-                return isSetPrefix();
-            case SclPackage.LNODE__REFERS_TO_ANY_LN:
-                return isSetRefersToAnyLN();
-            case SclPackage.LNODE__PARENT_LNODE_CONTAINER:
-                return getParentLNodeContainer() != null;
-            case SclPackage.LNODE__REFERS_TO_LNODE_TYPE:
-                return isSetRefersToLNodeType();
+        switch( featureID ) {
+        case SclPackage.LNODE__IED_NAME:
+            return isSetIedName();
+        case SclPackage.LNODE__LD_INST:
+            return isSetLdInst();
+        case SclPackage.LNODE__LN_CLASS:
+            return isSetLnClass();
+        case SclPackage.LNODE__LN_INST:
+            return isSetLnInst();
+        case SclPackage.LNODE__LN_TYPE:
+            return isSetLnType();
+        case SclPackage.LNODE__PREFIX:
+            return isSetPrefix();
+        case SclPackage.LNODE__REFERS_TO_ANY_LN:
+            return isSetRefersToAnyLN();
+        case SclPackage.LNODE__PARENT_LNODE_CONTAINER:
+            return getParentLNodeContainer() != null;
+        case SclPackage.LNODE__REFERS_TO_LNODE_TYPE:
+            return isSetRefersToLNodeType();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -1037,22 +1085,40 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (iedName: ");
-        if (iedNameESet) result.append(iedName); else result.append("<unset>");
-        result.append(", ldInst: ");
-        if (ldInstESet) result.append(ldInst); else result.append("<unset>");
-        result.append(", lnClass: ");
-        if (lnClassESet) result.append(lnClass); else result.append("<unset>");
-        result.append(", lnInst: ");
-        if (lnInstESet) result.append(lnInst); else result.append("<unset>");
-        result.append(", lnType: ");
-        if (lnTypeESet) result.append(lnType); else result.append("<unset>");
-        result.append(", prefix: ");
-        if (prefixESet) result.append(prefix); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (iedName: " );
+        if( iedNameESet )
+            result.append( iedName );
+        else
+            result.append( "<unset>" );
+        result.append( ", ldInst: " );
+        if( ldInstESet )
+            result.append( ldInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnClass: " );
+        if( lnClassESet )
+            result.append( lnClass );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnInst: " );
+        if( lnInstESet )
+            result.append( lnInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnType: " );
+        if( lnTypeESet )
+            result.append( lnType );
+        else
+            result.append( "<unset>" );
+        result.append( ", prefix: " );
+        if( prefixESet )
+            result.append( prefix );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -1060,7 +1126,7 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         String messagePrefix = "[SCL links] while resolving link from LNode on line " + getLineNumber() + ": ";
         doBuildExplicitAnyLNLink( console, messagePrefix );
         doBuildExplicitLNodeTypeLink( console, messagePrefix );
@@ -1069,7 +1135,7 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
     private void doBuildExplicitAnyLNLink( IRiseClipseConsole console, String mPrefix ) {
 
         String messagePrefix = mPrefix + "(looking for LN) ";
-        
+
         // lnInst   The LN instance identification. Can only be missing for lnClass=LLN0, meaning as value here the empty string
         // lnClass  The LN class as defined in IEC 61850-7-x
         // iedName  The name of the IED which contains the LN, none if used for specification (default if attribute is not specified)
@@ -1080,12 +1146,12 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
 
         // Resolve only if attribute is not None
         // Default value is None
-        if(( getIedName() == null ) || getIedName().isEmpty() || "None".equals( getIedName() )) {
+        if( ( getIedName() == null ) || getIedName().isEmpty() || "None".equals( getIedName() ) ) {
             console.verbose( messagePrefix, "link to AnyLN not resolved because iedName is absent or None" );
             return;
         }
-        
-        if(( getLnClass() == null ) || getLnClass().isEmpty() ) {
+
+        if( ( getLnClass() == null ) || getLnClass().isEmpty() ) {
             console.warning( messagePrefix, "lnClass is missing" );
             return;
         }
@@ -1099,7 +1165,7 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
             return;
         }
         console.verbose( messagePrefix, "found ", mess1, " on line ", ied.getLeft().getLineNumber() );
-        
+
         // find inside an LDevice with
         //   LDevice.name == LNode.ldInst
         Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ied.getLeft(), getLdInst() );
@@ -1114,7 +1180,8 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
         //   LN.lnClass == LNode.lnClass
         //   LN.prefix == LNode.prefix
         //   LN.inst == LNode.lnInst
-        Pair< AnyLN, Integer > anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(), getPrefix() );
+        Pair< AnyLN, Integer > anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(),
+                getPrefix() );
         String mess3 = "LN( lnClass = " + getLnClass();
         if( getLnInst() != null ) {
             mess3 += ", inst = " + getLnInst();
@@ -1126,16 +1193,17 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
             return;
         }
         setRefersToAnyLN( anyLN.getLeft() );
-        console.info( "[SCL links] LNode on line ", getLineNumber(), " refers to ", mess3, " on line ", getRefersToAnyLN().getLineNumber() );
+        console.info( "[SCL links] LNode on line ", getLineNumber(), " refers to ", mess3, " on line ",
+                getRefersToAnyLN().getLineNumber() );
     }
 
     private void doBuildExplicitLNodeTypeLink( IRiseClipseConsole console, String mPrefix ) {
 
         String messagePrefix = mPrefix + "(looking for LNodeType) ";
-        
+
         // lnType   The logical node type definition containing more detailed functional specification. Might be missing, if the LN is allocated to an IED.
 
-        if(( getLnType() == null ) || getLnType().isEmpty() ) {
+        if( ( getLnType() == null ) || getLnType().isEmpty() ) {
             console.verbose( messagePrefix, "link not resolved because lnType is missing" );
             return;
         }
@@ -1145,24 +1213,25 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
             return;
         }
 
-        List< LNodeType > res =
-                dtt
+        List< LNodeType > res = dtt
                 .getLNodeType()
                 .stream()
-                .filter( lnt -> getLnType().equals( lnt.getId() ))
+                .filter( lnt -> getLnType().equals( lnt.getId() ) )
                 .collect( Collectors.toList() );
-        
+
         String mess = "LNodeType( id = " + getLnType() + " )";
         if( res.size() != 1 ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess, res.size() );
             return;
         }
         setRefersToLNodeType( res.get( 0 ) );
-        console.info( "[SCL links] AnyLN on line ", getLineNumber(), " refers to ", mess, " on line ", getRefersToLNodeType().getLineNumber() );
-        
-        if(( getLnClass() != null ) && ! getLnClass().equals( getRefersToLNodeType().getLnClass() )) {
-            console.warning( messagePrefix, "lnClass in ", mess, "(", getRefersToLNodeType().getLnClass(), ") is not ", getLnClass() );
+        console.info( "[SCL links] AnyLN on line ", getLineNumber(), " refers to ", mess, " on line ",
+                getRefersToLNodeType().getLineNumber() );
+
+        if( ( getLnClass() != null ) && !getLnClass().equals( getRefersToLNodeType().getLnClass() ) ) {
+            console.warning( messagePrefix, "lnClass in ", mess, "(", getRefersToLNodeType().getLnClass(), ") is not ",
+                    getLnClass() );
         }
     }
-    
+
 } //LNodeImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeTypeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeTypeImpl.java
index 7dcb756..d936957 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeTypeImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeTypeImpl.java
@@ -124,7 +124,7 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      * @generated
      * @ordered
      */
-    protected EList<DO> do_;
+    protected EList< DO > do_;
 
     /**
      * The cached value of the '{@link #getReferredByAnyLN() <em>Referred By Any LN</em>}' reference list.
@@ -134,7 +134,7 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      * @generated
      * @ordered
      */
-    protected EList<AnyLN> referredByAnyLN;
+    protected EList< AnyLN > referredByAnyLN;
 
     /**
      * The cached value of the '{@link #getReferredByLNode() <em>Referred By LNode</em>}' reference list.
@@ -144,7 +144,7 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      * @generated
      * @ordered
      */
-    protected EList<LNode> referredByLNode;
+    protected EList< LNode > referredByLNode;
 
     /**
      * <!-- begin-user-doc -->
@@ -186,8 +186,9 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
         iedType = newIedType;
         boolean oldIedTypeESet = iedTypeESet;
         iedTypeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LNODE_TYPE__IED_TYPE, oldIedType, iedType, !oldIedTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LNODE_TYPE__IED_TYPE, oldIedType,
+                    iedType, !oldIedTypeESet ) );
     }
 
     /**
@@ -201,8 +202,9 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
         boolean oldIedTypeESet = iedTypeESet;
         iedType = IED_TYPE_EDEFAULT;
         iedTypeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LNODE_TYPE__IED_TYPE, oldIedType, IED_TYPE_EDEFAULT, oldIedTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LNODE_TYPE__IED_TYPE, oldIedType,
+                    IED_TYPE_EDEFAULT, oldIedTypeESet ) );
     }
 
     /**
@@ -236,8 +238,9 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
         lnClass = newLnClass;
         boolean oldLnClassESet = lnClassESet;
         lnClassESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LNODE_TYPE__LN_CLASS, oldLnClass, lnClass, !oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LNODE_TYPE__LN_CLASS, oldLnClass,
+                    lnClass, !oldLnClassESet ) );
     }
 
     /**
@@ -251,8 +254,9 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
         boolean oldLnClassESet = lnClassESet;
         lnClass = LN_CLASS_EDEFAULT;
         lnClassESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LNODE_TYPE__LN_CLASS, oldLnClass, LN_CLASS_EDEFAULT, oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LNODE_TYPE__LN_CLASS, oldLnClass,
+                    LN_CLASS_EDEFAULT, oldLnClassESet ) );
     }
 
     /**
@@ -271,9 +275,10 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      * @generated
      */
     @Override
-    public EList<DO> getDO() {
-        if (do_ == null) {
-            do_ = new EObjectContainmentWithInverseEList.Unsettable<DO>(DO.class, this, SclPackage.LNODE_TYPE__DO, SclPackage.DO__PARENT_LNODE_TYPE);
+    public EList< DO > getDO() {
+        if( do_ == null ) {
+            do_ = new EObjectContainmentWithInverseEList.Unsettable< DO >( DO.class, this, SclPackage.LNODE_TYPE__DO,
+                    SclPackage.DO__PARENT_LNODE_TYPE );
         }
         return do_;
     }
@@ -285,7 +290,7 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      */
     @Override
     public void unsetDO() {
-        if (do_ != null) ((InternalEList.Unsettable<?>)do_).unset();
+        if( do_ != null ) ( ( InternalEList.Unsettable< ? > ) do_ ).unset();
     }
 
     /**
@@ -295,7 +300,7 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      */
     @Override
     public boolean isSetDO() {
-        return do_ != null && ((InternalEList.Unsettable<?>)do_).isSet();
+        return do_ != null && ( ( InternalEList.Unsettable< ? > ) do_ ).isSet();
     }
 
     /**
@@ -305,8 +310,8 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      */
     @Override
     public DataTypeTemplates getParentDataTypeTemplates() {
-        if (eContainerFeatureID() != SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES) return null;
-        return (DataTypeTemplates)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES ) return null;
+        return ( DataTypeTemplates ) eInternalContainer();
     }
 
     /**
@@ -314,8 +319,10 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentDataTypeTemplates(DataTypeTemplates newParentDataTypeTemplates, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentDataTypeTemplates, SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES, msgs);
+    public NotificationChain basicSetParentDataTypeTemplates( DataTypeTemplates newParentDataTypeTemplates,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentDataTypeTemplates,
+                SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES, msgs );
         return msgs;
     }
 
@@ -325,20 +332,24 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      * @generated
      */
     @Override
-    public void setParentDataTypeTemplates(DataTypeTemplates newParentDataTypeTemplates) {
-        if (newParentDataTypeTemplates != eInternalContainer() || (eContainerFeatureID() != SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES && newParentDataTypeTemplates != null)) {
-            if (EcoreUtil.isAncestor(this, newParentDataTypeTemplates))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentDataTypeTemplates( DataTypeTemplates newParentDataTypeTemplates ) {
+        if( newParentDataTypeTemplates != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES
+                        && newParentDataTypeTemplates != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentDataTypeTemplates ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentDataTypeTemplates != null)
-                msgs = ((InternalEObject)newParentDataTypeTemplates).eInverseAdd(this, SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE, DataTypeTemplates.class, msgs);
-            msgs = basicSetParentDataTypeTemplates(newParentDataTypeTemplates, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentDataTypeTemplates != null )
+                msgs = ( ( InternalEObject ) newParentDataTypeTemplates ).eInverseAdd( this,
+                        SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE, DataTypeTemplates.class, msgs );
+            msgs = basicSetParentDataTypeTemplates( newParentDataTypeTemplates, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES, newParentDataTypeTemplates, newParentDataTypeTemplates));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES,
+                    newParentDataTypeTemplates, newParentDataTypeTemplates ) );
     }
 
     /**
@@ -347,9 +358,10 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      * @generated
      */
     @Override
-    public EList<AnyLN> getReferredByAnyLN() {
-        if (referredByAnyLN == null) {
-            referredByAnyLN = new EObjectWithInverseEList.Unsettable<AnyLN>(AnyLN.class, this, SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN, SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE);
+    public EList< AnyLN > getReferredByAnyLN() {
+        if( referredByAnyLN == null ) {
+            referredByAnyLN = new EObjectWithInverseEList.Unsettable< AnyLN >( AnyLN.class, this,
+                    SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN, SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE );
         }
         return referredByAnyLN;
     }
@@ -361,7 +373,7 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      */
     @Override
     public void unsetReferredByAnyLN() {
-        if (referredByAnyLN != null) ((InternalEList.Unsettable<?>)referredByAnyLN).unset();
+        if( referredByAnyLN != null ) ( ( InternalEList.Unsettable< ? > ) referredByAnyLN ).unset();
     }
 
     /**
@@ -371,7 +383,7 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      */
     @Override
     public boolean isSetReferredByAnyLN() {
-        return referredByAnyLN != null && ((InternalEList.Unsettable<?>)referredByAnyLN).isSet();
+        return referredByAnyLN != null && ( ( InternalEList.Unsettable< ? > ) referredByAnyLN ).isSet();
     }
 
     /**
@@ -380,9 +392,10 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      * @generated
      */
     @Override
-    public EList<LNode> getReferredByLNode() {
-        if (referredByLNode == null) {
-            referredByLNode = new EObjectWithInverseEList.Unsettable<LNode>(LNode.class, this, SclPackage.LNODE_TYPE__REFERRED_BY_LNODE, SclPackage.LNODE__REFERS_TO_LNODE_TYPE);
+    public EList< LNode > getReferredByLNode() {
+        if( referredByLNode == null ) {
+            referredByLNode = new EObjectWithInverseEList.Unsettable< LNode >( LNode.class, this,
+                    SclPackage.LNODE_TYPE__REFERRED_BY_LNODE, SclPackage.LNODE__REFERS_TO_LNODE_TYPE );
         }
         return referredByLNode;
     }
@@ -394,7 +407,7 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      */
     @Override
     public void unsetReferredByLNode() {
-        if (referredByLNode != null) ((InternalEList.Unsettable<?>)referredByLNode).unset();
+        if( referredByLNode != null ) ( ( InternalEList.Unsettable< ? > ) referredByLNode ).unset();
     }
 
     /**
@@ -404,7 +417,7 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      */
     @Override
     public boolean isSetReferredByLNode() {
-        return referredByLNode != null && ((InternalEList.Unsettable<?>)referredByLNode).isSet();
+        return referredByLNode != null && ( ( InternalEList.Unsettable< ? > ) referredByLNode ).isSet();
     }
 
     /**
@@ -415,19 +428,21 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LNODE_TYPE__DO:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getDO()).basicAdd(otherEnd, msgs);
-            case SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentDataTypeTemplates((DataTypeTemplates)otherEnd, msgs);
-            case SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByAnyLN()).basicAdd(otherEnd, msgs);
-            case SclPackage.LNODE_TYPE__REFERRED_BY_LNODE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByLNode()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.LNODE_TYPE__DO:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getDO() ).basicAdd( otherEnd, msgs );
+        case SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentDataTypeTemplates( ( DataTypeTemplates ) otherEnd, msgs );
+        case SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByAnyLN() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.LNODE_TYPE__REFERRED_BY_LNODE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByLNode() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -437,17 +452,17 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LNODE_TYPE__DO:
-                return ((InternalEList<?>)getDO()).basicRemove(otherEnd, msgs);
-            case SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return basicSetParentDataTypeTemplates(null, msgs);
-            case SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN:
-                return ((InternalEList<?>)getReferredByAnyLN()).basicRemove(otherEnd, msgs);
-            case SclPackage.LNODE_TYPE__REFERRED_BY_LNODE:
-                return ((InternalEList<?>)getReferredByLNode()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.LNODE_TYPE__DO:
+            return ( ( InternalEList< ? > ) getDO() ).basicRemove( otherEnd, msgs );
+        case SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return basicSetParentDataTypeTemplates( null, msgs );
+        case SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN:
+            return ( ( InternalEList< ? > ) getReferredByAnyLN() ).basicRemove( otherEnd, msgs );
+        case SclPackage.LNODE_TYPE__REFERRED_BY_LNODE:
+            return ( ( InternalEList< ? > ) getReferredByLNode() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -457,11 +472,12 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE, DataTypeTemplates.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.DATA_TYPE_TEMPLATES__LNODE_TYPE,
+                    DataTypeTemplates.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -471,21 +487,21 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.LNODE_TYPE__IED_TYPE:
-                return getIedType();
-            case SclPackage.LNODE_TYPE__LN_CLASS:
-                return getLnClass();
-            case SclPackage.LNODE_TYPE__DO:
-                return getDO();
-            case SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return getParentDataTypeTemplates();
-            case SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN:
-                return getReferredByAnyLN();
-            case SclPackage.LNODE_TYPE__REFERRED_BY_LNODE:
-                return getReferredByLNode();
+        switch( featureID ) {
+        case SclPackage.LNODE_TYPE__IED_TYPE:
+            return getIedType();
+        case SclPackage.LNODE_TYPE__LN_CLASS:
+            return getLnClass();
+        case SclPackage.LNODE_TYPE__DO:
+            return getDO();
+        case SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return getParentDataTypeTemplates();
+        case SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN:
+            return getReferredByAnyLN();
+        case SclPackage.LNODE_TYPE__REFERRED_BY_LNODE:
+            return getReferredByLNode();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -496,30 +512,30 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.LNODE_TYPE__IED_TYPE:
-                setIedType((String)newValue);
-                return;
-            case SclPackage.LNODE_TYPE__LN_CLASS:
-                setLnClass((String)newValue);
-                return;
-            case SclPackage.LNODE_TYPE__DO:
-                getDO().clear();
-                getDO().addAll((Collection<? extends DO>)newValue);
-                return;
-            case SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                setParentDataTypeTemplates((DataTypeTemplates)newValue);
-                return;
-            case SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN:
-                getReferredByAnyLN().clear();
-                getReferredByAnyLN().addAll((Collection<? extends AnyLN>)newValue);
-                return;
-            case SclPackage.LNODE_TYPE__REFERRED_BY_LNODE:
-                getReferredByLNode().clear();
-                getReferredByLNode().addAll((Collection<? extends LNode>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.LNODE_TYPE__IED_TYPE:
+            setIedType( ( String ) newValue );
+            return;
+        case SclPackage.LNODE_TYPE__LN_CLASS:
+            setLnClass( ( String ) newValue );
+            return;
+        case SclPackage.LNODE_TYPE__DO:
+            getDO().clear();
+            getDO().addAll( ( Collection< ? extends DO > ) newValue );
+            return;
+        case SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            setParentDataTypeTemplates( ( DataTypeTemplates ) newValue );
+            return;
+        case SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN:
+            getReferredByAnyLN().clear();
+            getReferredByAnyLN().addAll( ( Collection< ? extends AnyLN > ) newValue );
+            return;
+        case SclPackage.LNODE_TYPE__REFERRED_BY_LNODE:
+            getReferredByLNode().clear();
+            getReferredByLNode().addAll( ( Collection< ? extends LNode > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -529,27 +545,27 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LNODE_TYPE__IED_TYPE:
-                unsetIedType();
-                return;
-            case SclPackage.LNODE_TYPE__LN_CLASS:
-                unsetLnClass();
-                return;
-            case SclPackage.LNODE_TYPE__DO:
-                unsetDO();
-                return;
-            case SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                setParentDataTypeTemplates((DataTypeTemplates)null);
-                return;
-            case SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN:
-                unsetReferredByAnyLN();
-                return;
-            case SclPackage.LNODE_TYPE__REFERRED_BY_LNODE:
-                unsetReferredByLNode();
-                return;
+        switch( featureID ) {
+        case SclPackage.LNODE_TYPE__IED_TYPE:
+            unsetIedType();
+            return;
+        case SclPackage.LNODE_TYPE__LN_CLASS:
+            unsetLnClass();
+            return;
+        case SclPackage.LNODE_TYPE__DO:
+            unsetDO();
+            return;
+        case SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            setParentDataTypeTemplates( ( DataTypeTemplates ) null );
+            return;
+        case SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN:
+            unsetReferredByAnyLN();
+            return;
+        case SclPackage.LNODE_TYPE__REFERRED_BY_LNODE:
+            unsetReferredByLNode();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -559,21 +575,21 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LNODE_TYPE__IED_TYPE:
-                return isSetIedType();
-            case SclPackage.LNODE_TYPE__LN_CLASS:
-                return isSetLnClass();
-            case SclPackage.LNODE_TYPE__DO:
-                return isSetDO();
-            case SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES:
-                return getParentDataTypeTemplates() != null;
-            case SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN:
-                return isSetReferredByAnyLN();
-            case SclPackage.LNODE_TYPE__REFERRED_BY_LNODE:
-                return isSetReferredByLNode();
+        switch( featureID ) {
+        case SclPackage.LNODE_TYPE__IED_TYPE:
+            return isSetIedType();
+        case SclPackage.LNODE_TYPE__LN_CLASS:
+            return isSetLnClass();
+        case SclPackage.LNODE_TYPE__DO:
+            return isSetDO();
+        case SclPackage.LNODE_TYPE__PARENT_DATA_TYPE_TEMPLATES:
+            return getParentDataTypeTemplates() != null;
+        case SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN:
+            return isSetReferredByAnyLN();
+        case SclPackage.LNODE_TYPE__REFERRED_BY_LNODE:
+            return isSetReferredByLNode();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -583,14 +599,20 @@ public class LNodeTypeImpl extends IDNamingImpl implements LNodeType {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (iedType: ");
-        if (iedTypeESet) result.append(iedType); else result.append("<unset>");
-        result.append(", lnClass: ");
-        if (lnClassESet) result.append(lnClass); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (iedType: " );
+        if( iedTypeESet )
+            result.append( iedType );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnClass: " );
+        if( lnClassESet )
+            result.append( lnClass );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LineImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LineImpl.java
index 737e10c..d7ee2bd 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LineImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LineImpl.java
@@ -97,7 +97,7 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      * @generated
      * @ordered
      */
-    protected EList<ConnectivityNode> connectivityNode;
+    protected EList< ConnectivityNode > connectivityNode;
 
     /**
      * The cached value of the '{@link #getConductingEquipment() <em>Conducting Equipment</em>}' containment reference list.
@@ -107,7 +107,7 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      * @generated
      * @ordered
      */
-    protected EList<ConductingEquipment> conductingEquipment;
+    protected EList< ConductingEquipment > conductingEquipment;
 
     /**
      * The cached value of the '{@link #getVoltage() <em>Voltage</em>}' containment reference.
@@ -226,8 +226,9 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LINE__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LINE__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -241,8 +242,9 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LINE__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LINE__TYPE, oldType, TYPE_EDEFAULT,
+                    oldTypeESet ) );
     }
 
     /**
@@ -262,8 +264,8 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      */
     @Override
     public fr.centralesupelec.edf.riseclipse.iec61850.scl.Process getParentProcess() {
-        if (eContainerFeatureID() != SclPackage.LINE__PARENT_PROCESS) return null;
-        return (fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.LINE__PARENT_PROCESS ) return null;
+        return ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) eInternalContainer();
     }
 
     /**
@@ -271,8 +273,9 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentProcess(fr.centralesupelec.edf.riseclipse.iec61850.scl.Process newParentProcess, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentProcess, SclPackage.LINE__PARENT_PROCESS, msgs);
+    public NotificationChain basicSetParentProcess(
+            fr.centralesupelec.edf.riseclipse.iec61850.scl.Process newParentProcess, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentProcess, SclPackage.LINE__PARENT_PROCESS, msgs );
         return msgs;
     }
 
@@ -282,20 +285,23 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      * @generated
      */
     @Override
-    public void setParentProcess(fr.centralesupelec.edf.riseclipse.iec61850.scl.Process newParentProcess) {
-        if (newParentProcess != eInternalContainer() || (eContainerFeatureID() != SclPackage.LINE__PARENT_PROCESS && newParentProcess != null)) {
-            if (EcoreUtil.isAncestor(this, newParentProcess))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentProcess( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process newParentProcess ) {
+        if( newParentProcess != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.LINE__PARENT_PROCESS && newParentProcess != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentProcess ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentProcess != null)
-                msgs = ((InternalEObject)newParentProcess).eInverseAdd(this, SclPackage.PROCESS__LINE, fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs);
-            msgs = basicSetParentProcess(newParentProcess, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentProcess != null )
+                msgs = ( ( InternalEObject ) newParentProcess ).eInverseAdd( this, SclPackage.PROCESS__LINE,
+                        fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs );
+            msgs = basicSetParentProcess( newParentProcess, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LINE__PARENT_PROCESS, newParentProcess, newParentProcess));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LINE__PARENT_PROCESS, newParentProcess,
+                    newParentProcess ) );
     }
 
     /**
@@ -305,8 +311,8 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      */
     @Override
     public SCL getParentSCL() {
-        if (eContainerFeatureID() != SclPackage.LINE__PARENT_SCL) return null;
-        return (SCL)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.LINE__PARENT_SCL ) return null;
+        return ( SCL ) eInternalContainer();
     }
 
     /**
@@ -314,8 +320,8 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSCL(SCL newParentSCL, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSCL, SclPackage.LINE__PARENT_SCL, msgs);
+    public NotificationChain basicSetParentSCL( SCL newParentSCL, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSCL, SclPackage.LINE__PARENT_SCL, msgs );
         return msgs;
     }
 
@@ -325,20 +331,22 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      * @generated
      */
     @Override
-    public void setParentSCL(SCL newParentSCL) {
-        if (newParentSCL != eInternalContainer() || (eContainerFeatureID() != SclPackage.LINE__PARENT_SCL && newParentSCL != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSCL))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSCL( SCL newParentSCL ) {
+        if( newParentSCL != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.LINE__PARENT_SCL && newParentSCL != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSCL ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSCL != null)
-                msgs = ((InternalEObject)newParentSCL).eInverseAdd(this, SclPackage.SCL__LINE, SCL.class, msgs);
-            msgs = basicSetParentSCL(newParentSCL, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSCL != null )
+                msgs = ( ( InternalEObject ) newParentSCL ).eInverseAdd( this, SclPackage.SCL__LINE, SCL.class, msgs );
+            msgs = basicSetParentSCL( newParentSCL, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LINE__PARENT_SCL, newParentSCL, newParentSCL));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LINE__PARENT_SCL, newParentSCL,
+                    newParentSCL ) );
     }
 
     /**
@@ -347,9 +355,11 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      * @generated
      */
     @Override
-    public EList<ConnectivityNode> getConnectivityNode() {
-        if (connectivityNode == null) {
-            connectivityNode = new EObjectContainmentWithInverseEList.Unsettable<ConnectivityNode>(ConnectivityNode.class, this, SclPackage.LINE__CONNECTIVITY_NODE, SclPackage.CONNECTIVITY_NODE__PARENT_LINE);
+    public EList< ConnectivityNode > getConnectivityNode() {
+        if( connectivityNode == null ) {
+            connectivityNode = new EObjectContainmentWithInverseEList.Unsettable< ConnectivityNode >(
+                    ConnectivityNode.class, this, SclPackage.LINE__CONNECTIVITY_NODE,
+                    SclPackage.CONNECTIVITY_NODE__PARENT_LINE );
         }
         return connectivityNode;
     }
@@ -361,7 +371,7 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      */
     @Override
     public void unsetConnectivityNode() {
-        if (connectivityNode != null) ((InternalEList.Unsettable<?>)connectivityNode).unset();
+        if( connectivityNode != null ) ( ( InternalEList.Unsettable< ? > ) connectivityNode ).unset();
     }
 
     /**
@@ -371,7 +381,7 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      */
     @Override
     public boolean isSetConnectivityNode() {
-        return connectivityNode != null && ((InternalEList.Unsettable<?>)connectivityNode).isSet();
+        return connectivityNode != null && ( ( InternalEList.Unsettable< ? > ) connectivityNode ).isSet();
     }
 
     /**
@@ -380,9 +390,11 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      * @generated
      */
     @Override
-    public EList<ConductingEquipment> getConductingEquipment() {
-        if (conductingEquipment == null) {
-            conductingEquipment = new EObjectContainmentWithInverseEList.Unsettable<ConductingEquipment>(ConductingEquipment.class, this, SclPackage.LINE__CONDUCTING_EQUIPMENT, SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE);
+    public EList< ConductingEquipment > getConductingEquipment() {
+        if( conductingEquipment == null ) {
+            conductingEquipment = new EObjectContainmentWithInverseEList.Unsettable< ConductingEquipment >(
+                    ConductingEquipment.class, this, SclPackage.LINE__CONDUCTING_EQUIPMENT,
+                    SclPackage.CONDUCTING_EQUIPMENT__PARENT_LINE );
         }
         return conductingEquipment;
     }
@@ -394,7 +406,7 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      */
     @Override
     public void unsetConductingEquipment() {
-        if (conductingEquipment != null) ((InternalEList.Unsettable<?>)conductingEquipment).unset();
+        if( conductingEquipment != null ) ( ( InternalEList.Unsettable< ? > ) conductingEquipment ).unset();
     }
 
     /**
@@ -404,7 +416,7 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      */
     @Override
     public boolean isSetConductingEquipment() {
-        return conductingEquipment != null && ((InternalEList.Unsettable<?>)conductingEquipment).isSet();
+        return conductingEquipment != null && ( ( InternalEList.Unsettable< ? > ) conductingEquipment ).isSet();
     }
 
     /**
@@ -422,14 +434,18 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetVoltage(Voltage newVoltage, NotificationChain msgs) {
+    public NotificationChain basicSetVoltage( Voltage newVoltage, NotificationChain msgs ) {
         Voltage oldVoltage = voltage;
         voltage = newVoltage;
         boolean oldVoltageESet = voltageESet;
         voltageESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.LINE__VOLTAGE, oldVoltage, newVoltage, !oldVoltageESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.LINE__VOLTAGE,
+                    oldVoltage, newVoltage, !oldVoltageESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -440,21 +456,24 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      * @generated
      */
     @Override
-    public void setVoltage(Voltage newVoltage) {
-        if (newVoltage != voltage) {
+    public void setVoltage( Voltage newVoltage ) {
+        if( newVoltage != voltage ) {
             NotificationChain msgs = null;
-            if (voltage != null)
-                msgs = ((InternalEObject)voltage).eInverseRemove(this, SclPackage.VOLTAGE__PARENT_LINE, Voltage.class, msgs);
-            if (newVoltage != null)
-                msgs = ((InternalEObject)newVoltage).eInverseAdd(this, SclPackage.VOLTAGE__PARENT_LINE, Voltage.class, msgs);
-            msgs = basicSetVoltage(newVoltage, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( voltage != null )
+                msgs = ( ( InternalEObject ) voltage ).eInverseRemove( this, SclPackage.VOLTAGE__PARENT_LINE,
+                        Voltage.class, msgs );
+            if( newVoltage != null )
+                msgs = ( ( InternalEObject ) newVoltage ).eInverseAdd( this, SclPackage.VOLTAGE__PARENT_LINE,
+                        Voltage.class, msgs );
+            msgs = basicSetVoltage( newVoltage, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldVoltageESet = voltageESet;
             voltageESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LINE__VOLTAGE, newVoltage, newVoltage, !oldVoltageESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LINE__VOLTAGE, newVoltage,
+                        newVoltage, !oldVoltageESet ) );
         }
     }
 
@@ -463,14 +482,18 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetVoltage(NotificationChain msgs) {
+    public NotificationChain basicUnsetVoltage( NotificationChain msgs ) {
         Voltage oldVoltage = voltage;
         voltage = null;
         boolean oldVoltageESet = voltageESet;
         voltageESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.LINE__VOLTAGE, oldVoltage, null, oldVoltageESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.LINE__VOLTAGE,
+                    oldVoltage, null, oldVoltageESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -482,17 +505,19 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      */
     @Override
     public void unsetVoltage() {
-        if (voltage != null) {
+        if( voltage != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)voltage).eInverseRemove(this, SclPackage.VOLTAGE__PARENT_LINE, Voltage.class, msgs);
-            msgs = basicUnsetVoltage(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) voltage ).eInverseRemove( this, SclPackage.VOLTAGE__PARENT_LINE, Voltage.class,
+                    msgs );
+            msgs = basicUnsetVoltage( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldVoltageESet = voltageESet;
             voltageESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LINE__VOLTAGE, null, null, oldVoltageESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LINE__VOLTAGE, null, null,
+                        oldVoltageESet ) );
         }
     }
 
@@ -522,13 +547,14 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      * @generated
      */
     @Override
-    public void setNomFreq(BigDecimal newNomFreq) {
+    public void setNomFreq( BigDecimal newNomFreq ) {
         BigDecimal oldNomFreq = nomFreq;
         nomFreq = newNomFreq;
         boolean oldNomFreqESet = nomFreqESet;
         nomFreqESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LINE__NOM_FREQ, oldNomFreq, nomFreq, !oldNomFreqESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LINE__NOM_FREQ, oldNomFreq, nomFreq,
+                    !oldNomFreqESet ) );
     }
 
     /**
@@ -542,8 +568,9 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
         boolean oldNomFreqESet = nomFreqESet;
         nomFreq = NOM_FREQ_EDEFAULT;
         nomFreqESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LINE__NOM_FREQ, oldNomFreq, NOM_FREQ_EDEFAULT, oldNomFreqESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LINE__NOM_FREQ, oldNomFreq,
+                    NOM_FREQ_EDEFAULT, oldNomFreqESet ) );
     }
 
     /**
@@ -572,13 +599,14 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      * @generated
      */
     @Override
-    public void setNumPhases(Integer newNumPhases) {
+    public void setNumPhases( Integer newNumPhases ) {
         Integer oldNumPhases = numPhases;
         numPhases = newNumPhases;
         boolean oldNumPhasesESet = numPhasesESet;
         numPhasesESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LINE__NUM_PHASES, oldNumPhases, numPhases, !oldNumPhasesESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LINE__NUM_PHASES, oldNumPhases,
+                    numPhases, !oldNumPhasesESet ) );
     }
 
     /**
@@ -592,8 +620,9 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
         boolean oldNumPhasesESet = numPhasesESet;
         numPhases = NUM_PHASES_EDEFAULT;
         numPhasesESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LINE__NUM_PHASES, oldNumPhases, NUM_PHASES_EDEFAULT, oldNumPhasesESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LINE__NUM_PHASES, oldNumPhases,
+                    NUM_PHASES_EDEFAULT, oldNumPhasesESet ) );
     }
 
     /**
@@ -614,25 +643,28 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LINE__PARENT_PROCESS:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentProcess((fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)otherEnd, msgs);
-            case SclPackage.LINE__PARENT_SCL:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSCL((SCL)otherEnd, msgs);
-            case SclPackage.LINE__CONNECTIVITY_NODE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getConnectivityNode()).basicAdd(otherEnd, msgs);
-            case SclPackage.LINE__CONDUCTING_EQUIPMENT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getConductingEquipment()).basicAdd(otherEnd, msgs);
-            case SclPackage.LINE__VOLTAGE:
-                if (voltage != null)
-                    msgs = ((InternalEObject)voltage).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.LINE__VOLTAGE, null, msgs);
-                return basicSetVoltage((Voltage)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.LINE__PARENT_PROCESS:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentProcess( ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) otherEnd, msgs );
+        case SclPackage.LINE__PARENT_SCL:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSCL( ( SCL ) otherEnd, msgs );
+        case SclPackage.LINE__CONNECTIVITY_NODE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getConnectivityNode() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.LINE__CONDUCTING_EQUIPMENT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getConductingEquipment() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.LINE__VOLTAGE:
+            if( voltage != null )
+                msgs = ( ( InternalEObject ) voltage ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.LINE__VOLTAGE, null, msgs );
+            return basicSetVoltage( ( Voltage ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -642,19 +674,19 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LINE__PARENT_PROCESS:
-                return basicSetParentProcess(null, msgs);
-            case SclPackage.LINE__PARENT_SCL:
-                return basicSetParentSCL(null, msgs);
-            case SclPackage.LINE__CONNECTIVITY_NODE:
-                return ((InternalEList<?>)getConnectivityNode()).basicRemove(otherEnd, msgs);
-            case SclPackage.LINE__CONDUCTING_EQUIPMENT:
-                return ((InternalEList<?>)getConductingEquipment()).basicRemove(otherEnd, msgs);
-            case SclPackage.LINE__VOLTAGE:
-                return basicUnsetVoltage(msgs);
+        switch( featureID ) {
+        case SclPackage.LINE__PARENT_PROCESS:
+            return basicSetParentProcess( null, msgs );
+        case SclPackage.LINE__PARENT_SCL:
+            return basicSetParentSCL( null, msgs );
+        case SclPackage.LINE__CONNECTIVITY_NODE:
+            return ( ( InternalEList< ? > ) getConnectivityNode() ).basicRemove( otherEnd, msgs );
+        case SclPackage.LINE__CONDUCTING_EQUIPMENT:
+            return ( ( InternalEList< ? > ) getConductingEquipment() ).basicRemove( otherEnd, msgs );
+        case SclPackage.LINE__VOLTAGE:
+            return basicUnsetVoltage( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -664,13 +696,14 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.LINE__PARENT_PROCESS:
-                return eInternalContainer().eInverseRemove(this, SclPackage.PROCESS__LINE, fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs);
-            case SclPackage.LINE__PARENT_SCL:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SCL__LINE, SCL.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.LINE__PARENT_PROCESS:
+            return eInternalContainer().eInverseRemove( this, SclPackage.PROCESS__LINE,
+                    fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs );
+        case SclPackage.LINE__PARENT_SCL:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SCL__LINE, SCL.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -680,25 +713,25 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.LINE__TYPE:
-                return getType();
-            case SclPackage.LINE__PARENT_PROCESS:
-                return getParentProcess();
-            case SclPackage.LINE__PARENT_SCL:
-                return getParentSCL();
-            case SclPackage.LINE__CONNECTIVITY_NODE:
-                return getConnectivityNode();
-            case SclPackage.LINE__CONDUCTING_EQUIPMENT:
-                return getConductingEquipment();
-            case SclPackage.LINE__VOLTAGE:
-                return getVoltage();
-            case SclPackage.LINE__NOM_FREQ:
-                return getNomFreq();
-            case SclPackage.LINE__NUM_PHASES:
-                return getNumPhases();
+        switch( featureID ) {
+        case SclPackage.LINE__TYPE:
+            return getType();
+        case SclPackage.LINE__PARENT_PROCESS:
+            return getParentProcess();
+        case SclPackage.LINE__PARENT_SCL:
+            return getParentSCL();
+        case SclPackage.LINE__CONNECTIVITY_NODE:
+            return getConnectivityNode();
+        case SclPackage.LINE__CONDUCTING_EQUIPMENT:
+            return getConductingEquipment();
+        case SclPackage.LINE__VOLTAGE:
+            return getVoltage();
+        case SclPackage.LINE__NOM_FREQ:
+            return getNomFreq();
+        case SclPackage.LINE__NUM_PHASES:
+            return getNumPhases();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -709,35 +742,35 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.LINE__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.LINE__PARENT_PROCESS:
-                setParentProcess((fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)newValue);
-                return;
-            case SclPackage.LINE__PARENT_SCL:
-                setParentSCL((SCL)newValue);
-                return;
-            case SclPackage.LINE__CONNECTIVITY_NODE:
-                getConnectivityNode().clear();
-                getConnectivityNode().addAll((Collection<? extends ConnectivityNode>)newValue);
-                return;
-            case SclPackage.LINE__CONDUCTING_EQUIPMENT:
-                getConductingEquipment().clear();
-                getConductingEquipment().addAll((Collection<? extends ConductingEquipment>)newValue);
-                return;
-            case SclPackage.LINE__VOLTAGE:
-                setVoltage((Voltage)newValue);
-                return;
-            case SclPackage.LINE__NOM_FREQ:
-                setNomFreq((BigDecimal)newValue);
-                return;
-            case SclPackage.LINE__NUM_PHASES:
-                setNumPhases((Integer)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.LINE__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.LINE__PARENT_PROCESS:
+            setParentProcess( ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) newValue );
+            return;
+        case SclPackage.LINE__PARENT_SCL:
+            setParentSCL( ( SCL ) newValue );
+            return;
+        case SclPackage.LINE__CONNECTIVITY_NODE:
+            getConnectivityNode().clear();
+            getConnectivityNode().addAll( ( Collection< ? extends ConnectivityNode > ) newValue );
+            return;
+        case SclPackage.LINE__CONDUCTING_EQUIPMENT:
+            getConductingEquipment().clear();
+            getConductingEquipment().addAll( ( Collection< ? extends ConductingEquipment > ) newValue );
+            return;
+        case SclPackage.LINE__VOLTAGE:
+            setVoltage( ( Voltage ) newValue );
+            return;
+        case SclPackage.LINE__NOM_FREQ:
+            setNomFreq( ( BigDecimal ) newValue );
+            return;
+        case SclPackage.LINE__NUM_PHASES:
+            setNumPhases( ( Integer ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -747,33 +780,33 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LINE__TYPE:
-                unsetType();
-                return;
-            case SclPackage.LINE__PARENT_PROCESS:
-                setParentProcess((fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)null);
-                return;
-            case SclPackage.LINE__PARENT_SCL:
-                setParentSCL((SCL)null);
-                return;
-            case SclPackage.LINE__CONNECTIVITY_NODE:
-                unsetConnectivityNode();
-                return;
-            case SclPackage.LINE__CONDUCTING_EQUIPMENT:
-                unsetConductingEquipment();
-                return;
-            case SclPackage.LINE__VOLTAGE:
-                unsetVoltage();
-                return;
-            case SclPackage.LINE__NOM_FREQ:
-                unsetNomFreq();
-                return;
-            case SclPackage.LINE__NUM_PHASES:
-                unsetNumPhases();
-                return;
+        switch( featureID ) {
+        case SclPackage.LINE__TYPE:
+            unsetType();
+            return;
+        case SclPackage.LINE__PARENT_PROCESS:
+            setParentProcess( ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) null );
+            return;
+        case SclPackage.LINE__PARENT_SCL:
+            setParentSCL( ( SCL ) null );
+            return;
+        case SclPackage.LINE__CONNECTIVITY_NODE:
+            unsetConnectivityNode();
+            return;
+        case SclPackage.LINE__CONDUCTING_EQUIPMENT:
+            unsetConductingEquipment();
+            return;
+        case SclPackage.LINE__VOLTAGE:
+            unsetVoltage();
+            return;
+        case SclPackage.LINE__NOM_FREQ:
+            unsetNomFreq();
+            return;
+        case SclPackage.LINE__NUM_PHASES:
+            unsetNumPhases();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -783,25 +816,25 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LINE__TYPE:
-                return isSetType();
-            case SclPackage.LINE__PARENT_PROCESS:
-                return getParentProcess() != null;
-            case SclPackage.LINE__PARENT_SCL:
-                return getParentSCL() != null;
-            case SclPackage.LINE__CONNECTIVITY_NODE:
-                return isSetConnectivityNode();
-            case SclPackage.LINE__CONDUCTING_EQUIPMENT:
-                return isSetConductingEquipment();
-            case SclPackage.LINE__VOLTAGE:
-                return isSetVoltage();
-            case SclPackage.LINE__NOM_FREQ:
-                return isSetNomFreq();
-            case SclPackage.LINE__NUM_PHASES:
-                return isSetNumPhases();
+        switch( featureID ) {
+        case SclPackage.LINE__TYPE:
+            return isSetType();
+        case SclPackage.LINE__PARENT_PROCESS:
+            return getParentProcess() != null;
+        case SclPackage.LINE__PARENT_SCL:
+            return getParentSCL() != null;
+        case SclPackage.LINE__CONNECTIVITY_NODE:
+            return isSetConnectivityNode();
+        case SclPackage.LINE__CONDUCTING_EQUIPMENT:
+            return isSetConductingEquipment();
+        case SclPackage.LINE__VOLTAGE:
+            return isSetVoltage();
+        case SclPackage.LINE__NOM_FREQ:
+            return isSetNomFreq();
+        case SclPackage.LINE__NUM_PHASES:
+            return isSetNumPhases();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -811,16 +844,25 @@ public class LineImpl extends GeneralEquipmentContainerImpl implements Line {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(", nomFreq: ");
-        if (nomFreqESet) result.append(nomFreq); else result.append("<unset>");
-        result.append(", numPhases: ");
-        if (numPhasesESet) result.append(numPhases); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ", nomFreq: " );
+        if( nomFreqESet )
+            result.append( nomFreq );
+        else
+            result.append( "<unset>" );
+        result.append( ", numPhases: " );
+        if( numPhasesESet )
+            result.append( numPhases );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogControlImpl.java
index 9f8664e..8dfac55 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogControlImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogControlImpl.java
@@ -69,7 +69,7 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      * @generated
      * @ordered
      */
-    protected static final Integer BUF_TIME_EDEFAULT = new Integer(0);
+    protected static final Integer BUF_TIME_EDEFAULT = new Integer( 0 );
 
     /**
      * The cached value of the '{@link #getBufTime() <em>Buf Time</em>}' attribute.
@@ -371,8 +371,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         bufTime = newBufTime;
         boolean oldBufTimeESet = bufTimeESet;
         bufTimeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_CONTROL__BUF_TIME, oldBufTime, bufTime, !oldBufTimeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__BUF_TIME, oldBufTime,
+                    bufTime, !oldBufTimeESet ) );
     }
 
     /**
@@ -386,8 +387,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         boolean oldBufTimeESet = bufTimeESet;
         bufTime = BUF_TIME_EDEFAULT;
         bufTimeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_CONTROL__BUF_TIME, oldBufTime, BUF_TIME_EDEFAULT, oldBufTimeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__BUF_TIME, oldBufTime,
+                    BUF_TIME_EDEFAULT, oldBufTimeESet ) );
     }
 
     /**
@@ -421,8 +423,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         ldInst = newLdInst;
         boolean oldLdInstESet = ldInstESet;
         ldInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_CONTROL__LD_INST, oldLdInst, ldInst, !oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__LD_INST, oldLdInst, ldInst,
+                    !oldLdInstESet ) );
     }
 
     /**
@@ -436,8 +439,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         boolean oldLdInstESet = ldInstESet;
         ldInst = LD_INST_EDEFAULT;
         ldInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_CONTROL__LD_INST, oldLdInst, LD_INST_EDEFAULT, oldLdInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__LD_INST, oldLdInst,
+                    LD_INST_EDEFAULT, oldLdInstESet ) );
     }
 
     /**
@@ -471,8 +475,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         lnClass = newLnClass;
         boolean oldLnClassESet = lnClassESet;
         lnClassESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_CONTROL__LN_CLASS, oldLnClass, lnClass, !oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__LN_CLASS, oldLnClass,
+                    lnClass, !oldLnClassESet ) );
     }
 
     /**
@@ -486,8 +491,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         boolean oldLnClassESet = lnClassESet;
         lnClass = LN_CLASS_EDEFAULT;
         lnClassESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_CONTROL__LN_CLASS, oldLnClass, LN_CLASS_EDEFAULT, oldLnClassESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__LN_CLASS, oldLnClass,
+                    LN_CLASS_EDEFAULT, oldLnClassESet ) );
     }
 
     /**
@@ -521,8 +527,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         lnInst = newLnInst;
         boolean oldLnInstESet = lnInstESet;
         lnInstESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_CONTROL__LN_INST, oldLnInst, lnInst, !oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__LN_INST, oldLnInst, lnInst,
+                    !oldLnInstESet ) );
     }
 
     /**
@@ -536,8 +543,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         boolean oldLnInstESet = lnInstESet;
         lnInst = LN_INST_EDEFAULT;
         lnInstESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_CONTROL__LN_INST, oldLnInst, LN_INST_EDEFAULT, oldLnInstESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__LN_INST, oldLnInst,
+                    LN_INST_EDEFAULT, oldLnInstESet ) );
     }
 
     /**
@@ -571,8 +579,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         logEna = newLogEna;
         boolean oldLogEnaESet = logEnaESet;
         logEnaESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_CONTROL__LOG_ENA, oldLogEna, logEna, !oldLogEnaESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__LOG_ENA, oldLogEna, logEna,
+                    !oldLogEnaESet ) );
     }
 
     /**
@@ -586,8 +595,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         boolean oldLogEnaESet = logEnaESet;
         logEna = LOG_ENA_EDEFAULT;
         logEnaESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_CONTROL__LOG_ENA, oldLogEna, LOG_ENA_EDEFAULT, oldLogEnaESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__LOG_ENA, oldLogEna,
+                    LOG_ENA_EDEFAULT, oldLogEnaESet ) );
     }
 
     /**
@@ -621,8 +631,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         logName = newLogName;
         boolean oldLogNameESet = logNameESet;
         logNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_CONTROL__LOG_NAME, oldLogName, logName, !oldLogNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__LOG_NAME, oldLogName,
+                    logName, !oldLogNameESet ) );
     }
 
     /**
@@ -636,8 +647,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         boolean oldLogNameESet = logNameESet;
         logName = LOG_NAME_EDEFAULT;
         logNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_CONTROL__LOG_NAME, oldLogName, LOG_NAME_EDEFAULT, oldLogNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__LOG_NAME, oldLogName,
+                    LOG_NAME_EDEFAULT, oldLogNameESet ) );
     }
 
     /**
@@ -671,8 +683,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         prefix = newPrefix;
         boolean oldPrefixESet = prefixESet;
         prefixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_CONTROL__PREFIX, oldPrefix, prefix, !oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__PREFIX, oldPrefix, prefix,
+                    !oldPrefixESet ) );
     }
 
     /**
@@ -686,8 +699,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         boolean oldPrefixESet = prefixESet;
         prefix = PREFIX_EDEFAULT;
         prefixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_CONTROL__PREFIX, oldPrefix, PREFIX_EDEFAULT, oldPrefixESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__PREFIX, oldPrefix,
+                    PREFIX_EDEFAULT, oldPrefixESet ) );
     }
 
     /**
@@ -721,8 +735,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         reasonCode = newReasonCode;
         boolean oldReasonCodeESet = reasonCodeESet;
         reasonCodeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_CONTROL__REASON_CODE, oldReasonCode, reasonCode, !oldReasonCodeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__REASON_CODE, oldReasonCode,
+                    reasonCode, !oldReasonCodeESet ) );
     }
 
     /**
@@ -736,8 +751,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         boolean oldReasonCodeESet = reasonCodeESet;
         reasonCode = REASON_CODE_EDEFAULT;
         reasonCodeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_CONTROL__REASON_CODE, oldReasonCode, REASON_CODE_EDEFAULT, oldReasonCodeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__REASON_CODE,
+                    oldReasonCode, REASON_CODE_EDEFAULT, oldReasonCodeESet ) );
     }
 
     /**
@@ -757,8 +773,8 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      */
     @Override
     public AnyLN getParentAnyLN() {
-        if (eContainerFeatureID() != SclPackage.LOG_CONTROL__PARENT_ANY_LN) return null;
-        return (AnyLN)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.LOG_CONTROL__PARENT_ANY_LN ) return null;
+        return ( AnyLN ) eInternalContainer();
     }
 
     /**
@@ -766,8 +782,8 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAnyLN(AnyLN newParentAnyLN, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAnyLN, SclPackage.LOG_CONTROL__PARENT_ANY_LN, msgs);
+    public NotificationChain basicSetParentAnyLN( AnyLN newParentAnyLN, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAnyLN, SclPackage.LOG_CONTROL__PARENT_ANY_LN, msgs );
         return msgs;
     }
 
@@ -777,20 +793,23 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      * @generated
      */
     @Override
-    public void setParentAnyLN(AnyLN newParentAnyLN) {
-        if (newParentAnyLN != eInternalContainer() || (eContainerFeatureID() != SclPackage.LOG_CONTROL__PARENT_ANY_LN && newParentAnyLN != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAnyLN))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAnyLN( AnyLN newParentAnyLN ) {
+        if( newParentAnyLN != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.LOG_CONTROL__PARENT_ANY_LN && newParentAnyLN != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAnyLN ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAnyLN != null)
-                msgs = ((InternalEObject)newParentAnyLN).eInverseAdd(this, SclPackage.ANY_LN__LOG_CONTROL, AnyLN.class, msgs);
-            msgs = basicSetParentAnyLN(newParentAnyLN, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAnyLN != null )
+                msgs = ( ( InternalEObject ) newParentAnyLN ).eInverseAdd( this, SclPackage.ANY_LN__LOG_CONTROL,
+                        AnyLN.class, msgs );
+            msgs = basicSetParentAnyLN( newParentAnyLN, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_CONTROL__PARENT_ANY_LN, newParentAnyLN, newParentAnyLN));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__PARENT_ANY_LN,
+                    newParentAnyLN, newParentAnyLN ) );
     }
 
     /**
@@ -813,9 +832,14 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         refersToAnyLN = newRefersToAnyLN;
         boolean oldRefersToAnyLNESet = refersToAnyLNESet;
         refersToAnyLNESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN, oldRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN, oldRefersToAnyLN, newRefersToAnyLN,
+                    !oldRefersToAnyLNESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -827,20 +851,23 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      */
     @Override
     public void setRefersToAnyLN( AnyLN newRefersToAnyLN ) {
-        if (newRefersToAnyLN != refersToAnyLN) {
+        if( newRefersToAnyLN != refersToAnyLN ) {
             NotificationChain msgs = null;
-            if (refersToAnyLN != null)
-                msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL, AnyLN.class, msgs);
-            if (newRefersToAnyLN != null)
-                msgs = ((InternalEObject)newRefersToAnyLN).eInverseAdd(this, SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL, AnyLN.class, msgs);
-            msgs = basicSetRefersToAnyLN(newRefersToAnyLN, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToAnyLN != null )
+                msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this,
+                        SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL, AnyLN.class, msgs );
+            if( newRefersToAnyLN != null )
+                msgs = ( ( InternalEObject ) newRefersToAnyLN ).eInverseAdd( this,
+                        SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL, AnyLN.class, msgs );
+            msgs = basicSetRefersToAnyLN( newRefersToAnyLN, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAnyLNESet = refersToAnyLNESet;
             refersToAnyLNESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN, newRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN,
+                        newRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet ) );
         }
     }
 
@@ -854,9 +881,13 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         refersToAnyLN = null;
         boolean oldRefersToAnyLNESet = refersToAnyLNESet;
         refersToAnyLNESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN, oldRefersToAnyLN, null, oldRefersToAnyLNESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN, oldRefersToAnyLN, null, oldRefersToAnyLNESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -868,17 +899,19 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      */
     @Override
     public void unsetRefersToAnyLN() {
-        if (refersToAnyLN != null) {
+        if( refersToAnyLN != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL, AnyLN.class, msgs);
-            msgs = basicUnsetRefersToAnyLN(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this,
+                    SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL, AnyLN.class, msgs );
+            msgs = basicUnsetRefersToAnyLN( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAnyLNESet = refersToAnyLNESet;
             refersToAnyLNESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN, null, null, oldRefersToAnyLNESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN,
+                        null, null, oldRefersToAnyLNESet ) );
         }
     }
 
@@ -907,14 +940,18 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToLog(Log newRefersToLog, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToLog( Log newRefersToLog, NotificationChain msgs ) {
         Log oldRefersToLog = refersToLog;
         refersToLog = newRefersToLog;
         boolean oldRefersToLogESet = refersToLogESet;
         refersToLogESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.LOG_CONTROL__REFERS_TO_LOG, oldRefersToLog, newRefersToLog, !oldRefersToLogESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.LOG_CONTROL__REFERS_TO_LOG, oldRefersToLog, newRefersToLog, !oldRefersToLogESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -925,21 +962,24 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      * @generated
      */
     @Override
-    public void setRefersToLog(Log newRefersToLog) {
-        if (newRefersToLog != refersToLog) {
+    public void setRefersToLog( Log newRefersToLog ) {
+        if( newRefersToLog != refersToLog ) {
             NotificationChain msgs = null;
-            if (refersToLog != null)
-                msgs = ((InternalEObject)refersToLog).eInverseRemove(this, SclPackage.LOG__REFERRED_BY_LOG_CONTROL, Log.class, msgs);
-            if (newRefersToLog != null)
-                msgs = ((InternalEObject)newRefersToLog).eInverseAdd(this, SclPackage.LOG__REFERRED_BY_LOG_CONTROL, Log.class, msgs);
-            msgs = basicSetRefersToLog(newRefersToLog, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToLog != null )
+                msgs = ( ( InternalEObject ) refersToLog ).eInverseRemove( this,
+                        SclPackage.LOG__REFERRED_BY_LOG_CONTROL, Log.class, msgs );
+            if( newRefersToLog != null )
+                msgs = ( ( InternalEObject ) newRefersToLog ).eInverseAdd( this,
+                        SclPackage.LOG__REFERRED_BY_LOG_CONTROL, Log.class, msgs );
+            msgs = basicSetRefersToLog( newRefersToLog, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToLogESet = refersToLogESet;
             refersToLogESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_CONTROL__REFERS_TO_LOG, newRefersToLog, newRefersToLog, !oldRefersToLogESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__REFERS_TO_LOG,
+                        newRefersToLog, newRefersToLog, !oldRefersToLogESet ) );
         }
     }
 
@@ -948,14 +988,18 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToLog(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToLog( NotificationChain msgs ) {
         Log oldRefersToLog = refersToLog;
         refersToLog = null;
         boolean oldRefersToLogESet = refersToLogESet;
         refersToLogESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_CONTROL__REFERS_TO_LOG, oldRefersToLog, null, oldRefersToLogESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.LOG_CONTROL__REFERS_TO_LOG, oldRefersToLog, null, oldRefersToLogESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -967,17 +1011,19 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      */
     @Override
     public void unsetRefersToLog() {
-        if (refersToLog != null) {
+        if( refersToLog != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToLog).eInverseRemove(this, SclPackage.LOG__REFERRED_BY_LOG_CONTROL, Log.class, msgs);
-            msgs = basicUnsetRefersToLog(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToLog ).eInverseRemove( this, SclPackage.LOG__REFERRED_BY_LOG_CONTROL,
+                    Log.class, msgs );
+            msgs = basicUnsetRefersToLog( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToLogESet = refersToLogESet;
             refersToLogESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_CONTROL__REFERS_TO_LOG, null, null, oldRefersToLogESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__REFERS_TO_LOG, null,
+                        null, oldRefersToLogESet ) );
         }
     }
 
@@ -998,21 +1044,23 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LOG_CONTROL__PARENT_ANY_LN:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAnyLN((AnyLN)otherEnd, msgs);
-            case SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN:
-                if (refersToAnyLN != null)
-                    msgs = ((InternalEObject)refersToAnyLN).eInverseRemove(this, SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL, AnyLN.class, msgs);
-                return basicSetRefersToAnyLN((AnyLN)otherEnd, msgs);
-            case SclPackage.LOG_CONTROL__REFERS_TO_LOG:
-                if (refersToLog != null)
-                    msgs = ((InternalEObject)refersToLog).eInverseRemove(this, SclPackage.LOG__REFERRED_BY_LOG_CONTROL, Log.class, msgs);
-                return basicSetRefersToLog((Log)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.LOG_CONTROL__PARENT_ANY_LN:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAnyLN( ( AnyLN ) otherEnd, msgs );
+        case SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN:
+            if( refersToAnyLN != null )
+                msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this,
+                        SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL, AnyLN.class, msgs );
+            return basicSetRefersToAnyLN( ( AnyLN ) otherEnd, msgs );
+        case SclPackage.LOG_CONTROL__REFERS_TO_LOG:
+            if( refersToLog != null )
+                msgs = ( ( InternalEObject ) refersToLog ).eInverseRemove( this,
+                        SclPackage.LOG__REFERRED_BY_LOG_CONTROL, Log.class, msgs );
+            return basicSetRefersToLog( ( Log ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1022,15 +1070,15 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LOG_CONTROL__PARENT_ANY_LN:
-                return basicSetParentAnyLN(null, msgs);
-            case SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN:
-                return basicUnsetRefersToAnyLN(msgs);
-            case SclPackage.LOG_CONTROL__REFERS_TO_LOG:
-                return basicUnsetRefersToLog(msgs);
+        switch( featureID ) {
+        case SclPackage.LOG_CONTROL__PARENT_ANY_LN:
+            return basicSetParentAnyLN( null, msgs );
+        case SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN:
+            return basicUnsetRefersToAnyLN( msgs );
+        case SclPackage.LOG_CONTROL__REFERS_TO_LOG:
+            return basicUnsetRefersToLog( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1040,11 +1088,11 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.LOG_CONTROL__PARENT_ANY_LN:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ANY_LN__LOG_CONTROL, AnyLN.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.LOG_CONTROL__PARENT_ANY_LN:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ANY_LN__LOG_CONTROL, AnyLN.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -1054,31 +1102,31 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.LOG_CONTROL__BUF_TIME:
-                return getBufTime();
-            case SclPackage.LOG_CONTROL__LD_INST:
-                return getLdInst();
-            case SclPackage.LOG_CONTROL__LN_CLASS:
-                return getLnClass();
-            case SclPackage.LOG_CONTROL__LN_INST:
-                return getLnInst();
-            case SclPackage.LOG_CONTROL__LOG_ENA:
-                return getLogEna();
-            case SclPackage.LOG_CONTROL__LOG_NAME:
-                return getLogName();
-            case SclPackage.LOG_CONTROL__PREFIX:
-                return getPrefix();
-            case SclPackage.LOG_CONTROL__REASON_CODE:
-                return getReasonCode();
-            case SclPackage.LOG_CONTROL__PARENT_ANY_LN:
-                return getParentAnyLN();
-            case SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN:
-                return getRefersToAnyLN();
-            case SclPackage.LOG_CONTROL__REFERS_TO_LOG:
-                return getRefersToLog();
+        switch( featureID ) {
+        case SclPackage.LOG_CONTROL__BUF_TIME:
+            return getBufTime();
+        case SclPackage.LOG_CONTROL__LD_INST:
+            return getLdInst();
+        case SclPackage.LOG_CONTROL__LN_CLASS:
+            return getLnClass();
+        case SclPackage.LOG_CONTROL__LN_INST:
+            return getLnInst();
+        case SclPackage.LOG_CONTROL__LOG_ENA:
+            return getLogEna();
+        case SclPackage.LOG_CONTROL__LOG_NAME:
+            return getLogName();
+        case SclPackage.LOG_CONTROL__PREFIX:
+            return getPrefix();
+        case SclPackage.LOG_CONTROL__REASON_CODE:
+            return getReasonCode();
+        case SclPackage.LOG_CONTROL__PARENT_ANY_LN:
+            return getParentAnyLN();
+        case SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN:
+            return getRefersToAnyLN();
+        case SclPackage.LOG_CONTROL__REFERS_TO_LOG:
+            return getRefersToLog();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -1088,42 +1136,42 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.LOG_CONTROL__BUF_TIME:
-                setBufTime((Integer)newValue);
-                return;
-            case SclPackage.LOG_CONTROL__LD_INST:
-                setLdInst((String)newValue);
-                return;
-            case SclPackage.LOG_CONTROL__LN_CLASS:
-                setLnClass((String)newValue);
-                return;
-            case SclPackage.LOG_CONTROL__LN_INST:
-                setLnInst((String)newValue);
-                return;
-            case SclPackage.LOG_CONTROL__LOG_ENA:
-                setLogEna((Boolean)newValue);
-                return;
-            case SclPackage.LOG_CONTROL__LOG_NAME:
-                setLogName((String)newValue);
-                return;
-            case SclPackage.LOG_CONTROL__PREFIX:
-                setPrefix((String)newValue);
-                return;
-            case SclPackage.LOG_CONTROL__REASON_CODE:
-                setReasonCode((Boolean)newValue);
-                return;
-            case SclPackage.LOG_CONTROL__PARENT_ANY_LN:
-                setParentAnyLN((AnyLN)newValue);
-                return;
-            case SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN:
-                setRefersToAnyLN((AnyLN)newValue);
-                return;
-            case SclPackage.LOG_CONTROL__REFERS_TO_LOG:
-                setRefersToLog((Log)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.LOG_CONTROL__BUF_TIME:
+            setBufTime( ( Integer ) newValue );
+            return;
+        case SclPackage.LOG_CONTROL__LD_INST:
+            setLdInst( ( String ) newValue );
+            return;
+        case SclPackage.LOG_CONTROL__LN_CLASS:
+            setLnClass( ( String ) newValue );
+            return;
+        case SclPackage.LOG_CONTROL__LN_INST:
+            setLnInst( ( String ) newValue );
+            return;
+        case SclPackage.LOG_CONTROL__LOG_ENA:
+            setLogEna( ( Boolean ) newValue );
+            return;
+        case SclPackage.LOG_CONTROL__LOG_NAME:
+            setLogName( ( String ) newValue );
+            return;
+        case SclPackage.LOG_CONTROL__PREFIX:
+            setPrefix( ( String ) newValue );
+            return;
+        case SclPackage.LOG_CONTROL__REASON_CODE:
+            setReasonCode( ( Boolean ) newValue );
+            return;
+        case SclPackage.LOG_CONTROL__PARENT_ANY_LN:
+            setParentAnyLN( ( AnyLN ) newValue );
+            return;
+        case SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN:
+            setRefersToAnyLN( ( AnyLN ) newValue );
+            return;
+        case SclPackage.LOG_CONTROL__REFERS_TO_LOG:
+            setRefersToLog( ( Log ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -1133,42 +1181,42 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LOG_CONTROL__BUF_TIME:
-                unsetBufTime();
-                return;
-            case SclPackage.LOG_CONTROL__LD_INST:
-                unsetLdInst();
-                return;
-            case SclPackage.LOG_CONTROL__LN_CLASS:
-                unsetLnClass();
-                return;
-            case SclPackage.LOG_CONTROL__LN_INST:
-                unsetLnInst();
-                return;
-            case SclPackage.LOG_CONTROL__LOG_ENA:
-                unsetLogEna();
-                return;
-            case SclPackage.LOG_CONTROL__LOG_NAME:
-                unsetLogName();
-                return;
-            case SclPackage.LOG_CONTROL__PREFIX:
-                unsetPrefix();
-                return;
-            case SclPackage.LOG_CONTROL__REASON_CODE:
-                unsetReasonCode();
-                return;
-            case SclPackage.LOG_CONTROL__PARENT_ANY_LN:
-                setParentAnyLN((AnyLN)null);
-                return;
-            case SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN:
-                unsetRefersToAnyLN();
-                return;
-            case SclPackage.LOG_CONTROL__REFERS_TO_LOG:
-                unsetRefersToLog();
-                return;
+        switch( featureID ) {
+        case SclPackage.LOG_CONTROL__BUF_TIME:
+            unsetBufTime();
+            return;
+        case SclPackage.LOG_CONTROL__LD_INST:
+            unsetLdInst();
+            return;
+        case SclPackage.LOG_CONTROL__LN_CLASS:
+            unsetLnClass();
+            return;
+        case SclPackage.LOG_CONTROL__LN_INST:
+            unsetLnInst();
+            return;
+        case SclPackage.LOG_CONTROL__LOG_ENA:
+            unsetLogEna();
+            return;
+        case SclPackage.LOG_CONTROL__LOG_NAME:
+            unsetLogName();
+            return;
+        case SclPackage.LOG_CONTROL__PREFIX:
+            unsetPrefix();
+            return;
+        case SclPackage.LOG_CONTROL__REASON_CODE:
+            unsetReasonCode();
+            return;
+        case SclPackage.LOG_CONTROL__PARENT_ANY_LN:
+            setParentAnyLN( ( AnyLN ) null );
+            return;
+        case SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN:
+            unsetRefersToAnyLN();
+            return;
+        case SclPackage.LOG_CONTROL__REFERS_TO_LOG:
+            unsetRefersToLog();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -1178,31 +1226,31 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LOG_CONTROL__BUF_TIME:
-                return isSetBufTime();
-            case SclPackage.LOG_CONTROL__LD_INST:
-                return isSetLdInst();
-            case SclPackage.LOG_CONTROL__LN_CLASS:
-                return isSetLnClass();
-            case SclPackage.LOG_CONTROL__LN_INST:
-                return isSetLnInst();
-            case SclPackage.LOG_CONTROL__LOG_ENA:
-                return isSetLogEna();
-            case SclPackage.LOG_CONTROL__LOG_NAME:
-                return isSetLogName();
-            case SclPackage.LOG_CONTROL__PREFIX:
-                return isSetPrefix();
-            case SclPackage.LOG_CONTROL__REASON_CODE:
-                return isSetReasonCode();
-            case SclPackage.LOG_CONTROL__PARENT_ANY_LN:
-                return getParentAnyLN() != null;
-            case SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN:
-                return isSetRefersToAnyLN();
-            case SclPackage.LOG_CONTROL__REFERS_TO_LOG:
-                return isSetRefersToLog();
+        switch( featureID ) {
+        case SclPackage.LOG_CONTROL__BUF_TIME:
+            return isSetBufTime();
+        case SclPackage.LOG_CONTROL__LD_INST:
+            return isSetLdInst();
+        case SclPackage.LOG_CONTROL__LN_CLASS:
+            return isSetLnClass();
+        case SclPackage.LOG_CONTROL__LN_INST:
+            return isSetLnInst();
+        case SclPackage.LOG_CONTROL__LOG_ENA:
+            return isSetLogEna();
+        case SclPackage.LOG_CONTROL__LOG_NAME:
+            return isSetLogName();
+        case SclPackage.LOG_CONTROL__PREFIX:
+            return isSetPrefix();
+        case SclPackage.LOG_CONTROL__REASON_CODE:
+            return isSetReasonCode();
+        case SclPackage.LOG_CONTROL__PARENT_ANY_LN:
+            return getParentAnyLN() != null;
+        case SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN:
+            return isSetRefersToAnyLN();
+        case SclPackage.LOG_CONTROL__REFERS_TO_LOG:
+            return isSetRefersToLog();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -1212,26 +1260,50 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (bufTime: ");
-        if (bufTimeESet) result.append(bufTime); else result.append("<unset>");
-        result.append(", ldInst: ");
-        if (ldInstESet) result.append(ldInst); else result.append("<unset>");
-        result.append(", lnClass: ");
-        if (lnClassESet) result.append(lnClass); else result.append("<unset>");
-        result.append(", lnInst: ");
-        if (lnInstESet) result.append(lnInst); else result.append("<unset>");
-        result.append(", logEna: ");
-        if (logEnaESet) result.append(logEna); else result.append("<unset>");
-        result.append(", logName: ");
-        if (logNameESet) result.append(logName); else result.append("<unset>");
-        result.append(", prefix: ");
-        if (prefixESet) result.append(prefix); else result.append("<unset>");
-        result.append(", reasonCode: ");
-        if (reasonCodeESet) result.append(reasonCode); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (bufTime: " );
+        if( bufTimeESet )
+            result.append( bufTime );
+        else
+            result.append( "<unset>" );
+        result.append( ", ldInst: " );
+        if( ldInstESet )
+            result.append( ldInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnClass: " );
+        if( lnClassESet )
+            result.append( lnClass );
+        else
+            result.append( "<unset>" );
+        result.append( ", lnInst: " );
+        if( lnInstESet )
+            result.append( lnInst );
+        else
+            result.append( "<unset>" );
+        result.append( ", logEna: " );
+        if( logEnaESet )
+            result.append( logEna );
+        else
+            result.append( "<unset>" );
+        result.append( ", logName: " );
+        if( logNameESet )
+            result.append( logName );
+        else
+            result.append( "<unset>" );
+        result.append( ", prefix: " );
+        if( prefixESet )
+            result.append( prefix );
+        else
+            result.append( "<unset>" );
+        result.append( ", reasonCode: " );
+        if( reasonCodeESet )
+            result.append( reasonCode );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -1239,7 +1311,7 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         // name         the name of the log control block
         // desc         a description text
         // datSet       the name of the data set whose values shall be logged; datSet should only be missing within an ICD-File,
@@ -1252,22 +1324,22 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
         // logName      Relative name of the log within its hosting LN; name of the log element
         // logEna       TRUE enables immediate logging; FALSE prohibits logging until enabled online
         // reasonCode   If true, the reason code for the event trigger is also stored into the log – see IEC 61850-7-2
-        
+
         String messagePrefix = "[SCL links] while resolving link from LogControl on line " + getLineNumber() + ": ";
-        
-        if(( getLogName() == null ) || getLogName().isEmpty() ) {
+
+        if( ( getLogName() == null ) || getLogName().isEmpty() ) {
             console.warning( messagePrefix, "logName is missing" );
             return;
         }
-        
+
         // No error or warning messages here: if this happens, error should have been detected before
         IED ied = SclUtilities.getMyIED( this );
         if( ied == null ) return;
         if( getParentAnyLN() == null ) return;
         LDevice lDevice = getParentAnyLN().getParentLDevice();
         if( lDevice == null ) return;
-        
-        if(( getLdInst() != null ) && ( ! getLdInst().isEmpty() )) {
+
+        if( ( getLdInst() != null ) && ( !getLdInst().isEmpty() ) ) {
             Pair< LDevice, Integer > lDevice1 = SclUtilities.getLDevice( ied, getLdInst() );
             String mess1 = "LDevice( inst = " + getLdInst() + " )";
             if( lDevice1.getLeft() == null ) {
@@ -1278,7 +1350,7 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
             console.verbose( messagePrefix, "found ", mess1, " on line ", lDevice.getLineNumber() );
         }
 
-        Pair< AnyLN,Integer > anyLN = SclUtilities.getAnyLN( lDevice, getLnClass(), getLnInst(), getPrefix() );
+        Pair< AnyLN, Integer > anyLN = SclUtilities.getAnyLN( lDevice, getLnClass(), getLnInst(), getPrefix() );
         String mess2 = "LN( lnClass = " + getLnClass();
         if( getLnInst() != null ) {
             mess2 += ", inst = " + getLnInst();
@@ -1290,8 +1362,9 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
             return;
         }
         setRefersToAnyLN( anyLN.getLeft() );
-        console.info( "[SCL links] LogControl on line ", getLineNumber(), " refers to ", mess2, " on line ", getRefersToAnyLN().getLineNumber() );
-        
+        console.info( "[SCL links] LogControl on line ", getLineNumber(), " refers to ", mess2, " on line ",
+                getRefersToAnyLN().getLineNumber() );
+
     }
 
 } //LogControlImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogImpl.java
index 0036dbc..bf814b0 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogImpl.java
@@ -87,7 +87,7 @@ public class LogImpl extends UnNamingImpl implements Log {
      * @generated
      * @ordered
      */
-    protected EList<LogControl> referredByLogControl;
+    protected EList< LogControl > referredByLogControl;
 
     /**
      * <!-- begin-user-doc -->
@@ -115,8 +115,8 @@ public class LogImpl extends UnNamingImpl implements Log {
      */
     @Override
     public AnyLN getParentAnyLN() {
-        if (eContainerFeatureID() != SclPackage.LOG__PARENT_ANY_LN) return null;
-        return (AnyLN)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.LOG__PARENT_ANY_LN ) return null;
+        return ( AnyLN ) eInternalContainer();
     }
 
     /**
@@ -124,8 +124,8 @@ public class LogImpl extends UnNamingImpl implements Log {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAnyLN(AnyLN newParentAnyLN, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAnyLN, SclPackage.LOG__PARENT_ANY_LN, msgs);
+    public NotificationChain basicSetParentAnyLN( AnyLN newParentAnyLN, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAnyLN, SclPackage.LOG__PARENT_ANY_LN, msgs );
         return msgs;
     }
 
@@ -135,20 +135,23 @@ public class LogImpl extends UnNamingImpl implements Log {
      * @generated
      */
     @Override
-    public void setParentAnyLN(AnyLN newParentAnyLN) {
-        if (newParentAnyLN != eInternalContainer() || (eContainerFeatureID() != SclPackage.LOG__PARENT_ANY_LN && newParentAnyLN != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAnyLN))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAnyLN( AnyLN newParentAnyLN ) {
+        if( newParentAnyLN != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.LOG__PARENT_ANY_LN && newParentAnyLN != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAnyLN ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAnyLN != null)
-                msgs = ((InternalEObject)newParentAnyLN).eInverseAdd(this, SclPackage.ANY_LN__LOG, AnyLN.class, msgs);
-            msgs = basicSetParentAnyLN(newParentAnyLN, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAnyLN != null )
+                msgs = ( ( InternalEObject ) newParentAnyLN ).eInverseAdd( this, SclPackage.ANY_LN__LOG, AnyLN.class,
+                        msgs );
+            msgs = basicSetParentAnyLN( newParentAnyLN, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG__PARENT_ANY_LN, newParentAnyLN, newParentAnyLN));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG__PARENT_ANY_LN, newParentAnyLN,
+                    newParentAnyLN ) );
     }
 
     /**
@@ -167,13 +170,14 @@ public class LogImpl extends UnNamingImpl implements Log {
      * @generated
      */
     @Override
-    public void setName(String newName) {
+    public void setName( String newName ) {
         String oldName = name;
         name = newName;
         boolean oldNameESet = nameESet;
         nameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG__NAME, oldName, name, !oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG__NAME, oldName, name,
+                    !oldNameESet ) );
     }
 
     /**
@@ -187,8 +191,9 @@ public class LogImpl extends UnNamingImpl implements Log {
         boolean oldNameESet = nameESet;
         name = NAME_EDEFAULT;
         nameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG__NAME, oldName, NAME_EDEFAULT, oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG__NAME, oldName, NAME_EDEFAULT,
+                    oldNameESet ) );
     }
 
     /**
@@ -207,9 +212,10 @@ public class LogImpl extends UnNamingImpl implements Log {
      * @generated
      */
     @Override
-    public EList<LogControl> getReferredByLogControl() {
-        if (referredByLogControl == null) {
-            referredByLogControl = new EObjectWithInverseEList.Unsettable<LogControl>(LogControl.class, this, SclPackage.LOG__REFERRED_BY_LOG_CONTROL, SclPackage.LOG_CONTROL__REFERS_TO_LOG);
+    public EList< LogControl > getReferredByLogControl() {
+        if( referredByLogControl == null ) {
+            referredByLogControl = new EObjectWithInverseEList.Unsettable< LogControl >( LogControl.class, this,
+                    SclPackage.LOG__REFERRED_BY_LOG_CONTROL, SclPackage.LOG_CONTROL__REFERS_TO_LOG );
         }
         return referredByLogControl;
     }
@@ -221,7 +227,7 @@ public class LogImpl extends UnNamingImpl implements Log {
      */
     @Override
     public void unsetReferredByLogControl() {
-        if (referredByLogControl != null) ((InternalEList.Unsettable<?>)referredByLogControl).unset();
+        if( referredByLogControl != null ) ( ( InternalEList.Unsettable< ? > ) referredByLogControl ).unset();
     }
 
     /**
@@ -231,7 +237,7 @@ public class LogImpl extends UnNamingImpl implements Log {
      */
     @Override
     public boolean isSetReferredByLogControl() {
-        return referredByLogControl != null && ((InternalEList.Unsettable<?>)referredByLogControl).isSet();
+        return referredByLogControl != null && ( ( InternalEList.Unsettable< ? > ) referredByLogControl ).isSet();
     }
 
     /**
@@ -239,18 +245,19 @@ public class LogImpl extends UnNamingImpl implements Log {
      * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LOG__PARENT_ANY_LN:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAnyLN((AnyLN)otherEnd, msgs);
-            case SclPackage.LOG__REFERRED_BY_LOG_CONTROL:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredByLogControl()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.LOG__PARENT_ANY_LN:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAnyLN( ( AnyLN ) otherEnd, msgs );
+        case SclPackage.LOG__REFERRED_BY_LOG_CONTROL:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByLogControl() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -260,13 +267,13 @@ public class LogImpl extends UnNamingImpl implements Log {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LOG__PARENT_ANY_LN:
-                return basicSetParentAnyLN(null, msgs);
-            case SclPackage.LOG__REFERRED_BY_LOG_CONTROL:
-                return ((InternalEList<?>)getReferredByLogControl()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.LOG__PARENT_ANY_LN:
+            return basicSetParentAnyLN( null, msgs );
+        case SclPackage.LOG__REFERRED_BY_LOG_CONTROL:
+            return ( ( InternalEList< ? > ) getReferredByLogControl() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -276,11 +283,11 @@ public class LogImpl extends UnNamingImpl implements Log {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.LOG__PARENT_ANY_LN:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ANY_LN__LOG, AnyLN.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.LOG__PARENT_ANY_LN:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ANY_LN__LOG, AnyLN.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -290,15 +297,15 @@ public class LogImpl extends UnNamingImpl implements Log {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.LOG__PARENT_ANY_LN:
-                return getParentAnyLN();
-            case SclPackage.LOG__NAME:
-                return getName();
-            case SclPackage.LOG__REFERRED_BY_LOG_CONTROL:
-                return getReferredByLogControl();
+        switch( featureID ) {
+        case SclPackage.LOG__PARENT_ANY_LN:
+            return getParentAnyLN();
+        case SclPackage.LOG__NAME:
+            return getName();
+        case SclPackage.LOG__REFERRED_BY_LOG_CONTROL:
+            return getReferredByLogControl();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -306,22 +313,22 @@ public class LogImpl extends UnNamingImpl implements Log {
      * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.LOG__PARENT_ANY_LN:
-                setParentAnyLN((AnyLN)newValue);
-                return;
-            case SclPackage.LOG__NAME:
-                setName((String)newValue);
-                return;
-            case SclPackage.LOG__REFERRED_BY_LOG_CONTROL:
-                getReferredByLogControl().clear();
-                getReferredByLogControl().addAll((Collection<? extends LogControl>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.LOG__PARENT_ANY_LN:
+            setParentAnyLN( ( AnyLN ) newValue );
+            return;
+        case SclPackage.LOG__NAME:
+            setName( ( String ) newValue );
+            return;
+        case SclPackage.LOG__REFERRED_BY_LOG_CONTROL:
+            getReferredByLogControl().clear();
+            getReferredByLogControl().addAll( ( Collection< ? extends LogControl > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -331,18 +338,18 @@ public class LogImpl extends UnNamingImpl implements Log {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LOG__PARENT_ANY_LN:
-                setParentAnyLN((AnyLN)null);
-                return;
-            case SclPackage.LOG__NAME:
-                unsetName();
-                return;
-            case SclPackage.LOG__REFERRED_BY_LOG_CONTROL:
-                unsetReferredByLogControl();
-                return;
+        switch( featureID ) {
+        case SclPackage.LOG__PARENT_ANY_LN:
+            setParentAnyLN( ( AnyLN ) null );
+            return;
+        case SclPackage.LOG__NAME:
+            unsetName();
+            return;
+        case SclPackage.LOG__REFERRED_BY_LOG_CONTROL:
+            unsetReferredByLogControl();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -352,15 +359,15 @@ public class LogImpl extends UnNamingImpl implements Log {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LOG__PARENT_ANY_LN:
-                return getParentAnyLN() != null;
-            case SclPackage.LOG__NAME:
-                return isSetName();
-            case SclPackage.LOG__REFERRED_BY_LOG_CONTROL:
-                return isSetReferredByLogControl();
+        switch( featureID ) {
+        case SclPackage.LOG__PARENT_ANY_LN:
+            return getParentAnyLN() != null;
+        case SclPackage.LOG__NAME:
+            return isSetName();
+        case SclPackage.LOG__REFERRED_BY_LOG_CONTROL:
+            return isSetReferredByLogControl();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -370,12 +377,15 @@ public class LogImpl extends UnNamingImpl implements Log {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (name: ");
-        if (nameESet) result.append(name); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (name: " );
+        if( nameESet )
+            result.append( name );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogSettingsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogSettingsImpl.java
index 88356ad..0924491 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogSettingsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogSettingsImpl.java
@@ -176,8 +176,9 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
         intgPd = newIntgPd == null ? INTG_PD_EDEFAULT : newIntgPd;
         boolean oldIntgPdESet = intgPdESet;
         intgPdESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_SETTINGS__INTG_PD, oldIntgPd, intgPd, !oldIntgPdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_SETTINGS__INTG_PD, oldIntgPd, intgPd,
+                    !oldIntgPdESet ) );
     }
 
     /**
@@ -191,8 +192,9 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
         boolean oldIntgPdESet = intgPdESet;
         intgPd = INTG_PD_EDEFAULT;
         intgPdESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_SETTINGS__INTG_PD, oldIntgPd, INTG_PD_EDEFAULT, oldIntgPdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_SETTINGS__INTG_PD, oldIntgPd,
+                    INTG_PD_EDEFAULT, oldIntgPdESet ) );
     }
 
     /**
@@ -226,8 +228,9 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
         logEna = newLogEna == null ? LOG_ENA_EDEFAULT : newLogEna;
         boolean oldLogEnaESet = logEnaESet;
         logEnaESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_SETTINGS__LOG_ENA, oldLogEna, logEna, !oldLogEnaESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_SETTINGS__LOG_ENA, oldLogEna, logEna,
+                    !oldLogEnaESet ) );
     }
 
     /**
@@ -241,8 +244,9 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
         boolean oldLogEnaESet = logEnaESet;
         logEna = LOG_ENA_EDEFAULT;
         logEnaESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_SETTINGS__LOG_ENA, oldLogEna, LOG_ENA_EDEFAULT, oldLogEnaESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_SETTINGS__LOG_ENA, oldLogEna,
+                    LOG_ENA_EDEFAULT, oldLogEnaESet ) );
     }
 
     /**
@@ -276,8 +280,9 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
         trgOps = newTrgOps == null ? TRG_OPS_EDEFAULT : newTrgOps;
         boolean oldTrgOpsESet = trgOpsESet;
         trgOpsESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_SETTINGS__TRG_OPS, oldTrgOps, trgOps, !oldTrgOpsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_SETTINGS__TRG_OPS, oldTrgOps, trgOps,
+                    !oldTrgOpsESet ) );
     }
 
     /**
@@ -291,8 +296,9 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
         boolean oldTrgOpsESet = trgOpsESet;
         trgOps = TRG_OPS_EDEFAULT;
         trgOpsESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.LOG_SETTINGS__TRG_OPS, oldTrgOps, TRG_OPS_EDEFAULT, oldTrgOpsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_SETTINGS__TRG_OPS, oldTrgOps,
+                    TRG_OPS_EDEFAULT, oldTrgOpsESet ) );
     }
 
     /**
@@ -312,8 +318,8 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.LOG_SETTINGS__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.LOG_SETTINGS__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -321,8 +327,9 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.LOG_SETTINGS__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.LOG_SETTINGS__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -332,20 +339,24 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.LOG_SETTINGS__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.LOG_SETTINGS__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__LOG_SETTINGS, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__LOG_SETTINGS,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.LOG_SETTINGS__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_SETTINGS__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -355,13 +366,13 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LOG_SETTINGS__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.LOG_SETTINGS__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -371,11 +382,11 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.LOG_SETTINGS__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.LOG_SETTINGS__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -385,11 +396,11 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.LOG_SETTINGS__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__LOG_SETTINGS, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.LOG_SETTINGS__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__LOG_SETTINGS, Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -399,17 +410,17 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.LOG_SETTINGS__INTG_PD:
-                return getIntgPd();
-            case SclPackage.LOG_SETTINGS__LOG_ENA:
-                return getLogEna();
-            case SclPackage.LOG_SETTINGS__TRG_OPS:
-                return getTrgOps();
-            case SclPackage.LOG_SETTINGS__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.LOG_SETTINGS__INTG_PD:
+            return getIntgPd();
+        case SclPackage.LOG_SETTINGS__LOG_ENA:
+            return getLogEna();
+        case SclPackage.LOG_SETTINGS__TRG_OPS:
+            return getTrgOps();
+        case SclPackage.LOG_SETTINGS__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -419,21 +430,21 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.LOG_SETTINGS__INTG_PD:
-                setIntgPd((ServiceSettingsEnum)newValue);
-                return;
-            case SclPackage.LOG_SETTINGS__LOG_ENA:
-                setLogEna((ServiceSettingsEnum)newValue);
-                return;
-            case SclPackage.LOG_SETTINGS__TRG_OPS:
-                setTrgOps((ServiceSettingsEnum)newValue);
-                return;
-            case SclPackage.LOG_SETTINGS__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.LOG_SETTINGS__INTG_PD:
+            setIntgPd( ( ServiceSettingsEnum ) newValue );
+            return;
+        case SclPackage.LOG_SETTINGS__LOG_ENA:
+            setLogEna( ( ServiceSettingsEnum ) newValue );
+            return;
+        case SclPackage.LOG_SETTINGS__TRG_OPS:
+            setTrgOps( ( ServiceSettingsEnum ) newValue );
+            return;
+        case SclPackage.LOG_SETTINGS__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -443,21 +454,21 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LOG_SETTINGS__INTG_PD:
-                unsetIntgPd();
-                return;
-            case SclPackage.LOG_SETTINGS__LOG_ENA:
-                unsetLogEna();
-                return;
-            case SclPackage.LOG_SETTINGS__TRG_OPS:
-                unsetTrgOps();
-                return;
-            case SclPackage.LOG_SETTINGS__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.LOG_SETTINGS__INTG_PD:
+            unsetIntgPd();
+            return;
+        case SclPackage.LOG_SETTINGS__LOG_ENA:
+            unsetLogEna();
+            return;
+        case SclPackage.LOG_SETTINGS__TRG_OPS:
+            unsetTrgOps();
+            return;
+        case SclPackage.LOG_SETTINGS__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -467,17 +478,17 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.LOG_SETTINGS__INTG_PD:
-                return isSetIntgPd();
-            case SclPackage.LOG_SETTINGS__LOG_ENA:
-                return isSetLogEna();
-            case SclPackage.LOG_SETTINGS__TRG_OPS:
-                return isSetTrgOps();
-            case SclPackage.LOG_SETTINGS__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.LOG_SETTINGS__INTG_PD:
+            return isSetIntgPd();
+        case SclPackage.LOG_SETTINGS__LOG_ENA:
+            return isSetLogEna();
+        case SclPackage.LOG_SETTINGS__TRG_OPS:
+            return isSetTrgOps();
+        case SclPackage.LOG_SETTINGS__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -487,16 +498,25 @@ public class LogSettingsImpl extends ServiceSettingsImpl implements LogSettings
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (intgPd: ");
-        if (intgPdESet) result.append(intgPd); else result.append("<unset>");
-        result.append(", logEna: ");
-        if (logEnaESet) result.append(logEna); else result.append("<unset>");
-        result.append(", trgOps: ");
-        if (trgOpsESet) result.append(trgOps); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (intgPd: " );
+        if( intgPdESet )
+            result.append( intgPd );
+        else
+            result.append( "<unset>" );
+        result.append( ", logEna: " );
+        if( logEnaESet )
+            result.append( logEna );
+        else
+            result.append( "<unset>" );
+        result.append( ", trgOps: " );
+        if( trgOpsESet )
+            result.append( trgOps );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/McSecurityImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/McSecurityImpl.java
index c684d76..1e66142 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/McSecurityImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/McSecurityImpl.java
@@ -138,8 +138,8 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      */
     @Override
     public ClientServices getParentClientServices() {
-        if (eContainerFeatureID() != SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES) return null;
-        return (ClientServices)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES ) return null;
+        return ( ClientServices ) eInternalContainer();
     }
 
     /**
@@ -147,8 +147,10 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentClientServices(ClientServices newParentClientServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentClientServices, SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES, msgs);
+    public NotificationChain basicSetParentClientServices( ClientServices newParentClientServices,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentClientServices,
+                SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -158,20 +160,24 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * @generated
      */
     @Override
-    public void setParentClientServices(ClientServices newParentClientServices) {
-        if (newParentClientServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES && newParentClientServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentClientServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentClientServices( ClientServices newParentClientServices ) {
+        if( newParentClientServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES
+                        && newParentClientServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentClientServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentClientServices != null)
-                msgs = ((InternalEObject)newParentClientServices).eInverseAdd(this, SclPackage.CLIENT_SERVICES__MC_SECURITY, ClientServices.class, msgs);
-            msgs = basicSetParentClientServices(newParentClientServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentClientServices != null )
+                msgs = ( ( InternalEObject ) newParentClientServices ).eInverseAdd( this,
+                        SclPackage.CLIENT_SERVICES__MC_SECURITY, ClientServices.class, msgs );
+            msgs = basicSetParentClientServices( newParentClientServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES, newParentClientServices, newParentClientServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES,
+                    newParentClientServices, newParentClientServices ) );
     }
 
     /**
@@ -181,8 +187,8 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      */
     @Override
     public GSESettings getParentGSESettings() {
-        if (eContainerFeatureID() != SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS) return null;
-        return (GSESettings)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS ) return null;
+        return ( GSESettings ) eInternalContainer();
     }
 
     /**
@@ -190,8 +196,9 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentGSESettings(GSESettings newParentGSESettings, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentGSESettings, SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS, msgs);
+    public NotificationChain basicSetParentGSESettings( GSESettings newParentGSESettings, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentGSESettings,
+                SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS, msgs );
         return msgs;
     }
 
@@ -201,20 +208,24 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * @generated
      */
     @Override
-    public void setParentGSESettings(GSESettings newParentGSESettings) {
-        if (newParentGSESettings != eInternalContainer() || (eContainerFeatureID() != SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS && newParentGSESettings != null)) {
-            if (EcoreUtil.isAncestor(this, newParentGSESettings))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentGSESettings( GSESettings newParentGSESettings ) {
+        if( newParentGSESettings != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS
+                        && newParentGSESettings != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentGSESettings ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentGSESettings != null)
-                msgs = ((InternalEObject)newParentGSESettings).eInverseAdd(this, SclPackage.GSE_SETTINGS__MC_SECURITY, GSESettings.class, msgs);
-            msgs = basicSetParentGSESettings(newParentGSESettings, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentGSESettings != null )
+                msgs = ( ( InternalEObject ) newParentGSESettings ).eInverseAdd( this,
+                        SclPackage.GSE_SETTINGS__MC_SECURITY, GSESettings.class, msgs );
+            msgs = basicSetParentGSESettings( newParentGSESettings, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS, newParentGSESettings, newParentGSESettings));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS,
+                    newParentGSESettings, newParentGSESettings ) );
     }
 
     /**
@@ -224,8 +235,8 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      */
     @Override
     public SMVSettings getParentSMVSettings() {
-        if (eContainerFeatureID() != SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS) return null;
-        return (SMVSettings)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS ) return null;
+        return ( SMVSettings ) eInternalContainer();
     }
 
     /**
@@ -233,8 +244,9 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSMVSettings(SMVSettings newParentSMVSettings, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSMVSettings, SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS, msgs);
+    public NotificationChain basicSetParentSMVSettings( SMVSettings newParentSMVSettings, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSMVSettings,
+                SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS, msgs );
         return msgs;
     }
 
@@ -244,20 +256,24 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * @generated
      */
     @Override
-    public void setParentSMVSettings(SMVSettings newParentSMVSettings) {
-        if (newParentSMVSettings != eInternalContainer() || (eContainerFeatureID() != SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS && newParentSMVSettings != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSMVSettings))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSMVSettings( SMVSettings newParentSMVSettings ) {
+        if( newParentSMVSettings != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS
+                        && newParentSMVSettings != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSMVSettings ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSMVSettings != null)
-                msgs = ((InternalEObject)newParentSMVSettings).eInverseAdd(this, SclPackage.SMV_SETTINGS__MC_SECURITY, SMVSettings.class, msgs);
-            msgs = basicSetParentSMVSettings(newParentSMVSettings, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSMVSettings != null )
+                msgs = ( ( InternalEObject ) newParentSMVSettings ).eInverseAdd( this,
+                        SclPackage.SMV_SETTINGS__MC_SECURITY, SMVSettings.class, msgs );
+            msgs = basicSetParentSMVSettings( newParentSMVSettings, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS, newParentSMVSettings, newParentSMVSettings));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS,
+                    newParentSMVSettings, newParentSMVSettings ) );
     }
 
     /**
@@ -276,13 +292,14 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * @generated
      */
     @Override
-    public void setSignature(Boolean newSignature) {
+    public void setSignature( Boolean newSignature ) {
         Boolean oldSignature = signature;
         signature = newSignature;
         boolean oldSignatureESet = signatureESet;
         signatureESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.MC_SECURITY__SIGNATURE, oldSignature, signature, !oldSignatureESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.MC_SECURITY__SIGNATURE, oldSignature,
+                    signature, !oldSignatureESet ) );
     }
 
     /**
@@ -296,8 +313,9 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
         boolean oldSignatureESet = signatureESet;
         signature = SIGNATURE_EDEFAULT;
         signatureESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.MC_SECURITY__SIGNATURE, oldSignature, SIGNATURE_EDEFAULT, oldSignatureESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.MC_SECURITY__SIGNATURE, oldSignature,
+                    SIGNATURE_EDEFAULT, oldSignatureESet ) );
     }
 
     /**
@@ -326,13 +344,14 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * @generated
      */
     @Override
-    public void setEncryption(Boolean newEncryption) {
+    public void setEncryption( Boolean newEncryption ) {
         Boolean oldEncryption = encryption;
         encryption = newEncryption;
         boolean oldEncryptionESet = encryptionESet;
         encryptionESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.MC_SECURITY__ENCRYPTION, oldEncryption, encryption, !oldEncryptionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.MC_SECURITY__ENCRYPTION, oldEncryption,
+                    encryption, !oldEncryptionESet ) );
     }
 
     /**
@@ -346,8 +365,9 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
         boolean oldEncryptionESet = encryptionESet;
         encryption = ENCRYPTION_EDEFAULT;
         encryptionESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.MC_SECURITY__ENCRYPTION, oldEncryption, ENCRYPTION_EDEFAULT, oldEncryptionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.MC_SECURITY__ENCRYPTION, oldEncryption,
+                    ENCRYPTION_EDEFAULT, oldEncryptionESet ) );
     }
 
     /**
@@ -366,22 +386,22 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * @generated
      */
     @Override
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentClientServices((ClientServices)otherEnd, msgs);
-            case SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentGSESettings((GSESettings)otherEnd, msgs);
-            case SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSMVSettings((SMVSettings)otherEnd, msgs);
+    public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentClientServices( ( ClientServices ) otherEnd, msgs );
+        case SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentGSESettings( ( GSESettings ) otherEnd, msgs );
+        case SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSMVSettings( ( SMVSettings ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -390,16 +410,16 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * @generated
      */
     @Override
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES:
-                return basicSetParentClientServices(null, msgs);
-            case SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS:
-                return basicSetParentGSESettings(null, msgs);
-            case SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS:
-                return basicSetParentSMVSettings(null, msgs);
+    public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES:
+            return basicSetParentClientServices( null, msgs );
+        case SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS:
+            return basicSetParentGSESettings( null, msgs );
+        case SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS:
+            return basicSetParentSMVSettings( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -408,16 +428,19 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * @generated
      */
     @Override
-    public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.CLIENT_SERVICES__MC_SECURITY, ClientServices.class, msgs);
-            case SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS:
-                return eInternalContainer().eInverseRemove(this, SclPackage.GSE_SETTINGS__MC_SECURITY, GSESettings.class, msgs);
-            case SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SMV_SETTINGS__MC_SECURITY, SMVSettings.class, msgs);
+    public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
+        switch( eContainerFeatureID() ) {
+        case SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.CLIENT_SERVICES__MC_SECURITY,
+                    ClientServices.class, msgs );
+        case SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS:
+            return eInternalContainer().eInverseRemove( this, SclPackage.GSE_SETTINGS__MC_SECURITY, GSESettings.class,
+                    msgs );
+        case SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SMV_SETTINGS__MC_SECURITY, SMVSettings.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -426,20 +449,20 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES:
-                return getParentClientServices();
-            case SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS:
-                return getParentGSESettings();
-            case SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS:
-                return getParentSMVSettings();
-            case SclPackage.MC_SECURITY__SIGNATURE:
-                return getSignature();
-            case SclPackage.MC_SECURITY__ENCRYPTION:
-                return getEncryption();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES:
+            return getParentClientServices();
+        case SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS:
+            return getParentGSESettings();
+        case SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS:
+            return getParentSMVSettings();
+        case SclPackage.MC_SECURITY__SIGNATURE:
+            return getSignature();
+        case SclPackage.MC_SECURITY__ENCRYPTION:
+            return getEncryption();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -448,25 +471,25 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES:
-                setParentClientServices((ClientServices)newValue);
-                return;
-            case SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS:
-                setParentGSESettings((GSESettings)newValue);
-                return;
-            case SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS:
-                setParentSMVSettings((SMVSettings)newValue);
-                return;
-            case SclPackage.MC_SECURITY__SIGNATURE:
-                setSignature((Boolean)newValue);
-                return;
-            case SclPackage.MC_SECURITY__ENCRYPTION:
-                setEncryption((Boolean)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES:
+            setParentClientServices( ( ClientServices ) newValue );
+            return;
+        case SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS:
+            setParentGSESettings( ( GSESettings ) newValue );
+            return;
+        case SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS:
+            setParentSMVSettings( ( SMVSettings ) newValue );
+            return;
+        case SclPackage.MC_SECURITY__SIGNATURE:
+            setSignature( ( Boolean ) newValue );
+            return;
+        case SclPackage.MC_SECURITY__ENCRYPTION:
+            setEncryption( ( Boolean ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -475,25 +498,25 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES:
-                setParentClientServices((ClientServices)null);
-                return;
-            case SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS:
-                setParentGSESettings((GSESettings)null);
-                return;
-            case SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS:
-                setParentSMVSettings((SMVSettings)null);
-                return;
-            case SclPackage.MC_SECURITY__SIGNATURE:
-                unsetSignature();
-                return;
-            case SclPackage.MC_SECURITY__ENCRYPTION:
-                unsetEncryption();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES:
+            setParentClientServices( ( ClientServices ) null );
+            return;
+        case SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS:
+            setParentGSESettings( ( GSESettings ) null );
+            return;
+        case SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS:
+            setParentSMVSettings( ( SMVSettings ) null );
+            return;
+        case SclPackage.MC_SECURITY__SIGNATURE:
+            unsetSignature();
+            return;
+        case SclPackage.MC_SECURITY__ENCRYPTION:
+            unsetEncryption();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -502,20 +525,20 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES:
-                return getParentClientServices() != null;
-            case SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS:
-                return getParentGSESettings() != null;
-            case SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS:
-                return getParentSMVSettings() != null;
-            case SclPackage.MC_SECURITY__SIGNATURE:
-                return isSetSignature();
-            case SclPackage.MC_SECURITY__ENCRYPTION:
-                return isSetEncryption();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.MC_SECURITY__PARENT_CLIENT_SERVICES:
+            return getParentClientServices() != null;
+        case SclPackage.MC_SECURITY__PARENT_GSE_SETTINGS:
+            return getParentGSESettings() != null;
+        case SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS:
+            return getParentSMVSettings() != null;
+        case SclPackage.MC_SECURITY__SIGNATURE:
+            return isSetSignature();
+        case SclPackage.MC_SECURITY__ENCRYPTION:
+            return isSetEncryption();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -525,14 +548,20 @@ public class McSecurityImpl extends SclObjectImpl implements McSecurity {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (signature: ");
-        if (signatureESet) result.append(signature); else result.append("<unset>");
-        result.append(", encryption: ");
-        if (encryptionESet) result.append(encryption); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (signature: " );
+        if( signatureESet )
+            result.append( signature );
+        else
+            result.append( "<unset>" );
+        result.append( ", encryption: " );
+        if( encryptionESet )
+            result.append( encryption );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/NamingImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/NamingImpl.java
index 4fa6861..5267ffb 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/NamingImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/NamingImpl.java
@@ -143,8 +143,9 @@ public abstract class NamingImpl extends BaseElementImpl implements Naming {
         name = newName;
         boolean oldNameESet = nameESet;
         nameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.NAMING__NAME, oldName, name, !oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.NAMING__NAME, oldName, name,
+                    !oldNameESet ) );
     }
 
     /**
@@ -158,8 +159,9 @@ public abstract class NamingImpl extends BaseElementImpl implements Naming {
         boolean oldNameESet = nameESet;
         name = NAME_EDEFAULT;
         nameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.NAMING__NAME, oldName, NAME_EDEFAULT, oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.NAMING__NAME, oldName, NAME_EDEFAULT,
+                    oldNameESet ) );
     }
 
     /**
@@ -188,13 +190,14 @@ public abstract class NamingImpl extends BaseElementImpl implements Naming {
      * @generated
      */
     @Override
-    public void setDesc(String newDesc) {
+    public void setDesc( String newDesc ) {
         String oldDesc = desc;
         desc = newDesc;
         boolean oldDescESet = descESet;
         descESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.NAMING__DESC, oldDesc, desc, !oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.NAMING__DESC, oldDesc, desc,
+                    !oldDescESet ) );
     }
 
     /**
@@ -208,8 +211,9 @@ public abstract class NamingImpl extends BaseElementImpl implements Naming {
         boolean oldDescESet = descESet;
         desc = DESC_EDEFAULT;
         descESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.NAMING__DESC, oldDesc, DESC_EDEFAULT, oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.NAMING__DESC, oldDesc, DESC_EDEFAULT,
+                    oldDescESet ) );
     }
 
     /**
@@ -229,13 +233,13 @@ public abstract class NamingImpl extends BaseElementImpl implements Naming {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.NAMING__DESC:
-                return getDesc();
-            case SclPackage.NAMING__NAME:
-                return getName();
+        switch( featureID ) {
+        case SclPackage.NAMING__DESC:
+            return getDesc();
+        case SclPackage.NAMING__NAME:
+            return getName();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -245,15 +249,15 @@ public abstract class NamingImpl extends BaseElementImpl implements Naming {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.NAMING__DESC:
-                setDesc((String)newValue);
-                return;
-            case SclPackage.NAMING__NAME:
-                setName((String)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.NAMING__DESC:
+            setDesc( ( String ) newValue );
+            return;
+        case SclPackage.NAMING__NAME:
+            setName( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -263,15 +267,15 @@ public abstract class NamingImpl extends BaseElementImpl implements Naming {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.NAMING__DESC:
-                unsetDesc();
-                return;
-            case SclPackage.NAMING__NAME:
-                unsetName();
-                return;
+        switch( featureID ) {
+        case SclPackage.NAMING__DESC:
+            unsetDesc();
+            return;
+        case SclPackage.NAMING__NAME:
+            unsetName();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -281,13 +285,13 @@ public abstract class NamingImpl extends BaseElementImpl implements Naming {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.NAMING__DESC:
-                return isSetDesc();
-            case SclPackage.NAMING__NAME:
-                return isSetName();
+        switch( featureID ) {
+        case SclPackage.NAMING__DESC:
+            return isSetDesc();
+        case SclPackage.NAMING__NAME:
+            return isSetName();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -296,14 +300,16 @@ public abstract class NamingImpl extends BaseElementImpl implements Naming {
      * @generated
      */
     @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDesc.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.NAMING__DESC: return SclPackage.AG_DESC__DESC;
-                default: return -1;
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDesc.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.NAMING__DESC:
+                return SclPackage.AG_DESC__DESC;
+            default:
+                return -1;
             }
         }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
     }
 
     /**
@@ -312,14 +318,16 @@ public abstract class NamingImpl extends BaseElementImpl implements Naming {
      * @generated
      */
     @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDesc.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_DESC__DESC: return SclPackage.NAMING__DESC;
-                default: return -1;
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDesc.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_DESC__DESC:
+                return SclPackage.NAMING__DESC;
+            default:
+                return -1;
             }
         }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
     }
 
     /**
@@ -329,14 +337,20 @@ public abstract class NamingImpl extends BaseElementImpl implements Naming {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (desc: ");
-        if (descESet) result.append(desc); else result.append("<unset>");
-        result.append(", name: ");
-        if (nameESet) result.append(name); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (desc: " );
+        if( descESet )
+            result.append( desc );
+        else
+            result.append( "<unset>" );
+        result.append( ", name: " );
+        if( nameESet )
+            result.append( name );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/NeutralPointImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/NeutralPointImpl.java
index 44bae8d..bab7c77 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/NeutralPointImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/NeutralPointImpl.java
@@ -71,8 +71,8 @@ public class NeutralPointImpl extends TerminalImpl implements NeutralPoint {
      */
     @Override
     public TransformerWinding getParentTransformerWinding() {
-        if (eContainerFeatureID() != SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING) return null;
-        return (TransformerWinding)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING ) return null;
+        return ( TransformerWinding ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,10 @@ public class NeutralPointImpl extends TerminalImpl implements NeutralPoint {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentTransformerWinding(TransformerWinding newParentTransformerWinding, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentTransformerWinding, SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING, msgs);
+    public NotificationChain basicSetParentTransformerWinding( TransformerWinding newParentTransformerWinding,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentTransformerWinding,
+                SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING, msgs );
         return msgs;
     }
 
@@ -91,20 +93,25 @@ public class NeutralPointImpl extends TerminalImpl implements NeutralPoint {
      * @generated
      */
     @Override
-    public void setParentTransformerWinding(TransformerWinding newParentTransformerWinding) {
-        if (newParentTransformerWinding != eInternalContainer() || (eContainerFeatureID() != SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING && newParentTransformerWinding != null)) {
-            if (EcoreUtil.isAncestor(this, newParentTransformerWinding))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentTransformerWinding( TransformerWinding newParentTransformerWinding ) {
+        if( newParentTransformerWinding != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING
+                        && newParentTransformerWinding != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentTransformerWinding ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentTransformerWinding != null)
-                msgs = ((InternalEObject)newParentTransformerWinding).eInverseAdd(this, SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT, TransformerWinding.class, msgs);
-            msgs = basicSetParentTransformerWinding(newParentTransformerWinding, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentTransformerWinding != null )
+                msgs = ( ( InternalEObject ) newParentTransformerWinding ).eInverseAdd( this,
+                        SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT, TransformerWinding.class, msgs );
+            msgs = basicSetParentTransformerWinding( newParentTransformerWinding, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING, newParentTransformerWinding, newParentTransformerWinding));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET,
+                    SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING, newParentTransformerWinding,
+                    newParentTransformerWinding ) );
     }
 
     /**
@@ -114,13 +121,13 @@ public class NeutralPointImpl extends TerminalImpl implements NeutralPoint {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentTransformerWinding((TransformerWinding)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentTransformerWinding( ( TransformerWinding ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +137,11 @@ public class NeutralPointImpl extends TerminalImpl implements NeutralPoint {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING:
-                return basicSetParentTransformerWinding(null, msgs);
+        switch( featureID ) {
+        case SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING:
+            return basicSetParentTransformerWinding( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +151,12 @@ public class NeutralPointImpl extends TerminalImpl implements NeutralPoint {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING:
-                return eInternalContainer().eInverseRemove(this, SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT, TransformerWinding.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING:
+            return eInternalContainer().eInverseRemove( this, SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT,
+                    TransformerWinding.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +166,11 @@ public class NeutralPointImpl extends TerminalImpl implements NeutralPoint {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING:
-                return getParentTransformerWinding();
+        switch( featureID ) {
+        case SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING:
+            return getParentTransformerWinding();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +180,12 @@ public class NeutralPointImpl extends TerminalImpl implements NeutralPoint {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING:
-                setParentTransformerWinding((TransformerWinding)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING:
+            setParentTransformerWinding( ( TransformerWinding ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +195,12 @@ public class NeutralPointImpl extends TerminalImpl implements NeutralPoint {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING:
-                setParentTransformerWinding((TransformerWinding)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING:
+            setParentTransformerWinding( ( TransformerWinding ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +210,11 @@ public class NeutralPointImpl extends TerminalImpl implements NeutralPoint {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING:
-                return getParentTransformerWinding() != null;
+        switch( featureID ) {
+        case SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING:
+            return getParentTransformerWinding() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //NeutralPointImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/OptFieldsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/OptFieldsImpl.java
index e30a106..7010c02 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/OptFieldsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/OptFieldsImpl.java
@@ -356,8 +356,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         bufOvfl = newBufOvfl;
         boolean oldBufOvflESet = bufOvflESet;
         bufOvflESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.OPT_FIELDS__BUF_OVFL, oldBufOvfl, bufOvfl, !oldBufOvflESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.OPT_FIELDS__BUF_OVFL, oldBufOvfl,
+                    bufOvfl, !oldBufOvflESet ) );
     }
 
     /**
@@ -371,8 +372,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         boolean oldBufOvflESet = bufOvflESet;
         bufOvfl = BUF_OVFL_EDEFAULT;
         bufOvflESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.OPT_FIELDS__BUF_OVFL, oldBufOvfl, BUF_OVFL_EDEFAULT, oldBufOvflESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.OPT_FIELDS__BUF_OVFL, oldBufOvfl,
+                    BUF_OVFL_EDEFAULT, oldBufOvflESet ) );
     }
 
     /**
@@ -406,8 +408,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         configRef = newConfigRef;
         boolean oldConfigRefESet = configRefESet;
         configRefESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.OPT_FIELDS__CONFIG_REF, oldConfigRef, configRef, !oldConfigRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.OPT_FIELDS__CONFIG_REF, oldConfigRef,
+                    configRef, !oldConfigRefESet ) );
     }
 
     /**
@@ -421,8 +424,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         boolean oldConfigRefESet = configRefESet;
         configRef = CONFIG_REF_EDEFAULT;
         configRefESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.OPT_FIELDS__CONFIG_REF, oldConfigRef, CONFIG_REF_EDEFAULT, oldConfigRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.OPT_FIELDS__CONFIG_REF, oldConfigRef,
+                    CONFIG_REF_EDEFAULT, oldConfigRefESet ) );
     }
 
     /**
@@ -456,8 +460,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         dataRef = newDataRef;
         boolean oldDataRefESet = dataRefESet;
         dataRefESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.OPT_FIELDS__DATA_REF, oldDataRef, dataRef, !oldDataRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.OPT_FIELDS__DATA_REF, oldDataRef,
+                    dataRef, !oldDataRefESet ) );
     }
 
     /**
@@ -471,8 +476,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         boolean oldDataRefESet = dataRefESet;
         dataRef = DATA_REF_EDEFAULT;
         dataRefESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.OPT_FIELDS__DATA_REF, oldDataRef, DATA_REF_EDEFAULT, oldDataRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.OPT_FIELDS__DATA_REF, oldDataRef,
+                    DATA_REF_EDEFAULT, oldDataRefESet ) );
     }
 
     /**
@@ -506,8 +512,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         dataSet = newDataSet;
         boolean oldDataSetESet = dataSetESet;
         dataSetESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.OPT_FIELDS__DATA_SET, oldDataSet, dataSet, !oldDataSetESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.OPT_FIELDS__DATA_SET, oldDataSet,
+                    dataSet, !oldDataSetESet ) );
     }
 
     /**
@@ -521,8 +528,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         boolean oldDataSetESet = dataSetESet;
         dataSet = DATA_SET_EDEFAULT;
         dataSetESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.OPT_FIELDS__DATA_SET, oldDataSet, DATA_SET_EDEFAULT, oldDataSetESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.OPT_FIELDS__DATA_SET, oldDataSet,
+                    DATA_SET_EDEFAULT, oldDataSetESet ) );
     }
 
     /**
@@ -556,8 +564,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         entryID = newEntryID;
         boolean oldEntryIDESet = entryIDESet;
         entryIDESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.OPT_FIELDS__ENTRY_ID, oldEntryID, entryID, !oldEntryIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.OPT_FIELDS__ENTRY_ID, oldEntryID,
+                    entryID, !oldEntryIDESet ) );
     }
 
     /**
@@ -571,8 +580,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         boolean oldEntryIDESet = entryIDESet;
         entryID = ENTRY_ID_EDEFAULT;
         entryIDESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.OPT_FIELDS__ENTRY_ID, oldEntryID, ENTRY_ID_EDEFAULT, oldEntryIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.OPT_FIELDS__ENTRY_ID, oldEntryID,
+                    ENTRY_ID_EDEFAULT, oldEntryIDESet ) );
     }
 
     /**
@@ -606,8 +616,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         reasonCode = newReasonCode;
         boolean oldReasonCodeESet = reasonCodeESet;
         reasonCodeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.OPT_FIELDS__REASON_CODE, oldReasonCode, reasonCode, !oldReasonCodeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.OPT_FIELDS__REASON_CODE, oldReasonCode,
+                    reasonCode, !oldReasonCodeESet ) );
     }
 
     /**
@@ -621,8 +632,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         boolean oldReasonCodeESet = reasonCodeESet;
         reasonCode = REASON_CODE_EDEFAULT;
         reasonCodeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.OPT_FIELDS__REASON_CODE, oldReasonCode, REASON_CODE_EDEFAULT, oldReasonCodeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.OPT_FIELDS__REASON_CODE, oldReasonCode,
+                    REASON_CODE_EDEFAULT, oldReasonCodeESet ) );
     }
 
     /**
@@ -656,8 +668,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         seqNum = newSeqNum;
         boolean oldSeqNumESet = seqNumESet;
         seqNumESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.OPT_FIELDS__SEQ_NUM, oldSeqNum, seqNum, !oldSeqNumESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.OPT_FIELDS__SEQ_NUM, oldSeqNum, seqNum,
+                    !oldSeqNumESet ) );
     }
 
     /**
@@ -671,8 +684,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         boolean oldSeqNumESet = seqNumESet;
         seqNum = SEQ_NUM_EDEFAULT;
         seqNumESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.OPT_FIELDS__SEQ_NUM, oldSeqNum, SEQ_NUM_EDEFAULT, oldSeqNumESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.OPT_FIELDS__SEQ_NUM, oldSeqNum,
+                    SEQ_NUM_EDEFAULT, oldSeqNumESet ) );
     }
 
     /**
@@ -706,8 +720,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         timeStamp = newTimeStamp;
         boolean oldTimeStampESet = timeStampESet;
         timeStampESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.OPT_FIELDS__TIME_STAMP, oldTimeStamp, timeStamp, !oldTimeStampESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.OPT_FIELDS__TIME_STAMP, oldTimeStamp,
+                    timeStamp, !oldTimeStampESet ) );
     }
 
     /**
@@ -721,8 +736,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         boolean oldTimeStampESet = timeStampESet;
         timeStamp = TIME_STAMP_EDEFAULT;
         timeStampESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.OPT_FIELDS__TIME_STAMP, oldTimeStamp, TIME_STAMP_EDEFAULT, oldTimeStampESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.OPT_FIELDS__TIME_STAMP, oldTimeStamp,
+                    TIME_STAMP_EDEFAULT, oldTimeStampESet ) );
     }
 
     /**
@@ -751,13 +767,14 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
      * @generated
      */
     @Override
-    public void setSegmentation(Boolean newSegmentation) {
+    public void setSegmentation( Boolean newSegmentation ) {
         Boolean oldSegmentation = segmentation;
         segmentation = newSegmentation;
         boolean oldSegmentationESet = segmentationESet;
         segmentationESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.OPT_FIELDS__SEGMENTATION, oldSegmentation, segmentation, !oldSegmentationESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.OPT_FIELDS__SEGMENTATION,
+                    oldSegmentation, segmentation, !oldSegmentationESet ) );
     }
 
     /**
@@ -771,8 +788,9 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
         boolean oldSegmentationESet = segmentationESet;
         segmentation = SEGMENTATION_EDEFAULT;
         segmentationESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.OPT_FIELDS__SEGMENTATION, oldSegmentation, SEGMENTATION_EDEFAULT, oldSegmentationESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.OPT_FIELDS__SEGMENTATION,
+                    oldSegmentation, SEGMENTATION_EDEFAULT, oldSegmentationESet ) );
     }
 
     /**
@@ -792,8 +810,8 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
      */
     @Override
     public ReportControl getParentReportControl() {
-        if (eContainerFeatureID() != SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL) return null;
-        return (ReportControl)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL ) return null;
+        return ( ReportControl ) eInternalContainer();
     }
 
     /**
@@ -801,8 +819,10 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentReportControl(ReportControl newParentReportControl, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentReportControl, SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL, msgs);
+    public NotificationChain basicSetParentReportControl( ReportControl newParentReportControl,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentReportControl,
+                SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL, msgs );
         return msgs;
     }
 
@@ -812,20 +832,24 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
      * @generated
      */
     @Override
-    public void setParentReportControl(ReportControl newParentReportControl) {
-        if (newParentReportControl != eInternalContainer() || (eContainerFeatureID() != SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL && newParentReportControl != null)) {
-            if (EcoreUtil.isAncestor(this, newParentReportControl))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentReportControl( ReportControl newParentReportControl ) {
+        if( newParentReportControl != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL
+                        && newParentReportControl != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentReportControl ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentReportControl != null)
-                msgs = ((InternalEObject)newParentReportControl).eInverseAdd(this, SclPackage.REPORT_CONTROL__OPT_FIELDS, ReportControl.class, msgs);
-            msgs = basicSetParentReportControl(newParentReportControl, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentReportControl != null )
+                msgs = ( ( InternalEObject ) newParentReportControl ).eInverseAdd( this,
+                        SclPackage.REPORT_CONTROL__OPT_FIELDS, ReportControl.class, msgs );
+            msgs = basicSetParentReportControl( newParentReportControl, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL, newParentReportControl, newParentReportControl));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL,
+                    newParentReportControl, newParentReportControl ) );
     }
 
     /**
@@ -835,13 +859,13 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentReportControl((ReportControl)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentReportControl( ( ReportControl ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -851,11 +875,11 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL:
-                return basicSetParentReportControl(null, msgs);
+        switch( featureID ) {
+        case SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL:
+            return basicSetParentReportControl( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -865,11 +889,12 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL:
-                return eInternalContainer().eInverseRemove(this, SclPackage.REPORT_CONTROL__OPT_FIELDS, ReportControl.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL:
+            return eInternalContainer().eInverseRemove( this, SclPackage.REPORT_CONTROL__OPT_FIELDS,
+                    ReportControl.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -879,29 +904,29 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.OPT_FIELDS__BUF_OVFL:
-                return getBufOvfl();
-            case SclPackage.OPT_FIELDS__CONFIG_REF:
-                return getConfigRef();
-            case SclPackage.OPT_FIELDS__DATA_REF:
-                return getDataRef();
-            case SclPackage.OPT_FIELDS__DATA_SET:
-                return getDataSet();
-            case SclPackage.OPT_FIELDS__ENTRY_ID:
-                return getEntryID();
-            case SclPackage.OPT_FIELDS__REASON_CODE:
-                return getReasonCode();
-            case SclPackage.OPT_FIELDS__SEQ_NUM:
-                return getSeqNum();
-            case SclPackage.OPT_FIELDS__TIME_STAMP:
-                return getTimeStamp();
-            case SclPackage.OPT_FIELDS__SEGMENTATION:
-                return getSegmentation();
-            case SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL:
-                return getParentReportControl();
+        switch( featureID ) {
+        case SclPackage.OPT_FIELDS__BUF_OVFL:
+            return getBufOvfl();
+        case SclPackage.OPT_FIELDS__CONFIG_REF:
+            return getConfigRef();
+        case SclPackage.OPT_FIELDS__DATA_REF:
+            return getDataRef();
+        case SclPackage.OPT_FIELDS__DATA_SET:
+            return getDataSet();
+        case SclPackage.OPT_FIELDS__ENTRY_ID:
+            return getEntryID();
+        case SclPackage.OPT_FIELDS__REASON_CODE:
+            return getReasonCode();
+        case SclPackage.OPT_FIELDS__SEQ_NUM:
+            return getSeqNum();
+        case SclPackage.OPT_FIELDS__TIME_STAMP:
+            return getTimeStamp();
+        case SclPackage.OPT_FIELDS__SEGMENTATION:
+            return getSegmentation();
+        case SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL:
+            return getParentReportControl();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -911,39 +936,39 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.OPT_FIELDS__BUF_OVFL:
-                setBufOvfl((Boolean)newValue);
-                return;
-            case SclPackage.OPT_FIELDS__CONFIG_REF:
-                setConfigRef((Boolean)newValue);
-                return;
-            case SclPackage.OPT_FIELDS__DATA_REF:
-                setDataRef((Boolean)newValue);
-                return;
-            case SclPackage.OPT_FIELDS__DATA_SET:
-                setDataSet((Boolean)newValue);
-                return;
-            case SclPackage.OPT_FIELDS__ENTRY_ID:
-                setEntryID((Boolean)newValue);
-                return;
-            case SclPackage.OPT_FIELDS__REASON_CODE:
-                setReasonCode((Boolean)newValue);
-                return;
-            case SclPackage.OPT_FIELDS__SEQ_NUM:
-                setSeqNum((Boolean)newValue);
-                return;
-            case SclPackage.OPT_FIELDS__TIME_STAMP:
-                setTimeStamp((Boolean)newValue);
-                return;
-            case SclPackage.OPT_FIELDS__SEGMENTATION:
-                setSegmentation((Boolean)newValue);
-                return;
-            case SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL:
-                setParentReportControl((ReportControl)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.OPT_FIELDS__BUF_OVFL:
+            setBufOvfl( ( Boolean ) newValue );
+            return;
+        case SclPackage.OPT_FIELDS__CONFIG_REF:
+            setConfigRef( ( Boolean ) newValue );
+            return;
+        case SclPackage.OPT_FIELDS__DATA_REF:
+            setDataRef( ( Boolean ) newValue );
+            return;
+        case SclPackage.OPT_FIELDS__DATA_SET:
+            setDataSet( ( Boolean ) newValue );
+            return;
+        case SclPackage.OPT_FIELDS__ENTRY_ID:
+            setEntryID( ( Boolean ) newValue );
+            return;
+        case SclPackage.OPT_FIELDS__REASON_CODE:
+            setReasonCode( ( Boolean ) newValue );
+            return;
+        case SclPackage.OPT_FIELDS__SEQ_NUM:
+            setSeqNum( ( Boolean ) newValue );
+            return;
+        case SclPackage.OPT_FIELDS__TIME_STAMP:
+            setTimeStamp( ( Boolean ) newValue );
+            return;
+        case SclPackage.OPT_FIELDS__SEGMENTATION:
+            setSegmentation( ( Boolean ) newValue );
+            return;
+        case SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL:
+            setParentReportControl( ( ReportControl ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -953,39 +978,39 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.OPT_FIELDS__BUF_OVFL:
-                unsetBufOvfl();
-                return;
-            case SclPackage.OPT_FIELDS__CONFIG_REF:
-                unsetConfigRef();
-                return;
-            case SclPackage.OPT_FIELDS__DATA_REF:
-                unsetDataRef();
-                return;
-            case SclPackage.OPT_FIELDS__DATA_SET:
-                unsetDataSet();
-                return;
-            case SclPackage.OPT_FIELDS__ENTRY_ID:
-                unsetEntryID();
-                return;
-            case SclPackage.OPT_FIELDS__REASON_CODE:
-                unsetReasonCode();
-                return;
-            case SclPackage.OPT_FIELDS__SEQ_NUM:
-                unsetSeqNum();
-                return;
-            case SclPackage.OPT_FIELDS__TIME_STAMP:
-                unsetTimeStamp();
-                return;
-            case SclPackage.OPT_FIELDS__SEGMENTATION:
-                unsetSegmentation();
-                return;
-            case SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL:
-                setParentReportControl((ReportControl)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.OPT_FIELDS__BUF_OVFL:
+            unsetBufOvfl();
+            return;
+        case SclPackage.OPT_FIELDS__CONFIG_REF:
+            unsetConfigRef();
+            return;
+        case SclPackage.OPT_FIELDS__DATA_REF:
+            unsetDataRef();
+            return;
+        case SclPackage.OPT_FIELDS__DATA_SET:
+            unsetDataSet();
+            return;
+        case SclPackage.OPT_FIELDS__ENTRY_ID:
+            unsetEntryID();
+            return;
+        case SclPackage.OPT_FIELDS__REASON_CODE:
+            unsetReasonCode();
+            return;
+        case SclPackage.OPT_FIELDS__SEQ_NUM:
+            unsetSeqNum();
+            return;
+        case SclPackage.OPT_FIELDS__TIME_STAMP:
+            unsetTimeStamp();
+            return;
+        case SclPackage.OPT_FIELDS__SEGMENTATION:
+            unsetSegmentation();
+            return;
+        case SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL:
+            setParentReportControl( ( ReportControl ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -995,29 +1020,29 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.OPT_FIELDS__BUF_OVFL:
-                return isSetBufOvfl();
-            case SclPackage.OPT_FIELDS__CONFIG_REF:
-                return isSetConfigRef();
-            case SclPackage.OPT_FIELDS__DATA_REF:
-                return isSetDataRef();
-            case SclPackage.OPT_FIELDS__DATA_SET:
-                return isSetDataSet();
-            case SclPackage.OPT_FIELDS__ENTRY_ID:
-                return isSetEntryID();
-            case SclPackage.OPT_FIELDS__REASON_CODE:
-                return isSetReasonCode();
-            case SclPackage.OPT_FIELDS__SEQ_NUM:
-                return isSetSeqNum();
-            case SclPackage.OPT_FIELDS__TIME_STAMP:
-                return isSetTimeStamp();
-            case SclPackage.OPT_FIELDS__SEGMENTATION:
-                return isSetSegmentation();
-            case SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL:
-                return getParentReportControl() != null;
+        switch( featureID ) {
+        case SclPackage.OPT_FIELDS__BUF_OVFL:
+            return isSetBufOvfl();
+        case SclPackage.OPT_FIELDS__CONFIG_REF:
+            return isSetConfigRef();
+        case SclPackage.OPT_FIELDS__DATA_REF:
+            return isSetDataRef();
+        case SclPackage.OPT_FIELDS__DATA_SET:
+            return isSetDataSet();
+        case SclPackage.OPT_FIELDS__ENTRY_ID:
+            return isSetEntryID();
+        case SclPackage.OPT_FIELDS__REASON_CODE:
+            return isSetReasonCode();
+        case SclPackage.OPT_FIELDS__SEQ_NUM:
+            return isSetSeqNum();
+        case SclPackage.OPT_FIELDS__TIME_STAMP:
+            return isSetTimeStamp();
+        case SclPackage.OPT_FIELDS__SEGMENTATION:
+            return isSetSegmentation();
+        case SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL:
+            return getParentReportControl() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -1026,22 +1051,32 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
      * @generated
      */
     @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == AgOptFields.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.OPT_FIELDS__BUF_OVFL: return SclPackage.AG_OPT_FIELDS__BUF_OVFL;
-                case SclPackage.OPT_FIELDS__CONFIG_REF: return SclPackage.AG_OPT_FIELDS__CONFIG_REF;
-                case SclPackage.OPT_FIELDS__DATA_REF: return SclPackage.AG_OPT_FIELDS__DATA_REF;
-                case SclPackage.OPT_FIELDS__DATA_SET: return SclPackage.AG_OPT_FIELDS__DATA_SET;
-                case SclPackage.OPT_FIELDS__ENTRY_ID: return SclPackage.AG_OPT_FIELDS__ENTRY_ID;
-                case SclPackage.OPT_FIELDS__REASON_CODE: return SclPackage.AG_OPT_FIELDS__REASON_CODE;
-                case SclPackage.OPT_FIELDS__SEQ_NUM: return SclPackage.AG_OPT_FIELDS__SEQ_NUM;
-                case SclPackage.OPT_FIELDS__TIME_STAMP: return SclPackage.AG_OPT_FIELDS__TIME_STAMP;
-                case SclPackage.OPT_FIELDS__SEGMENTATION: return SclPackage.AG_OPT_FIELDS__SEGMENTATION;
-                default: return -1;
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgOptFields.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.OPT_FIELDS__BUF_OVFL:
+                return SclPackage.AG_OPT_FIELDS__BUF_OVFL;
+            case SclPackage.OPT_FIELDS__CONFIG_REF:
+                return SclPackage.AG_OPT_FIELDS__CONFIG_REF;
+            case SclPackage.OPT_FIELDS__DATA_REF:
+                return SclPackage.AG_OPT_FIELDS__DATA_REF;
+            case SclPackage.OPT_FIELDS__DATA_SET:
+                return SclPackage.AG_OPT_FIELDS__DATA_SET;
+            case SclPackage.OPT_FIELDS__ENTRY_ID:
+                return SclPackage.AG_OPT_FIELDS__ENTRY_ID;
+            case SclPackage.OPT_FIELDS__REASON_CODE:
+                return SclPackage.AG_OPT_FIELDS__REASON_CODE;
+            case SclPackage.OPT_FIELDS__SEQ_NUM:
+                return SclPackage.AG_OPT_FIELDS__SEQ_NUM;
+            case SclPackage.OPT_FIELDS__TIME_STAMP:
+                return SclPackage.AG_OPT_FIELDS__TIME_STAMP;
+            case SclPackage.OPT_FIELDS__SEGMENTATION:
+                return SclPackage.AG_OPT_FIELDS__SEGMENTATION;
+            default:
+                return -1;
             }
         }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
     }
 
     /**
@@ -1050,22 +1085,32 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
      * @generated
      */
     @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == AgOptFields.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_OPT_FIELDS__BUF_OVFL: return SclPackage.OPT_FIELDS__BUF_OVFL;
-                case SclPackage.AG_OPT_FIELDS__CONFIG_REF: return SclPackage.OPT_FIELDS__CONFIG_REF;
-                case SclPackage.AG_OPT_FIELDS__DATA_REF: return SclPackage.OPT_FIELDS__DATA_REF;
-                case SclPackage.AG_OPT_FIELDS__DATA_SET: return SclPackage.OPT_FIELDS__DATA_SET;
-                case SclPackage.AG_OPT_FIELDS__ENTRY_ID: return SclPackage.OPT_FIELDS__ENTRY_ID;
-                case SclPackage.AG_OPT_FIELDS__REASON_CODE: return SclPackage.OPT_FIELDS__REASON_CODE;
-                case SclPackage.AG_OPT_FIELDS__SEQ_NUM: return SclPackage.OPT_FIELDS__SEQ_NUM;
-                case SclPackage.AG_OPT_FIELDS__TIME_STAMP: return SclPackage.OPT_FIELDS__TIME_STAMP;
-                case SclPackage.AG_OPT_FIELDS__SEGMENTATION: return SclPackage.OPT_FIELDS__SEGMENTATION;
-                default: return -1;
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgOptFields.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_OPT_FIELDS__BUF_OVFL:
+                return SclPackage.OPT_FIELDS__BUF_OVFL;
+            case SclPackage.AG_OPT_FIELDS__CONFIG_REF:
+                return SclPackage.OPT_FIELDS__CONFIG_REF;
+            case SclPackage.AG_OPT_FIELDS__DATA_REF:
+                return SclPackage.OPT_FIELDS__DATA_REF;
+            case SclPackage.AG_OPT_FIELDS__DATA_SET:
+                return SclPackage.OPT_FIELDS__DATA_SET;
+            case SclPackage.AG_OPT_FIELDS__ENTRY_ID:
+                return SclPackage.OPT_FIELDS__ENTRY_ID;
+            case SclPackage.AG_OPT_FIELDS__REASON_CODE:
+                return SclPackage.OPT_FIELDS__REASON_CODE;
+            case SclPackage.AG_OPT_FIELDS__SEQ_NUM:
+                return SclPackage.OPT_FIELDS__SEQ_NUM;
+            case SclPackage.AG_OPT_FIELDS__TIME_STAMP:
+                return SclPackage.OPT_FIELDS__TIME_STAMP;
+            case SclPackage.AG_OPT_FIELDS__SEGMENTATION:
+                return SclPackage.OPT_FIELDS__SEGMENTATION;
+            default:
+                return -1;
             }
         }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
     }
 
     /**
@@ -1075,28 +1120,55 @@ public class OptFieldsImpl extends SclObjectImpl implements OptFields {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (bufOvfl: ");
-        if (bufOvflESet) result.append(bufOvfl); else result.append("<unset>");
-        result.append(", configRef: ");
-        if (configRefESet) result.append(configRef); else result.append("<unset>");
-        result.append(", dataRef: ");
-        if (dataRefESet) result.append(dataRef); else result.append("<unset>");
-        result.append(", dataSet: ");
-        if (dataSetESet) result.append(dataSet); else result.append("<unset>");
-        result.append(", entryID: ");
-        if (entryIDESet) result.append(entryID); else result.append("<unset>");
-        result.append(", reasonCode: ");
-        if (reasonCodeESet) result.append(reasonCode); else result.append("<unset>");
-        result.append(", seqNum: ");
-        if (seqNumESet) result.append(seqNum); else result.append("<unset>");
-        result.append(", timeStamp: ");
-        if (timeStampESet) result.append(timeStamp); else result.append("<unset>");
-        result.append(", segmentation: ");
-        if (segmentationESet) result.append(segmentation); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (bufOvfl: " );
+        if( bufOvflESet )
+            result.append( bufOvfl );
+        else
+            result.append( "<unset>" );
+        result.append( ", configRef: " );
+        if( configRefESet )
+            result.append( configRef );
+        else
+            result.append( "<unset>" );
+        result.append( ", dataRef: " );
+        if( dataRefESet )
+            result.append( dataRef );
+        else
+            result.append( "<unset>" );
+        result.append( ", dataSet: " );
+        if( dataSetESet )
+            result.append( dataSet );
+        else
+            result.append( "<unset>" );
+        result.append( ", entryID: " );
+        if( entryIDESet )
+            result.append( entryID );
+        else
+            result.append( "<unset>" );
+        result.append( ", reasonCode: " );
+        if( reasonCodeESet )
+            result.append( reasonCode );
+        else
+            result.append( "<unset>" );
+        result.append( ", seqNum: " );
+        if( seqNumESet )
+            result.append( seqNum );
+        else
+            result.append( "<unset>" );
+        result.append( ", timeStamp: " );
+        if( timeStampESet )
+            result.append( timeStamp );
+        else
+            result.append( "<unset>" );
+        result.append( ", segmentation: " );
+        if( segmentationESet )
+            result.append( segmentation );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PAddrImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PAddrImpl.java
index d0fd86e..179f743 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PAddrImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PAddrImpl.java
@@ -140,8 +140,9 @@ public class PAddrImpl extends SclObjectImpl implements PAddr {
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PADDR__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PADDR__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -155,8 +156,9 @@ public class PAddrImpl extends SclObjectImpl implements PAddr {
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.PADDR__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.PADDR__TYPE, oldType, TYPE_EDEFAULT,
+                    oldTypeESet ) );
     }
 
     /**
@@ -190,8 +192,9 @@ public class PAddrImpl extends SclObjectImpl implements PAddr {
         value = newValue;
         boolean oldValueESet = valueESet;
         valueESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PADDR__VALUE, oldValue, value, !oldValueESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PADDR__VALUE, oldValue, value,
+                    !oldValueESet ) );
     }
 
     /**
@@ -205,8 +208,9 @@ public class PAddrImpl extends SclObjectImpl implements PAddr {
         boolean oldValueESet = valueESet;
         value = VALUE_EDEFAULT;
         valueESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.PADDR__VALUE, oldValue, VALUE_EDEFAULT, oldValueESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.PADDR__VALUE, oldValue, VALUE_EDEFAULT,
+                    oldValueESet ) );
     }
 
     /**
@@ -226,13 +230,13 @@ public class PAddrImpl extends SclObjectImpl implements PAddr {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.PADDR__TYPE:
-                return getType();
-            case SclPackage.PADDR__VALUE:
-                return getValue();
+        switch( featureID ) {
+        case SclPackage.PADDR__TYPE:
+            return getType();
+        case SclPackage.PADDR__VALUE:
+            return getValue();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -242,15 +246,15 @@ public class PAddrImpl extends SclObjectImpl implements PAddr {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.PADDR__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.PADDR__VALUE:
-                setValue((String)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.PADDR__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.PADDR__VALUE:
+            setValue( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -260,15 +264,15 @@ public class PAddrImpl extends SclObjectImpl implements PAddr {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.PADDR__TYPE:
-                unsetType();
-                return;
-            case SclPackage.PADDR__VALUE:
-                unsetValue();
-                return;
+        switch( featureID ) {
+        case SclPackage.PADDR__TYPE:
+            unsetType();
+            return;
+        case SclPackage.PADDR__VALUE:
+            unsetValue();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -278,13 +282,13 @@ public class PAddrImpl extends SclObjectImpl implements PAddr {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.PADDR__TYPE:
-                return isSetType();
-            case SclPackage.PADDR__VALUE:
-                return isSetValue();
+        switch( featureID ) {
+        case SclPackage.PADDR__TYPE:
+            return isSetType();
+        case SclPackage.PADDR__VALUE:
+            return isSetValue();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -294,14 +298,20 @@ public class PAddrImpl extends SclObjectImpl implements PAddr {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(", value: ");
-        if (valueESet) result.append(value); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ", value: " );
+        if( valueESet )
+            result.append( value );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PImpl.java
index 90e795e..6aba094 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PImpl.java
@@ -71,8 +71,8 @@ public class PImpl extends PAddrImpl implements P {
      */
     @Override
     public Address getParentAddress() {
-        if (eContainerFeatureID() != SclPackage.P__PARENT_ADDRESS) return null;
-        return (Address)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.P__PARENT_ADDRESS ) return null;
+        return ( Address ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,8 @@ public class PImpl extends PAddrImpl implements P {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAddress(Address newParentAddress, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAddress, SclPackage.P__PARENT_ADDRESS, msgs);
+    public NotificationChain basicSetParentAddress( Address newParentAddress, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAddress, SclPackage.P__PARENT_ADDRESS, msgs );
         return msgs;
     }
 
@@ -91,20 +91,23 @@ public class PImpl extends PAddrImpl implements P {
      * @generated
      */
     @Override
-    public void setParentAddress(Address newParentAddress) {
-        if (newParentAddress != eInternalContainer() || (eContainerFeatureID() != SclPackage.P__PARENT_ADDRESS && newParentAddress != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAddress))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAddress( Address newParentAddress ) {
+        if( newParentAddress != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.P__PARENT_ADDRESS && newParentAddress != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAddress ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAddress != null)
-                msgs = ((InternalEObject)newParentAddress).eInverseAdd(this, SclPackage.ADDRESS__P, Address.class, msgs);
-            msgs = basicSetParentAddress(newParentAddress, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAddress != null )
+                msgs = ( ( InternalEObject ) newParentAddress ).eInverseAdd( this, SclPackage.ADDRESS__P, Address.class,
+                        msgs );
+            msgs = basicSetParentAddress( newParentAddress, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.P__PARENT_ADDRESS, newParentAddress, newParentAddress));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.P__PARENT_ADDRESS, newParentAddress,
+                    newParentAddress ) );
     }
 
     /**
@@ -114,13 +117,13 @@ public class PImpl extends PAddrImpl implements P {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.P__PARENT_ADDRESS:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAddress((Address)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.P__PARENT_ADDRESS:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAddress( ( Address ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +133,11 @@ public class PImpl extends PAddrImpl implements P {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.P__PARENT_ADDRESS:
-                return basicSetParentAddress(null, msgs);
+        switch( featureID ) {
+        case SclPackage.P__PARENT_ADDRESS:
+            return basicSetParentAddress( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +147,11 @@ public class PImpl extends PAddrImpl implements P {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.P__PARENT_ADDRESS:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ADDRESS__P, Address.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.P__PARENT_ADDRESS:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ADDRESS__P, Address.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +161,11 @@ public class PImpl extends PAddrImpl implements P {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.P__PARENT_ADDRESS:
-                return getParentAddress();
+        switch( featureID ) {
+        case SclPackage.P__PARENT_ADDRESS:
+            return getParentAddress();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +175,12 @@ public class PImpl extends PAddrImpl implements P {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.P__PARENT_ADDRESS:
-                setParentAddress((Address)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.P__PARENT_ADDRESS:
+            setParentAddress( ( Address ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +190,12 @@ public class PImpl extends PAddrImpl implements P {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.P__PARENT_ADDRESS:
-                setParentAddress((Address)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.P__PARENT_ADDRESS:
+            setParentAddress( ( Address ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +205,11 @@ public class PImpl extends PAddrImpl implements P {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.P__PARENT_ADDRESS:
-                return getParentAddress() != null;
+        switch( featureID ) {
+        case SclPackage.P__PARENT_ADDRESS:
+            return getParentAddress() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //PImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/P_PhysConnImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/P_PhysConnImpl.java
index 4a1e952..1fa7599 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/P_PhysConnImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/P_PhysConnImpl.java
@@ -71,8 +71,8 @@ public class P_PhysConnImpl extends PAddrImpl implements P_PhysConn {
      */
     @Override
     public PhysConn getParentPhysConn() {
-        if (eContainerFeatureID() != SclPackage.PPHYS_CONN__PARENT_PHYS_CONN) return null;
-        return (PhysConn)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.PPHYS_CONN__PARENT_PHYS_CONN ) return null;
+        return ( PhysConn ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class P_PhysConnImpl extends PAddrImpl implements P_PhysConn {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentPhysConn(PhysConn newParentPhysConn, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentPhysConn, SclPackage.PPHYS_CONN__PARENT_PHYS_CONN, msgs);
+    public NotificationChain basicSetParentPhysConn( PhysConn newParentPhysConn, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentPhysConn, SclPackage.PPHYS_CONN__PARENT_PHYS_CONN,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,23 @@ public class P_PhysConnImpl extends PAddrImpl implements P_PhysConn {
      * @generated
      */
     @Override
-    public void setParentPhysConn(PhysConn newParentPhysConn) {
-        if (newParentPhysConn != eInternalContainer() || (eContainerFeatureID() != SclPackage.PPHYS_CONN__PARENT_PHYS_CONN && newParentPhysConn != null)) {
-            if (EcoreUtil.isAncestor(this, newParentPhysConn))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentPhysConn( PhysConn newParentPhysConn ) {
+        if( newParentPhysConn != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.PPHYS_CONN__PARENT_PHYS_CONN && newParentPhysConn != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentPhysConn ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentPhysConn != null)
-                msgs = ((InternalEObject)newParentPhysConn).eInverseAdd(this, SclPackage.PHYS_CONN__P, PhysConn.class, msgs);
-            msgs = basicSetParentPhysConn(newParentPhysConn, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentPhysConn != null )
+                msgs = ( ( InternalEObject ) newParentPhysConn ).eInverseAdd( this, SclPackage.PHYS_CONN__P,
+                        PhysConn.class, msgs );
+            msgs = basicSetParentPhysConn( newParentPhysConn, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PPHYS_CONN__PARENT_PHYS_CONN, newParentPhysConn, newParentPhysConn));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PPHYS_CONN__PARENT_PHYS_CONN,
+                    newParentPhysConn, newParentPhysConn ) );
     }
 
     /**
@@ -114,13 +118,13 @@ public class P_PhysConnImpl extends PAddrImpl implements P_PhysConn {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.PPHYS_CONN__PARENT_PHYS_CONN:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentPhysConn((PhysConn)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.PPHYS_CONN__PARENT_PHYS_CONN:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentPhysConn( ( PhysConn ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +134,11 @@ public class P_PhysConnImpl extends PAddrImpl implements P_PhysConn {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.PPHYS_CONN__PARENT_PHYS_CONN:
-                return basicSetParentPhysConn(null, msgs);
+        switch( featureID ) {
+        case SclPackage.PPHYS_CONN__PARENT_PHYS_CONN:
+            return basicSetParentPhysConn( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +148,11 @@ public class P_PhysConnImpl extends PAddrImpl implements P_PhysConn {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.PPHYS_CONN__PARENT_PHYS_CONN:
-                return eInternalContainer().eInverseRemove(this, SclPackage.PHYS_CONN__P, PhysConn.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.PPHYS_CONN__PARENT_PHYS_CONN:
+            return eInternalContainer().eInverseRemove( this, SclPackage.PHYS_CONN__P, PhysConn.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +162,11 @@ public class P_PhysConnImpl extends PAddrImpl implements P_PhysConn {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.PPHYS_CONN__PARENT_PHYS_CONN:
-                return getParentPhysConn();
+        switch( featureID ) {
+        case SclPackage.PPHYS_CONN__PARENT_PHYS_CONN:
+            return getParentPhysConn();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +176,12 @@ public class P_PhysConnImpl extends PAddrImpl implements P_PhysConn {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.PPHYS_CONN__PARENT_PHYS_CONN:
-                setParentPhysConn((PhysConn)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.PPHYS_CONN__PARENT_PHYS_CONN:
+            setParentPhysConn( ( PhysConn ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +191,12 @@ public class P_PhysConnImpl extends PAddrImpl implements P_PhysConn {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.PPHYS_CONN__PARENT_PHYS_CONN:
-                setParentPhysConn((PhysConn)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.PPHYS_CONN__PARENT_PHYS_CONN:
+            setParentPhysConn( ( PhysConn ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +206,11 @@ public class P_PhysConnImpl extends PAddrImpl implements P_PhysConn {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.PPHYS_CONN__PARENT_PHYS_CONN:
-                return getParentPhysConn() != null;
+        switch( featureID ) {
+        case SclPackage.PPHYS_CONN__PARENT_PHYS_CONN:
+            return getParentPhysConn() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //P_PhysConnImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PhysConnImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PhysConnImpl.java
index 5ff6b03..30f269a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PhysConnImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PhysConnImpl.java
@@ -89,7 +89,7 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
      * @generated
      * @ordered
      */
-    protected EList<P_PhysConn> p;
+    protected EList< P_PhysConn > p;
 
     /**
      * <!-- begin-user-doc -->
@@ -131,8 +131,9 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PHYS_CONN__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PHYS_CONN__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -146,8 +147,9 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.PHYS_CONN__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.PHYS_CONN__TYPE, oldType,
+                    TYPE_EDEFAULT, oldTypeESet ) );
     }
 
     /**
@@ -167,8 +169,8 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
      */
     @Override
     public ConnectedAP getParentConnectedAP() {
-        if (eContainerFeatureID() != SclPackage.PHYS_CONN__PARENT_CONNECTED_AP) return null;
-        return (ConnectedAP)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.PHYS_CONN__PARENT_CONNECTED_AP ) return null;
+        return ( ConnectedAP ) eInternalContainer();
     }
 
     /**
@@ -176,8 +178,9 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentConnectedAP(ConnectedAP newParentConnectedAP, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentConnectedAP, SclPackage.PHYS_CONN__PARENT_CONNECTED_AP, msgs);
+    public NotificationChain basicSetParentConnectedAP( ConnectedAP newParentConnectedAP, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentConnectedAP, SclPackage.PHYS_CONN__PARENT_CONNECTED_AP,
+                msgs );
         return msgs;
     }
 
@@ -187,20 +190,24 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
      * @generated
      */
     @Override
-    public void setParentConnectedAP(ConnectedAP newParentConnectedAP) {
-        if (newParentConnectedAP != eInternalContainer() || (eContainerFeatureID() != SclPackage.PHYS_CONN__PARENT_CONNECTED_AP && newParentConnectedAP != null)) {
-            if (EcoreUtil.isAncestor(this, newParentConnectedAP))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentConnectedAP( ConnectedAP newParentConnectedAP ) {
+        if( newParentConnectedAP != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.PHYS_CONN__PARENT_CONNECTED_AP
+                        && newParentConnectedAP != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentConnectedAP ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentConnectedAP != null)
-                msgs = ((InternalEObject)newParentConnectedAP).eInverseAdd(this, SclPackage.CONNECTED_AP__PHYS_CONN, ConnectedAP.class, msgs);
-            msgs = basicSetParentConnectedAP(newParentConnectedAP, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentConnectedAP != null )
+                msgs = ( ( InternalEObject ) newParentConnectedAP ).eInverseAdd( this,
+                        SclPackage.CONNECTED_AP__PHYS_CONN, ConnectedAP.class, msgs );
+            msgs = basicSetParentConnectedAP( newParentConnectedAP, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PHYS_CONN__PARENT_CONNECTED_AP, newParentConnectedAP, newParentConnectedAP));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PHYS_CONN__PARENT_CONNECTED_AP,
+                    newParentConnectedAP, newParentConnectedAP ) );
     }
 
     /**
@@ -209,9 +216,10 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
      * @generated
      */
     @Override
-    public EList<P_PhysConn> getP() {
-        if (p == null) {
-            p = new EObjectContainmentWithInverseEList.Unsettable<P_PhysConn>(P_PhysConn.class, this, SclPackage.PHYS_CONN__P, SclPackage.PPHYS_CONN__PARENT_PHYS_CONN);
+    public EList< P_PhysConn > getP() {
+        if( p == null ) {
+            p = new EObjectContainmentWithInverseEList.Unsettable< P_PhysConn >( P_PhysConn.class, this,
+                    SclPackage.PHYS_CONN__P, SclPackage.PPHYS_CONN__PARENT_PHYS_CONN );
         }
         return p;
     }
@@ -223,7 +231,7 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
      */
     @Override
     public void unsetP() {
-        if (p != null) ((InternalEList.Unsettable<?>)p).unset();
+        if( p != null ) ( ( InternalEList.Unsettable< ? > ) p ).unset();
     }
 
     /**
@@ -233,7 +241,7 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
      */
     @Override
     public boolean isSetP() {
-        return p != null && ((InternalEList.Unsettable<?>)p).isSet();
+        return p != null && ( ( InternalEList.Unsettable< ? > ) p ).isSet();
     }
 
     /**
@@ -244,15 +252,15 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.PHYS_CONN__PARENT_CONNECTED_AP:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentConnectedAP((ConnectedAP)otherEnd, msgs);
-            case SclPackage.PHYS_CONN__P:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getP()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.PHYS_CONN__PARENT_CONNECTED_AP:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentConnectedAP( ( ConnectedAP ) otherEnd, msgs );
+        case SclPackage.PHYS_CONN__P:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getP() ).basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -262,13 +270,13 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.PHYS_CONN__PARENT_CONNECTED_AP:
-                return basicSetParentConnectedAP(null, msgs);
-            case SclPackage.PHYS_CONN__P:
-                return ((InternalEList<?>)getP()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.PHYS_CONN__PARENT_CONNECTED_AP:
+            return basicSetParentConnectedAP( null, msgs );
+        case SclPackage.PHYS_CONN__P:
+            return ( ( InternalEList< ? > ) getP() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -278,11 +286,12 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.PHYS_CONN__PARENT_CONNECTED_AP:
-                return eInternalContainer().eInverseRemove(this, SclPackage.CONNECTED_AP__PHYS_CONN, ConnectedAP.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.PHYS_CONN__PARENT_CONNECTED_AP:
+            return eInternalContainer().eInverseRemove( this, SclPackage.CONNECTED_AP__PHYS_CONN, ConnectedAP.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -292,15 +301,15 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.PHYS_CONN__TYPE:
-                return getType();
-            case SclPackage.PHYS_CONN__PARENT_CONNECTED_AP:
-                return getParentConnectedAP();
-            case SclPackage.PHYS_CONN__P:
-                return getP();
+        switch( featureID ) {
+        case SclPackage.PHYS_CONN__TYPE:
+            return getType();
+        case SclPackage.PHYS_CONN__PARENT_CONNECTED_AP:
+            return getParentConnectedAP();
+        case SclPackage.PHYS_CONN__P:
+            return getP();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -311,19 +320,19 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.PHYS_CONN__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.PHYS_CONN__PARENT_CONNECTED_AP:
-                setParentConnectedAP((ConnectedAP)newValue);
-                return;
-            case SclPackage.PHYS_CONN__P:
-                getP().clear();
-                getP().addAll((Collection<? extends P_PhysConn>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.PHYS_CONN__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.PHYS_CONN__PARENT_CONNECTED_AP:
+            setParentConnectedAP( ( ConnectedAP ) newValue );
+            return;
+        case SclPackage.PHYS_CONN__P:
+            getP().clear();
+            getP().addAll( ( Collection< ? extends P_PhysConn > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -333,18 +342,18 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.PHYS_CONN__TYPE:
-                unsetType();
-                return;
-            case SclPackage.PHYS_CONN__PARENT_CONNECTED_AP:
-                setParentConnectedAP((ConnectedAP)null);
-                return;
-            case SclPackage.PHYS_CONN__P:
-                unsetP();
-                return;
+        switch( featureID ) {
+        case SclPackage.PHYS_CONN__TYPE:
+            unsetType();
+            return;
+        case SclPackage.PHYS_CONN__PARENT_CONNECTED_AP:
+            setParentConnectedAP( ( ConnectedAP ) null );
+            return;
+        case SclPackage.PHYS_CONN__P:
+            unsetP();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -354,15 +363,15 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.PHYS_CONN__TYPE:
-                return isSetType();
-            case SclPackage.PHYS_CONN__PARENT_CONNECTED_AP:
-                return getParentConnectedAP() != null;
-            case SclPackage.PHYS_CONN__P:
-                return isSetP();
+        switch( featureID ) {
+        case SclPackage.PHYS_CONN__TYPE:
+            return isSetType();
+        case SclPackage.PHYS_CONN__PARENT_CONNECTED_AP:
+            return getParentConnectedAP() != null;
+        case SclPackage.PHYS_CONN__P:
+            return isSetP();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -372,12 +381,15 @@ public class PhysConnImpl extends UnNamingImpl implements PhysConn {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PowerTransformerImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PowerTransformerImpl.java
index 3d7f7cc..4abed70 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PowerTransformerImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PowerTransformerImpl.java
@@ -93,7 +93,7 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      * @generated
      * @ordered
      */
-    protected EList<EqFunction> eqFunction;
+    protected EList< EqFunction > eqFunction;
 
     /**
      * The cached value of the '{@link #getSubEquipment() <em>Sub Equipment</em>}' containment reference list.
@@ -103,7 +103,7 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      * @generated
      * @ordered
      */
-    protected EList<SubEquipment> subEquipment;
+    protected EList< SubEquipment > subEquipment;
 
     /**
      * The cached value of the '{@link #getTransformerWinding() <em>Transformer Winding</em>}' containment reference list.
@@ -113,7 +113,7 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      * @generated
      * @ordered
      */
-    protected EList<TransformerWinding> transformerWinding;
+    protected EList< TransformerWinding > transformerWinding;
 
     /**
      * <!-- begin-user-doc -->
@@ -155,8 +155,9 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.POWER_TRANSFORMER__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.POWER_TRANSFORMER__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -170,8 +171,9 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.POWER_TRANSFORMER__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.POWER_TRANSFORMER__TYPE, oldType,
+                    TYPE_EDEFAULT, oldTypeESet ) );
     }
 
     /**
@@ -190,9 +192,10 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      * @generated
      */
     @Override
-    public EList<EqFunction> getEqFunction() {
-        if (eqFunction == null) {
-            eqFunction = new EObjectContainmentWithInverseEList.Unsettable<EqFunction>(EqFunction.class, this, SclPackage.POWER_TRANSFORMER__EQ_FUNCTION, SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER);
+    public EList< EqFunction > getEqFunction() {
+        if( eqFunction == null ) {
+            eqFunction = new EObjectContainmentWithInverseEList.Unsettable< EqFunction >( EqFunction.class, this,
+                    SclPackage.POWER_TRANSFORMER__EQ_FUNCTION, SclPackage.EQ_FUNCTION__PARENT_POWER_TRANSFORMER );
         }
         return eqFunction;
     }
@@ -204,7 +207,7 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      */
     @Override
     public void unsetEqFunction() {
-        if (eqFunction != null) ((InternalEList.Unsettable<?>)eqFunction).unset();
+        if( eqFunction != null ) ( ( InternalEList.Unsettable< ? > ) eqFunction ).unset();
     }
 
     /**
@@ -214,7 +217,7 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      */
     @Override
     public boolean isSetEqFunction() {
-        return eqFunction != null && ((InternalEList.Unsettable<?>)eqFunction).isSet();
+        return eqFunction != null && ( ( InternalEList.Unsettable< ? > ) eqFunction ).isSet();
     }
 
     /**
@@ -224,8 +227,8 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      */
     @Override
     public EquipmentContainer getParentEquipmentContainer() {
-        if (eContainerFeatureID() != SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER) return null;
-        return (EquipmentContainer)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER ) return null;
+        return ( EquipmentContainer ) eInternalContainer();
     }
 
     /**
@@ -233,8 +236,10 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentEquipmentContainer(EquipmentContainer newParentEquipmentContainer, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentEquipmentContainer, SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER, msgs);
+    public NotificationChain basicSetParentEquipmentContainer( EquipmentContainer newParentEquipmentContainer,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentEquipmentContainer,
+                SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER, msgs );
         return msgs;
     }
 
@@ -244,20 +249,25 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      * @generated
      */
     @Override
-    public void setParentEquipmentContainer(EquipmentContainer newParentEquipmentContainer) {
-        if (newParentEquipmentContainer != eInternalContainer() || (eContainerFeatureID() != SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER && newParentEquipmentContainer != null)) {
-            if (EcoreUtil.isAncestor(this, newParentEquipmentContainer))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentEquipmentContainer( EquipmentContainer newParentEquipmentContainer ) {
+        if( newParentEquipmentContainer != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER
+                        && newParentEquipmentContainer != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentEquipmentContainer ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentEquipmentContainer != null)
-                msgs = ((InternalEObject)newParentEquipmentContainer).eInverseAdd(this, SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER, EquipmentContainer.class, msgs);
-            msgs = basicSetParentEquipmentContainer(newParentEquipmentContainer, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentEquipmentContainer != null )
+                msgs = ( ( InternalEObject ) newParentEquipmentContainer ).eInverseAdd( this,
+                        SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER, EquipmentContainer.class, msgs );
+            msgs = basicSetParentEquipmentContainer( newParentEquipmentContainer, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER, newParentEquipmentContainer, newParentEquipmentContainer));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET,
+                    SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER, newParentEquipmentContainer,
+                    newParentEquipmentContainer ) );
     }
 
     /**
@@ -266,9 +276,10 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      * @generated
      */
     @Override
-    public EList<SubEquipment> getSubEquipment() {
-        if (subEquipment == null) {
-            subEquipment = new EObjectContainmentWithInverseEList.Unsettable<SubEquipment>(SubEquipment.class, this, SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT, SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER);
+    public EList< SubEquipment > getSubEquipment() {
+        if( subEquipment == null ) {
+            subEquipment = new EObjectContainmentWithInverseEList.Unsettable< SubEquipment >( SubEquipment.class, this,
+                    SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT, SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER );
         }
         return subEquipment;
     }
@@ -280,7 +291,7 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      */
     @Override
     public void unsetSubEquipment() {
-        if (subEquipment != null) ((InternalEList.Unsettable<?>)subEquipment).unset();
+        if( subEquipment != null ) ( ( InternalEList.Unsettable< ? > ) subEquipment ).unset();
     }
 
     /**
@@ -290,7 +301,7 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      */
     @Override
     public boolean isSetSubEquipment() {
-        return subEquipment != null && ((InternalEList.Unsettable<?>)subEquipment).isSet();
+        return subEquipment != null && ( ( InternalEList.Unsettable< ? > ) subEquipment ).isSet();
     }
 
     /**
@@ -299,9 +310,11 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      * @generated
      */
     @Override
-    public EList<TransformerWinding> getTransformerWinding() {
-        if (transformerWinding == null) {
-            transformerWinding = new EObjectContainmentWithInverseEList.Unsettable<TransformerWinding>(TransformerWinding.class, this, SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING, SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER);
+    public EList< TransformerWinding > getTransformerWinding() {
+        if( transformerWinding == null ) {
+            transformerWinding = new EObjectContainmentWithInverseEList.Unsettable< TransformerWinding >(
+                    TransformerWinding.class, this, SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING,
+                    SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER );
         }
         return transformerWinding;
     }
@@ -313,7 +326,7 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      */
     @Override
     public void unsetTransformerWinding() {
-        if (transformerWinding != null) ((InternalEList.Unsettable<?>)transformerWinding).unset();
+        if( transformerWinding != null ) ( ( InternalEList.Unsettable< ? > ) transformerWinding ).unset();
     }
 
     /**
@@ -323,7 +336,7 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      */
     @Override
     public boolean isSetTransformerWinding() {
-        return transformerWinding != null && ((InternalEList.Unsettable<?>)transformerWinding).isSet();
+        return transformerWinding != null && ( ( InternalEList.Unsettable< ? > ) transformerWinding ).isSet();
     }
 
     /**
@@ -334,19 +347,22 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.POWER_TRANSFORMER__EQ_FUNCTION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getEqFunction()).basicAdd(otherEnd, msgs);
-            case SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentEquipmentContainer((EquipmentContainer)otherEnd, msgs);
-            case SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSubEquipment()).basicAdd(otherEnd, msgs);
-            case SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getTransformerWinding()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.POWER_TRANSFORMER__EQ_FUNCTION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getEqFunction() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentEquipmentContainer( ( EquipmentContainer ) otherEnd, msgs );
+        case SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSubEquipment() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getTransformerWinding() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -356,17 +372,17 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.POWER_TRANSFORMER__EQ_FUNCTION:
-                return ((InternalEList<?>)getEqFunction()).basicRemove(otherEnd, msgs);
-            case SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER:
-                return basicSetParentEquipmentContainer(null, msgs);
-            case SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT:
-                return ((InternalEList<?>)getSubEquipment()).basicRemove(otherEnd, msgs);
-            case SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING:
-                return ((InternalEList<?>)getTransformerWinding()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.POWER_TRANSFORMER__EQ_FUNCTION:
+            return ( ( InternalEList< ? > ) getEqFunction() ).basicRemove( otherEnd, msgs );
+        case SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER:
+            return basicSetParentEquipmentContainer( null, msgs );
+        case SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT:
+            return ( ( InternalEList< ? > ) getSubEquipment() ).basicRemove( otherEnd, msgs );
+        case SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING:
+            return ( ( InternalEList< ? > ) getTransformerWinding() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -376,11 +392,12 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER, EquipmentContainer.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.EQUIPMENT_CONTAINER__POWER_TRANSFORMER,
+                    EquipmentContainer.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -390,19 +407,19 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.POWER_TRANSFORMER__TYPE:
-                return getType();
-            case SclPackage.POWER_TRANSFORMER__EQ_FUNCTION:
-                return getEqFunction();
-            case SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER:
-                return getParentEquipmentContainer();
-            case SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT:
-                return getSubEquipment();
-            case SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING:
-                return getTransformerWinding();
+        switch( featureID ) {
+        case SclPackage.POWER_TRANSFORMER__TYPE:
+            return getType();
+        case SclPackage.POWER_TRANSFORMER__EQ_FUNCTION:
+            return getEqFunction();
+        case SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER:
+            return getParentEquipmentContainer();
+        case SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT:
+            return getSubEquipment();
+        case SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING:
+            return getTransformerWinding();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -413,27 +430,27 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.POWER_TRANSFORMER__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.POWER_TRANSFORMER__EQ_FUNCTION:
-                getEqFunction().clear();
-                getEqFunction().addAll((Collection<? extends EqFunction>)newValue);
-                return;
-            case SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER:
-                setParentEquipmentContainer((EquipmentContainer)newValue);
-                return;
-            case SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT:
-                getSubEquipment().clear();
-                getSubEquipment().addAll((Collection<? extends SubEquipment>)newValue);
-                return;
-            case SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING:
-                getTransformerWinding().clear();
-                getTransformerWinding().addAll((Collection<? extends TransformerWinding>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.POWER_TRANSFORMER__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.POWER_TRANSFORMER__EQ_FUNCTION:
+            getEqFunction().clear();
+            getEqFunction().addAll( ( Collection< ? extends EqFunction > ) newValue );
+            return;
+        case SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER:
+            setParentEquipmentContainer( ( EquipmentContainer ) newValue );
+            return;
+        case SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT:
+            getSubEquipment().clear();
+            getSubEquipment().addAll( ( Collection< ? extends SubEquipment > ) newValue );
+            return;
+        case SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING:
+            getTransformerWinding().clear();
+            getTransformerWinding().addAll( ( Collection< ? extends TransformerWinding > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -443,24 +460,24 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.POWER_TRANSFORMER__TYPE:
-                unsetType();
-                return;
-            case SclPackage.POWER_TRANSFORMER__EQ_FUNCTION:
-                unsetEqFunction();
-                return;
-            case SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER:
-                setParentEquipmentContainer((EquipmentContainer)null);
-                return;
-            case SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT:
-                unsetSubEquipment();
-                return;
-            case SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING:
-                unsetTransformerWinding();
-                return;
+        switch( featureID ) {
+        case SclPackage.POWER_TRANSFORMER__TYPE:
+            unsetType();
+            return;
+        case SclPackage.POWER_TRANSFORMER__EQ_FUNCTION:
+            unsetEqFunction();
+            return;
+        case SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER:
+            setParentEquipmentContainer( ( EquipmentContainer ) null );
+            return;
+        case SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT:
+            unsetSubEquipment();
+            return;
+        case SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING:
+            unsetTransformerWinding();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -470,19 +487,19 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.POWER_TRANSFORMER__TYPE:
-                return isSetType();
-            case SclPackage.POWER_TRANSFORMER__EQ_FUNCTION:
-                return isSetEqFunction();
-            case SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER:
-                return getParentEquipmentContainer() != null;
-            case SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT:
-                return isSetSubEquipment();
-            case SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING:
-                return isSetTransformerWinding();
+        switch( featureID ) {
+        case SclPackage.POWER_TRANSFORMER__TYPE:
+            return isSetType();
+        case SclPackage.POWER_TRANSFORMER__EQ_FUNCTION:
+            return isSetEqFunction();
+        case SclPackage.POWER_TRANSFORMER__PARENT_EQUIPMENT_CONTAINER:
+            return getParentEquipmentContainer() != null;
+        case SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT:
+            return isSetSubEquipment();
+        case SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING:
+            return isSetTransformerWinding();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -492,12 +509,15 @@ public class PowerTransformerImpl extends EquipmentImpl implements PowerTransfor
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PrivateImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PrivateImpl.java
index 3c4603e..3963e7f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PrivateImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/PrivateImpl.java
@@ -145,8 +145,9 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
         source = newSource;
         boolean oldSourceESet = sourceESet;
         sourceESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PRIVATE__SOURCE, oldSource, source, !oldSourceESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PRIVATE__SOURCE, oldSource, source,
+                    !oldSourceESet ) );
     }
 
     /**
@@ -160,8 +161,9 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
         boolean oldSourceESet = sourceESet;
         source = SOURCE_EDEFAULT;
         sourceESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.PRIVATE__SOURCE, oldSource, SOURCE_EDEFAULT, oldSourceESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.PRIVATE__SOURCE, oldSource,
+                    SOURCE_EDEFAULT, oldSourceESet ) );
     }
 
     /**
@@ -195,8 +197,9 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PRIVATE__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PRIVATE__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -210,8 +213,9 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.PRIVATE__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.PRIVATE__TYPE, oldType, TYPE_EDEFAULT,
+                    oldTypeESet ) );
     }
 
     /**
@@ -231,8 +235,8 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
      */
     @Override
     public BaseElement getParentBaseElement() {
-        if (eContainerFeatureID() != SclPackage.PRIVATE__PARENT_BASE_ELEMENT) return null;
-        return (BaseElement)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.PRIVATE__PARENT_BASE_ELEMENT ) return null;
+        return ( BaseElement ) eInternalContainer();
     }
 
     /**
@@ -240,8 +244,9 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentBaseElement(BaseElement newParentBaseElement, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentBaseElement, SclPackage.PRIVATE__PARENT_BASE_ELEMENT, msgs);
+    public NotificationChain basicSetParentBaseElement( BaseElement newParentBaseElement, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentBaseElement, SclPackage.PRIVATE__PARENT_BASE_ELEMENT,
+                msgs );
         return msgs;
     }
 
@@ -251,20 +256,24 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
      * @generated
      */
     @Override
-    public void setParentBaseElement(BaseElement newParentBaseElement) {
-        if (newParentBaseElement != eInternalContainer() || (eContainerFeatureID() != SclPackage.PRIVATE__PARENT_BASE_ELEMENT && newParentBaseElement != null)) {
-            if (EcoreUtil.isAncestor(this, newParentBaseElement))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentBaseElement( BaseElement newParentBaseElement ) {
+        if( newParentBaseElement != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.PRIVATE__PARENT_BASE_ELEMENT
+                        && newParentBaseElement != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentBaseElement ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentBaseElement != null)
-                msgs = ((InternalEObject)newParentBaseElement).eInverseAdd(this, SclPackage.BASE_ELEMENT__PRIVATE, BaseElement.class, msgs);
-            msgs = basicSetParentBaseElement(newParentBaseElement, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentBaseElement != null )
+                msgs = ( ( InternalEObject ) newParentBaseElement ).eInverseAdd( this, SclPackage.BASE_ELEMENT__PRIVATE,
+                        BaseElement.class, msgs );
+            msgs = basicSetParentBaseElement( newParentBaseElement, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PRIVATE__PARENT_BASE_ELEMENT, newParentBaseElement, newParentBaseElement));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PRIVATE__PARENT_BASE_ELEMENT,
+                    newParentBaseElement, newParentBaseElement ) );
     }
 
     /**
@@ -274,13 +283,13 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.PRIVATE__PARENT_BASE_ELEMENT:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentBaseElement((BaseElement)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.PRIVATE__PARENT_BASE_ELEMENT:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentBaseElement( ( BaseElement ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -290,11 +299,11 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.PRIVATE__PARENT_BASE_ELEMENT:
-                return basicSetParentBaseElement(null, msgs);
+        switch( featureID ) {
+        case SclPackage.PRIVATE__PARENT_BASE_ELEMENT:
+            return basicSetParentBaseElement( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -304,11 +313,12 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.PRIVATE__PARENT_BASE_ELEMENT:
-                return eInternalContainer().eInverseRemove(this, SclPackage.BASE_ELEMENT__PRIVATE, BaseElement.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.PRIVATE__PARENT_BASE_ELEMENT:
+            return eInternalContainer().eInverseRemove( this, SclPackage.BASE_ELEMENT__PRIVATE, BaseElement.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -318,15 +328,15 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.PRIVATE__SOURCE:
-                return getSource();
-            case SclPackage.PRIVATE__TYPE:
-                return getType();
-            case SclPackage.PRIVATE__PARENT_BASE_ELEMENT:
-                return getParentBaseElement();
+        switch( featureID ) {
+        case SclPackage.PRIVATE__SOURCE:
+            return getSource();
+        case SclPackage.PRIVATE__TYPE:
+            return getType();
+        case SclPackage.PRIVATE__PARENT_BASE_ELEMENT:
+            return getParentBaseElement();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -336,18 +346,18 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.PRIVATE__SOURCE:
-                setSource((String)newValue);
-                return;
-            case SclPackage.PRIVATE__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.PRIVATE__PARENT_BASE_ELEMENT:
-                setParentBaseElement((BaseElement)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.PRIVATE__SOURCE:
+            setSource( ( String ) newValue );
+            return;
+        case SclPackage.PRIVATE__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.PRIVATE__PARENT_BASE_ELEMENT:
+            setParentBaseElement( ( BaseElement ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -357,18 +367,18 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.PRIVATE__SOURCE:
-                unsetSource();
-                return;
-            case SclPackage.PRIVATE__TYPE:
-                unsetType();
-                return;
-            case SclPackage.PRIVATE__PARENT_BASE_ELEMENT:
-                setParentBaseElement((BaseElement)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.PRIVATE__SOURCE:
+            unsetSource();
+            return;
+        case SclPackage.PRIVATE__TYPE:
+            unsetType();
+            return;
+        case SclPackage.PRIVATE__PARENT_BASE_ELEMENT:
+            setParentBaseElement( ( BaseElement ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -378,15 +388,15 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.PRIVATE__SOURCE:
-                return isSetSource();
-            case SclPackage.PRIVATE__TYPE:
-                return isSetType();
-            case SclPackage.PRIVATE__PARENT_BASE_ELEMENT:
-                return getParentBaseElement() != null;
+        switch( featureID ) {
+        case SclPackage.PRIVATE__SOURCE:
+            return isSetSource();
+        case SclPackage.PRIVATE__TYPE:
+            return isSetType();
+        case SclPackage.PRIVATE__PARENT_BASE_ELEMENT:
+            return getParentBaseElement() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -396,14 +406,20 @@ public class PrivateImpl extends AnyContentFromOtherNamespaceImpl implements Pri
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (source: ");
-        if (sourceESet) result.append(source); else result.append("<unset>");
-        result.append(", type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (source: " );
+        if( sourceESet )
+            result.append( source );
+        else
+            result.append( "<unset>" );
+        result.append( ", type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ProcessImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ProcessImpl.java
index 7fec1a0..8fe53dc 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ProcessImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ProcessImpl.java
@@ -95,7 +95,7 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      * @generated
      * @ordered
      */
-    protected EList<Line> line;
+    protected EList< Line > line;
 
     /**
      * The cached value of the '{@link #getConductingEquipment() <em>Conducting Equipment</em>}' containment reference list.
@@ -105,7 +105,7 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      * @generated
      * @ordered
      */
-    protected EList<ConductingEquipment> conductingEquipment;
+    protected EList< ConductingEquipment > conductingEquipment;
 
     /**
      * The cached value of the '{@link #getSubstation() <em>Substation</em>}' containment reference list.
@@ -115,7 +115,7 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      * @generated
      * @ordered
      */
-    protected EList<Substation> substation;
+    protected EList< Substation > substation;
 
     /**
      * The cached value of the '{@link #getSubProcesses() <em>Sub Processes</em>}' containment reference list.
@@ -125,7 +125,7 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      * @generated
      * @ordered
      */
-    protected EList<fr.centralesupelec.edf.riseclipse.iec61850.scl.Process> subProcesses;
+    protected EList< fr.centralesupelec.edf.riseclipse.iec61850.scl.Process > subProcesses;
 
     /**
      * <!-- begin-user-doc -->
@@ -167,8 +167,9 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PROCESS__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PROCESS__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -182,8 +183,9 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.PROCESS__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.PROCESS__TYPE, oldType, TYPE_EDEFAULT,
+                    oldTypeESet ) );
     }
 
     /**
@@ -202,9 +204,10 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      * @generated
      */
     @Override
-    public EList<Line> getLine() {
-        if (line == null) {
-            line = new EObjectContainmentWithInverseEList.Unsettable<Line>(Line.class, this, SclPackage.PROCESS__LINE, SclPackage.LINE__PARENT_PROCESS);
+    public EList< Line > getLine() {
+        if( line == null ) {
+            line = new EObjectContainmentWithInverseEList.Unsettable< Line >( Line.class, this,
+                    SclPackage.PROCESS__LINE, SclPackage.LINE__PARENT_PROCESS );
         }
         return line;
     }
@@ -216,7 +219,7 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public void unsetLine() {
-        if (line != null) ((InternalEList.Unsettable<?>)line).unset();
+        if( line != null ) ( ( InternalEList.Unsettable< ? > ) line ).unset();
     }
 
     /**
@@ -226,7 +229,7 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public boolean isSetLine() {
-        return line != null && ((InternalEList.Unsettable<?>)line).isSet();
+        return line != null && ( ( InternalEList.Unsettable< ? > ) line ).isSet();
     }
 
     /**
@@ -236,8 +239,8 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public SCL getParentSCL() {
-        if (eContainerFeatureID() != SclPackage.PROCESS__PARENT_SCL) return null;
-        return (SCL)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.PROCESS__PARENT_SCL ) return null;
+        return ( SCL ) eInternalContainer();
     }
 
     /**
@@ -245,8 +248,8 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSCL(SCL newParentSCL, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSCL, SclPackage.PROCESS__PARENT_SCL, msgs);
+    public NotificationChain basicSetParentSCL( SCL newParentSCL, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSCL, SclPackage.PROCESS__PARENT_SCL, msgs );
         return msgs;
     }
 
@@ -256,20 +259,23 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      * @generated
      */
     @Override
-    public void setParentSCL(SCL newParentSCL) {
-        if (newParentSCL != eInternalContainer() || (eContainerFeatureID() != SclPackage.PROCESS__PARENT_SCL && newParentSCL != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSCL))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSCL( SCL newParentSCL ) {
+        if( newParentSCL != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.PROCESS__PARENT_SCL && newParentSCL != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSCL ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSCL != null)
-                msgs = ((InternalEObject)newParentSCL).eInverseAdd(this, SclPackage.SCL__PROCESS, SCL.class, msgs);
-            msgs = basicSetParentSCL(newParentSCL, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSCL != null )
+                msgs = ( ( InternalEObject ) newParentSCL ).eInverseAdd( this, SclPackage.SCL__PROCESS, SCL.class,
+                        msgs );
+            msgs = basicSetParentSCL( newParentSCL, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PROCESS__PARENT_SCL, newParentSCL, newParentSCL));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PROCESS__PARENT_SCL, newParentSCL,
+                    newParentSCL ) );
     }
 
     /**
@@ -278,9 +284,11 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      * @generated
      */
     @Override
-    public EList<ConductingEquipment> getConductingEquipment() {
-        if (conductingEquipment == null) {
-            conductingEquipment = new EObjectContainmentWithInverseEList.Unsettable<ConductingEquipment>(ConductingEquipment.class, this, SclPackage.PROCESS__CONDUCTING_EQUIPMENT, SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS);
+    public EList< ConductingEquipment > getConductingEquipment() {
+        if( conductingEquipment == null ) {
+            conductingEquipment = new EObjectContainmentWithInverseEList.Unsettable< ConductingEquipment >(
+                    ConductingEquipment.class, this, SclPackage.PROCESS__CONDUCTING_EQUIPMENT,
+                    SclPackage.CONDUCTING_EQUIPMENT__PARENT_PROCESS );
         }
         return conductingEquipment;
     }
@@ -292,7 +300,7 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public void unsetConductingEquipment() {
-        if (conductingEquipment != null) ((InternalEList.Unsettable<?>)conductingEquipment).unset();
+        if( conductingEquipment != null ) ( ( InternalEList.Unsettable< ? > ) conductingEquipment ).unset();
     }
 
     /**
@@ -302,7 +310,7 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public boolean isSetConductingEquipment() {
-        return conductingEquipment != null && ((InternalEList.Unsettable<?>)conductingEquipment).isSet();
+        return conductingEquipment != null && ( ( InternalEList.Unsettable< ? > ) conductingEquipment ).isSet();
     }
 
     /**
@@ -311,9 +319,10 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      * @generated
      */
     @Override
-    public EList<Substation> getSubstation() {
-        if (substation == null) {
-            substation = new EObjectContainmentWithInverseEList.Unsettable<Substation>(Substation.class, this, SclPackage.PROCESS__SUBSTATION, SclPackage.SUBSTATION__PARENT_PROCESS);
+    public EList< Substation > getSubstation() {
+        if( substation == null ) {
+            substation = new EObjectContainmentWithInverseEList.Unsettable< Substation >( Substation.class, this,
+                    SclPackage.PROCESS__SUBSTATION, SclPackage.SUBSTATION__PARENT_PROCESS );
         }
         return substation;
     }
@@ -325,7 +334,7 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public void unsetSubstation() {
-        if (substation != null) ((InternalEList.Unsettable<?>)substation).unset();
+        if( substation != null ) ( ( InternalEList.Unsettable< ? > ) substation ).unset();
     }
 
     /**
@@ -335,7 +344,7 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public boolean isSetSubstation() {
-        return substation != null && ((InternalEList.Unsettable<?>)substation).isSet();
+        return substation != null && ( ( InternalEList.Unsettable< ? > ) substation ).isSet();
     }
 
     /**
@@ -344,9 +353,11 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      * @generated
      */
     @Override
-    public EList<fr.centralesupelec.edf.riseclipse.iec61850.scl.Process> getSubProcesses() {
-        if (subProcesses == null) {
-            subProcesses = new EObjectContainmentWithInverseEList.Unsettable<fr.centralesupelec.edf.riseclipse.iec61850.scl.Process>(fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, this, SclPackage.PROCESS__SUB_PROCESSES, SclPackage.PROCESS__PARENT_PROCESS);
+    public EList< fr.centralesupelec.edf.riseclipse.iec61850.scl.Process > getSubProcesses() {
+        if( subProcesses == null ) {
+            subProcesses = new EObjectContainmentWithInverseEList.Unsettable< fr.centralesupelec.edf.riseclipse.iec61850.scl.Process >(
+                    fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, this,
+                    SclPackage.PROCESS__SUB_PROCESSES, SclPackage.PROCESS__PARENT_PROCESS );
         }
         return subProcesses;
     }
@@ -358,7 +369,7 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public void unsetSubProcesses() {
-        if (subProcesses != null) ((InternalEList.Unsettable<?>)subProcesses).unset();
+        if( subProcesses != null ) ( ( InternalEList.Unsettable< ? > ) subProcesses ).unset();
     }
 
     /**
@@ -368,7 +379,7 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public boolean isSetSubProcesses() {
-        return subProcesses != null && ((InternalEList.Unsettable<?>)subProcesses).isSet();
+        return subProcesses != null && ( ( InternalEList.Unsettable< ? > ) subProcesses ).isSet();
     }
 
     /**
@@ -378,8 +389,8 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public fr.centralesupelec.edf.riseclipse.iec61850.scl.Process getParentProcess() {
-        if (eContainerFeatureID() != SclPackage.PROCESS__PARENT_PROCESS) return null;
-        return (fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.PROCESS__PARENT_PROCESS ) return null;
+        return ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) eInternalContainer();
     }
 
     /**
@@ -389,7 +400,7 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     public NotificationChain basicSetParentProcess(
             fr.centralesupelec.edf.riseclipse.iec61850.scl.Process newParentProcess, NotificationChain msgs ) {
-        msgs = eBasicSetContainer((InternalEObject)newParentProcess, SclPackage.PROCESS__PARENT_PROCESS, msgs);
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentProcess, SclPackage.PROCESS__PARENT_PROCESS, msgs );
         return msgs;
     }
 
@@ -400,19 +411,22 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public void setParentProcess( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process newParentProcess ) {
-        if (newParentProcess != eInternalContainer() || (eContainerFeatureID() != SclPackage.PROCESS__PARENT_PROCESS && newParentProcess != null)) {
-            if (EcoreUtil.isAncestor(this, newParentProcess))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+        if( newParentProcess != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.PROCESS__PARENT_PROCESS && newParentProcess != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentProcess ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentProcess != null)
-                msgs = ((InternalEObject)newParentProcess).eInverseAdd(this, SclPackage.PROCESS__SUB_PROCESSES, fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs);
-            msgs = basicSetParentProcess(newParentProcess, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentProcess != null )
+                msgs = ( ( InternalEObject ) newParentProcess ).eInverseAdd( this, SclPackage.PROCESS__SUB_PROCESSES,
+                        fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs );
+            msgs = basicSetParentProcess( newParentProcess, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PROCESS__PARENT_PROCESS, newParentProcess, newParentProcess));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PROCESS__PARENT_PROCESS,
+                    newParentProcess, newParentProcess ) );
     }
 
     /**
@@ -423,25 +437,28 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.PROCESS__LINE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getLine()).basicAdd(otherEnd, msgs);
-            case SclPackage.PROCESS__PARENT_SCL:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSCL((SCL)otherEnd, msgs);
-            case SclPackage.PROCESS__CONDUCTING_EQUIPMENT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getConductingEquipment()).basicAdd(otherEnd, msgs);
-            case SclPackage.PROCESS__SUBSTATION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSubstation()).basicAdd(otherEnd, msgs);
-            case SclPackage.PROCESS__SUB_PROCESSES:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSubProcesses()).basicAdd(otherEnd, msgs);
-            case SclPackage.PROCESS__PARENT_PROCESS:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentProcess((fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.PROCESS__LINE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getLine() ).basicAdd( otherEnd, msgs );
+        case SclPackage.PROCESS__PARENT_SCL:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSCL( ( SCL ) otherEnd, msgs );
+        case SclPackage.PROCESS__CONDUCTING_EQUIPMENT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getConductingEquipment() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.PROCESS__SUBSTATION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSubstation() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.PROCESS__SUB_PROCESSES:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSubProcesses() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.PROCESS__PARENT_PROCESS:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentProcess( ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -451,21 +468,21 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.PROCESS__LINE:
-                return ((InternalEList<?>)getLine()).basicRemove(otherEnd, msgs);
-            case SclPackage.PROCESS__PARENT_SCL:
-                return basicSetParentSCL(null, msgs);
-            case SclPackage.PROCESS__CONDUCTING_EQUIPMENT:
-                return ((InternalEList<?>)getConductingEquipment()).basicRemove(otherEnd, msgs);
-            case SclPackage.PROCESS__SUBSTATION:
-                return ((InternalEList<?>)getSubstation()).basicRemove(otherEnd, msgs);
-            case SclPackage.PROCESS__SUB_PROCESSES:
-                return ((InternalEList<?>)getSubProcesses()).basicRemove(otherEnd, msgs);
-            case SclPackage.PROCESS__PARENT_PROCESS:
-                return basicSetParentProcess(null, msgs);
+        switch( featureID ) {
+        case SclPackage.PROCESS__LINE:
+            return ( ( InternalEList< ? > ) getLine() ).basicRemove( otherEnd, msgs );
+        case SclPackage.PROCESS__PARENT_SCL:
+            return basicSetParentSCL( null, msgs );
+        case SclPackage.PROCESS__CONDUCTING_EQUIPMENT:
+            return ( ( InternalEList< ? > ) getConductingEquipment() ).basicRemove( otherEnd, msgs );
+        case SclPackage.PROCESS__SUBSTATION:
+            return ( ( InternalEList< ? > ) getSubstation() ).basicRemove( otherEnd, msgs );
+        case SclPackage.PROCESS__SUB_PROCESSES:
+            return ( ( InternalEList< ? > ) getSubProcesses() ).basicRemove( otherEnd, msgs );
+        case SclPackage.PROCESS__PARENT_PROCESS:
+            return basicSetParentProcess( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -475,13 +492,14 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.PROCESS__PARENT_SCL:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SCL__PROCESS, SCL.class, msgs);
-            case SclPackage.PROCESS__PARENT_PROCESS:
-                return eInternalContainer().eInverseRemove(this, SclPackage.PROCESS__SUB_PROCESSES, fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.PROCESS__PARENT_SCL:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SCL__PROCESS, SCL.class, msgs );
+        case SclPackage.PROCESS__PARENT_PROCESS:
+            return eInternalContainer().eInverseRemove( this, SclPackage.PROCESS__SUB_PROCESSES,
+                    fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -491,23 +509,23 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.PROCESS__TYPE:
-                return getType();
-            case SclPackage.PROCESS__LINE:
-                return getLine();
-            case SclPackage.PROCESS__PARENT_SCL:
-                return getParentSCL();
-            case SclPackage.PROCESS__CONDUCTING_EQUIPMENT:
-                return getConductingEquipment();
-            case SclPackage.PROCESS__SUBSTATION:
-                return getSubstation();
-            case SclPackage.PROCESS__SUB_PROCESSES:
-                return getSubProcesses();
-            case SclPackage.PROCESS__PARENT_PROCESS:
-                return getParentProcess();
+        switch( featureID ) {
+        case SclPackage.PROCESS__TYPE:
+            return getType();
+        case SclPackage.PROCESS__LINE:
+            return getLine();
+        case SclPackage.PROCESS__PARENT_SCL:
+            return getParentSCL();
+        case SclPackage.PROCESS__CONDUCTING_EQUIPMENT:
+            return getConductingEquipment();
+        case SclPackage.PROCESS__SUBSTATION:
+            return getSubstation();
+        case SclPackage.PROCESS__SUB_PROCESSES:
+            return getSubProcesses();
+        case SclPackage.PROCESS__PARENT_PROCESS:
+            return getParentProcess();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -518,34 +536,35 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.PROCESS__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.PROCESS__LINE:
-                getLine().clear();
-                getLine().addAll((Collection<? extends Line>)newValue);
-                return;
-            case SclPackage.PROCESS__PARENT_SCL:
-                setParentSCL((SCL)newValue);
-                return;
-            case SclPackage.PROCESS__CONDUCTING_EQUIPMENT:
-                getConductingEquipment().clear();
-                getConductingEquipment().addAll((Collection<? extends ConductingEquipment>)newValue);
-                return;
-            case SclPackage.PROCESS__SUBSTATION:
-                getSubstation().clear();
-                getSubstation().addAll((Collection<? extends Substation>)newValue);
-                return;
-            case SclPackage.PROCESS__SUB_PROCESSES:
-                getSubProcesses().clear();
-                getSubProcesses().addAll((Collection<? extends fr.centralesupelec.edf.riseclipse.iec61850.scl.Process>)newValue);
-                return;
-            case SclPackage.PROCESS__PARENT_PROCESS:
-                setParentProcess((fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.PROCESS__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.PROCESS__LINE:
+            getLine().clear();
+            getLine().addAll( ( Collection< ? extends Line > ) newValue );
+            return;
+        case SclPackage.PROCESS__PARENT_SCL:
+            setParentSCL( ( SCL ) newValue );
+            return;
+        case SclPackage.PROCESS__CONDUCTING_EQUIPMENT:
+            getConductingEquipment().clear();
+            getConductingEquipment().addAll( ( Collection< ? extends ConductingEquipment > ) newValue );
+            return;
+        case SclPackage.PROCESS__SUBSTATION:
+            getSubstation().clear();
+            getSubstation().addAll( ( Collection< ? extends Substation > ) newValue );
+            return;
+        case SclPackage.PROCESS__SUB_PROCESSES:
+            getSubProcesses().clear();
+            getSubProcesses().addAll(
+                    ( Collection< ? extends fr.centralesupelec.edf.riseclipse.iec61850.scl.Process > ) newValue );
+            return;
+        case SclPackage.PROCESS__PARENT_PROCESS:
+            setParentProcess( ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -555,30 +574,30 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.PROCESS__TYPE:
-                unsetType();
-                return;
-            case SclPackage.PROCESS__LINE:
-                unsetLine();
-                return;
-            case SclPackage.PROCESS__PARENT_SCL:
-                setParentSCL((SCL)null);
-                return;
-            case SclPackage.PROCESS__CONDUCTING_EQUIPMENT:
-                unsetConductingEquipment();
-                return;
-            case SclPackage.PROCESS__SUBSTATION:
-                unsetSubstation();
-                return;
-            case SclPackage.PROCESS__SUB_PROCESSES:
-                unsetSubProcesses();
-                return;
-            case SclPackage.PROCESS__PARENT_PROCESS:
-                setParentProcess((fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.PROCESS__TYPE:
+            unsetType();
+            return;
+        case SclPackage.PROCESS__LINE:
+            unsetLine();
+            return;
+        case SclPackage.PROCESS__PARENT_SCL:
+            setParentSCL( ( SCL ) null );
+            return;
+        case SclPackage.PROCESS__CONDUCTING_EQUIPMENT:
+            unsetConductingEquipment();
+            return;
+        case SclPackage.PROCESS__SUBSTATION:
+            unsetSubstation();
+            return;
+        case SclPackage.PROCESS__SUB_PROCESSES:
+            unsetSubProcesses();
+            return;
+        case SclPackage.PROCESS__PARENT_PROCESS:
+            setParentProcess( ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -588,23 +607,23 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.PROCESS__TYPE:
-                return isSetType();
-            case SclPackage.PROCESS__LINE:
-                return isSetLine();
-            case SclPackage.PROCESS__PARENT_SCL:
-                return getParentSCL() != null;
-            case SclPackage.PROCESS__CONDUCTING_EQUIPMENT:
-                return isSetConductingEquipment();
-            case SclPackage.PROCESS__SUBSTATION:
-                return isSetSubstation();
-            case SclPackage.PROCESS__SUB_PROCESSES:
-                return isSetSubProcesses();
-            case SclPackage.PROCESS__PARENT_PROCESS:
-                return getParentProcess() != null;
+        switch( featureID ) {
+        case SclPackage.PROCESS__TYPE:
+            return isSetType();
+        case SclPackage.PROCESS__LINE:
+            return isSetLine();
+        case SclPackage.PROCESS__PARENT_SCL:
+            return getParentSCL() != null;
+        case SclPackage.PROCESS__CONDUCTING_EQUIPMENT:
+            return isSetConductingEquipment();
+        case SclPackage.PROCESS__SUBSTATION:
+            return isSetSubstation();
+        case SclPackage.PROCESS__SUB_PROCESSES:
+            return isSetSubProcesses();
+        case SclPackage.PROCESS__PARENT_PROCESS:
+            return getParentProcess() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -614,12 +633,15 @@ public class ProcessImpl extends GeneralEquipmentContainerImpl implements
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ProtNsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ProtNsImpl.java
index 940b743..44a5061 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ProtNsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ProtNsImpl.java
@@ -138,8 +138,9 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PROT_NS__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PROT_NS__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -153,8 +154,9 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.PROT_NS__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.PROT_NS__TYPE, oldType, TYPE_EDEFAULT,
+                    oldTypeESet ) );
     }
 
     /**
@@ -174,8 +176,8 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      */
     @Override
     public DA getParentDA() {
-        if (eContainerFeatureID() != SclPackage.PROT_NS__PARENT_DA) return null;
-        return (DA)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.PROT_NS__PARENT_DA ) return null;
+        return ( DA ) eInternalContainer();
     }
 
     /**
@@ -183,8 +185,8 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentDA(DA newParentDA, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentDA, SclPackage.PROT_NS__PARENT_DA, msgs);
+    public NotificationChain basicSetParentDA( DA newParentDA, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentDA, SclPackage.PROT_NS__PARENT_DA, msgs );
         return msgs;
     }
 
@@ -194,20 +196,22 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      * @generated
      */
     @Override
-    public void setParentDA(DA newParentDA) {
-        if (newParentDA != eInternalContainer() || (eContainerFeatureID() != SclPackage.PROT_NS__PARENT_DA && newParentDA != null)) {
-            if (EcoreUtil.isAncestor(this, newParentDA))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentDA( DA newParentDA ) {
+        if( newParentDA != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.PROT_NS__PARENT_DA && newParentDA != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentDA ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentDA != null)
-                msgs = ((InternalEObject)newParentDA).eInverseAdd(this, SclPackage.DA__PROT_NS, DA.class, msgs);
-            msgs = basicSetParentDA(newParentDA, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentDA != null )
+                msgs = ( ( InternalEObject ) newParentDA ).eInverseAdd( this, SclPackage.DA__PROT_NS, DA.class, msgs );
+            msgs = basicSetParentDA( newParentDA, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PROT_NS__PARENT_DA, newParentDA, newParentDA));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PROT_NS__PARENT_DA, newParentDA,
+                    newParentDA ) );
     }
 
     /**
@@ -217,8 +221,8 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      */
     @Override
     public DAType getParentDAType() {
-        if (eContainerFeatureID() != SclPackage.PROT_NS__PARENT_DA_TYPE) return null;
-        return (DAType)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.PROT_NS__PARENT_DA_TYPE ) return null;
+        return ( DAType ) eInternalContainer();
     }
 
     /**
@@ -226,8 +230,8 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentDAType(DAType newParentDAType, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentDAType, SclPackage.PROT_NS__PARENT_DA_TYPE, msgs);
+    public NotificationChain basicSetParentDAType( DAType newParentDAType, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentDAType, SclPackage.PROT_NS__PARENT_DA_TYPE, msgs );
         return msgs;
     }
 
@@ -237,20 +241,23 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      * @generated
      */
     @Override
-    public void setParentDAType(DAType newParentDAType) {
-        if (newParentDAType != eInternalContainer() || (eContainerFeatureID() != SclPackage.PROT_NS__PARENT_DA_TYPE && newParentDAType != null)) {
-            if (EcoreUtil.isAncestor(this, newParentDAType))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentDAType( DAType newParentDAType ) {
+        if( newParentDAType != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.PROT_NS__PARENT_DA_TYPE && newParentDAType != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentDAType ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentDAType != null)
-                msgs = ((InternalEObject)newParentDAType).eInverseAdd(this, SclPackage.DA_TYPE__PROT_NS, DAType.class, msgs);
-            msgs = basicSetParentDAType(newParentDAType, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentDAType != null )
+                msgs = ( ( InternalEObject ) newParentDAType ).eInverseAdd( this, SclPackage.DA_TYPE__PROT_NS,
+                        DAType.class, msgs );
+            msgs = basicSetParentDAType( newParentDAType, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PROT_NS__PARENT_DA_TYPE, newParentDAType, newParentDAType));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PROT_NS__PARENT_DA_TYPE, newParentDAType,
+                    newParentDAType ) );
     }
 
     /**
@@ -269,11 +276,11 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      * @generated
      */
     @Override
-    public void setValue(String newValue) {
+    public void setValue( String newValue ) {
         String oldValue = value;
         value = newValue;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PROT_NS__VALUE, oldValue, value));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PROT_NS__VALUE, oldValue, value ) );
     }
 
     /**
@@ -283,17 +290,17 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.PROT_NS__PARENT_DA:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentDA((DA)otherEnd, msgs);
-            case SclPackage.PROT_NS__PARENT_DA_TYPE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentDAType((DAType)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.PROT_NS__PARENT_DA:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentDA( ( DA ) otherEnd, msgs );
+        case SclPackage.PROT_NS__PARENT_DA_TYPE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentDAType( ( DAType ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -303,13 +310,13 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.PROT_NS__PARENT_DA:
-                return basicSetParentDA(null, msgs);
-            case SclPackage.PROT_NS__PARENT_DA_TYPE:
-                return basicSetParentDAType(null, msgs);
+        switch( featureID ) {
+        case SclPackage.PROT_NS__PARENT_DA:
+            return basicSetParentDA( null, msgs );
+        case SclPackage.PROT_NS__PARENT_DA_TYPE:
+            return basicSetParentDAType( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -319,13 +326,13 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.PROT_NS__PARENT_DA:
-                return eInternalContainer().eInverseRemove(this, SclPackage.DA__PROT_NS, DA.class, msgs);
-            case SclPackage.PROT_NS__PARENT_DA_TYPE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.DA_TYPE__PROT_NS, DAType.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.PROT_NS__PARENT_DA:
+            return eInternalContainer().eInverseRemove( this, SclPackage.DA__PROT_NS, DA.class, msgs );
+        case SclPackage.PROT_NS__PARENT_DA_TYPE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.DA_TYPE__PROT_NS, DAType.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -335,17 +342,17 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.PROT_NS__TYPE:
-                return getType();
-            case SclPackage.PROT_NS__PARENT_DA:
-                return getParentDA();
-            case SclPackage.PROT_NS__PARENT_DA_TYPE:
-                return getParentDAType();
-            case SclPackage.PROT_NS__VALUE:
-                return getValue();
+        switch( featureID ) {
+        case SclPackage.PROT_NS__TYPE:
+            return getType();
+        case SclPackage.PROT_NS__PARENT_DA:
+            return getParentDA();
+        case SclPackage.PROT_NS__PARENT_DA_TYPE:
+            return getParentDAType();
+        case SclPackage.PROT_NS__VALUE:
+            return getValue();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -355,21 +362,21 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.PROT_NS__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.PROT_NS__PARENT_DA:
-                setParentDA((DA)newValue);
-                return;
-            case SclPackage.PROT_NS__PARENT_DA_TYPE:
-                setParentDAType((DAType)newValue);
-                return;
-            case SclPackage.PROT_NS__VALUE:
-                setValue((String)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.PROT_NS__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.PROT_NS__PARENT_DA:
+            setParentDA( ( DA ) newValue );
+            return;
+        case SclPackage.PROT_NS__PARENT_DA_TYPE:
+            setParentDAType( ( DAType ) newValue );
+            return;
+        case SclPackage.PROT_NS__VALUE:
+            setValue( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -379,21 +386,21 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.PROT_NS__TYPE:
-                unsetType();
-                return;
-            case SclPackage.PROT_NS__PARENT_DA:
-                setParentDA((DA)null);
-                return;
-            case SclPackage.PROT_NS__PARENT_DA_TYPE:
-                setParentDAType((DAType)null);
-                return;
-            case SclPackage.PROT_NS__VALUE:
-                setValue(VALUE_EDEFAULT);
-                return;
+        switch( featureID ) {
+        case SclPackage.PROT_NS__TYPE:
+            unsetType();
+            return;
+        case SclPackage.PROT_NS__PARENT_DA:
+            setParentDA( ( DA ) null );
+            return;
+        case SclPackage.PROT_NS__PARENT_DA_TYPE:
+            setParentDAType( ( DAType ) null );
+            return;
+        case SclPackage.PROT_NS__VALUE:
+            setValue( VALUE_EDEFAULT );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -403,17 +410,17 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.PROT_NS__TYPE:
-                return isSetType();
-            case SclPackage.PROT_NS__PARENT_DA:
-                return getParentDA() != null;
-            case SclPackage.PROT_NS__PARENT_DA_TYPE:
-                return getParentDAType() != null;
-            case SclPackage.PROT_NS__VALUE:
-                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+        switch( featureID ) {
+        case SclPackage.PROT_NS__TYPE:
+            return isSetType();
+        case SclPackage.PROT_NS__PARENT_DA:
+            return getParentDA() != null;
+        case SclPackage.PROT_NS__PARENT_DA_TYPE:
+            return getParentDAType() != null;
+        case SclPackage.PROT_NS__VALUE:
+            return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals( value );
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -423,14 +430,17 @@ public class ProtNsImpl extends SclObjectImpl implements ProtNs {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(", value: ");
-        result.append(value);
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ", value: " );
+        result.append( value );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ProtocolImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ProtocolImpl.java
index dd6fc9c..e4578f1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ProtocolImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ProtocolImpl.java
@@ -115,8 +115,9 @@ public class ProtocolImpl extends SclObjectImpl implements Protocol {
         mustUnderstand = newMustUnderstand;
         boolean oldMustUnderstandESet = mustUnderstandESet;
         mustUnderstandESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PROTOCOL__MUST_UNDERSTAND, oldMustUnderstand, mustUnderstand, !oldMustUnderstandESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PROTOCOL__MUST_UNDERSTAND,
+                    oldMustUnderstand, mustUnderstand, !oldMustUnderstandESet ) );
     }
 
     /**
@@ -130,8 +131,9 @@ public class ProtocolImpl extends SclObjectImpl implements Protocol {
         boolean oldMustUnderstandESet = mustUnderstandESet;
         mustUnderstand = MUST_UNDERSTAND_EDEFAULT;
         mustUnderstandESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.PROTOCOL__MUST_UNDERSTAND, oldMustUnderstand, MUST_UNDERSTAND_EDEFAULT, oldMustUnderstandESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.PROTOCOL__MUST_UNDERSTAND,
+                    oldMustUnderstand, MUST_UNDERSTAND_EDEFAULT, oldMustUnderstandESet ) );
     }
 
     /**
@@ -151,8 +153,8 @@ public class ProtocolImpl extends SclObjectImpl implements Protocol {
      */
     @Override
     public ControlWithIEDName getParentControlWithIEDName() {
-        if (eContainerFeatureID() != SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME) return null;
-        return (ControlWithIEDName)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME ) return null;
+        return ( ControlWithIEDName ) eInternalContainer();
     }
 
     /**
@@ -160,8 +162,10 @@ public class ProtocolImpl extends SclObjectImpl implements Protocol {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentControlWithIEDName(ControlWithIEDName newParentControlWithIEDName, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentControlWithIEDName, SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME, msgs);
+    public NotificationChain basicSetParentControlWithIEDName( ControlWithIEDName newParentControlWithIEDName,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentControlWithIEDName,
+                SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME, msgs );
         return msgs;
     }
 
@@ -171,20 +175,24 @@ public class ProtocolImpl extends SclObjectImpl implements Protocol {
      * @generated
      */
     @Override
-    public void setParentControlWithIEDName(ControlWithIEDName newParentControlWithIEDName) {
-        if (newParentControlWithIEDName != eInternalContainer() || (eContainerFeatureID() != SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME && newParentControlWithIEDName != null)) {
-            if (EcoreUtil.isAncestor(this, newParentControlWithIEDName))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentControlWithIEDName( ControlWithIEDName newParentControlWithIEDName ) {
+        if( newParentControlWithIEDName != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME
+                        && newParentControlWithIEDName != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentControlWithIEDName ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentControlWithIEDName != null)
-                msgs = ((InternalEObject)newParentControlWithIEDName).eInverseAdd(this, SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL, ControlWithIEDName.class, msgs);
-            msgs = basicSetParentControlWithIEDName(newParentControlWithIEDName, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentControlWithIEDName != null )
+                msgs = ( ( InternalEObject ) newParentControlWithIEDName ).eInverseAdd( this,
+                        SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL, ControlWithIEDName.class, msgs );
+            msgs = basicSetParentControlWithIEDName( newParentControlWithIEDName, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME, newParentControlWithIEDName, newParentControlWithIEDName));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME,
+                    newParentControlWithIEDName, newParentControlWithIEDName ) );
     }
 
     /**
@@ -194,13 +202,13 @@ public class ProtocolImpl extends SclObjectImpl implements Protocol {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentControlWithIEDName((ControlWithIEDName)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentControlWithIEDName( ( ControlWithIEDName ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -210,11 +218,11 @@ public class ProtocolImpl extends SclObjectImpl implements Protocol {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME:
-                return basicSetParentControlWithIEDName(null, msgs);
+        switch( featureID ) {
+        case SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME:
+            return basicSetParentControlWithIEDName( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -224,11 +232,12 @@ public class ProtocolImpl extends SclObjectImpl implements Protocol {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME:
-                return eInternalContainer().eInverseRemove(this, SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL, ControlWithIEDName.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME:
+            return eInternalContainer().eInverseRemove( this, SclPackage.CONTROL_WITH_IED_NAME__PROTOCOL,
+                    ControlWithIEDName.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -238,13 +247,13 @@ public class ProtocolImpl extends SclObjectImpl implements Protocol {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.PROTOCOL__MUST_UNDERSTAND:
-                return getMustUnderstand();
-            case SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME:
-                return getParentControlWithIEDName();
+        switch( featureID ) {
+        case SclPackage.PROTOCOL__MUST_UNDERSTAND:
+            return getMustUnderstand();
+        case SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME:
+            return getParentControlWithIEDName();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -254,15 +263,15 @@ public class ProtocolImpl extends SclObjectImpl implements Protocol {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.PROTOCOL__MUST_UNDERSTAND:
-                setMustUnderstand((Boolean)newValue);
-                return;
-            case SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME:
-                setParentControlWithIEDName((ControlWithIEDName)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.PROTOCOL__MUST_UNDERSTAND:
+            setMustUnderstand( ( Boolean ) newValue );
+            return;
+        case SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME:
+            setParentControlWithIEDName( ( ControlWithIEDName ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -272,15 +281,15 @@ public class ProtocolImpl extends SclObjectImpl implements Protocol {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.PROTOCOL__MUST_UNDERSTAND:
-                unsetMustUnderstand();
-                return;
-            case SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME:
-                setParentControlWithIEDName((ControlWithIEDName)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.PROTOCOL__MUST_UNDERSTAND:
+            unsetMustUnderstand();
+            return;
+        case SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME:
+            setParentControlWithIEDName( ( ControlWithIEDName ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -290,13 +299,13 @@ public class ProtocolImpl extends SclObjectImpl implements Protocol {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.PROTOCOL__MUST_UNDERSTAND:
-                return isSetMustUnderstand();
-            case SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME:
-                return getParentControlWithIEDName() != null;
+        switch( featureID ) {
+        case SclPackage.PROTOCOL__MUST_UNDERSTAND:
+            return isSetMustUnderstand();
+        case SclPackage.PROTOCOL__PARENT_CONTROL_WITH_IED_NAME:
+            return getParentControlWithIEDName() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -306,12 +315,15 @@ public class ProtocolImpl extends SclObjectImpl implements Protocol {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (mustUnderstand: ");
-        if (mustUnderstandESet) result.append(mustUnderstand); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (mustUnderstand: " );
+        if( mustUnderstandESet )
+            result.append( mustUnderstand );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ReadWriteImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ReadWriteImpl.java
index 392d432..0818069 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ReadWriteImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ReadWriteImpl.java
@@ -71,8 +71,8 @@ public class ReadWriteImpl extends ServiceYesNoImpl implements ReadWrite {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.READ_WRITE__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.READ_WRITE__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class ReadWriteImpl extends ServiceYesNoImpl implements ReadWrite {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.READ_WRITE__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.READ_WRITE__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,23 @@ public class ReadWriteImpl extends ServiceYesNoImpl implements ReadWrite {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.READ_WRITE__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.READ_WRITE__PARENT_SERVICES && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__READ_WRITE, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__READ_WRITE,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.READ_WRITE__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.READ_WRITE__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +118,13 @@ public class ReadWriteImpl extends ServiceYesNoImpl implements ReadWrite {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.READ_WRITE__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.READ_WRITE__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +134,11 @@ public class ReadWriteImpl extends ServiceYesNoImpl implements ReadWrite {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.READ_WRITE__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.READ_WRITE__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +148,11 @@ public class ReadWriteImpl extends ServiceYesNoImpl implements ReadWrite {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.READ_WRITE__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__READ_WRITE, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.READ_WRITE__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__READ_WRITE, Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +162,11 @@ public class ReadWriteImpl extends ServiceYesNoImpl implements ReadWrite {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.READ_WRITE__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.READ_WRITE__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +176,12 @@ public class ReadWriteImpl extends ServiceYesNoImpl implements ReadWrite {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.READ_WRITE__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.READ_WRITE__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +191,12 @@ public class ReadWriteImpl extends ServiceYesNoImpl implements ReadWrite {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.READ_WRITE__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.READ_WRITE__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +206,11 @@ public class ReadWriteImpl extends ServiceYesNoImpl implements ReadWrite {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.READ_WRITE__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.READ_WRITE__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //ReadWriteImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/RedProtImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/RedProtImpl.java
index f05f653..9de9968 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/RedProtImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/RedProtImpl.java
@@ -175,8 +175,9 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
         hsr = newHsr;
         boolean oldHsrESet = hsrESet;
         hsrESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.RED_PROT__HSR, oldHsr, hsr, !oldHsrESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.RED_PROT__HSR, oldHsr, hsr,
+                    !oldHsrESet ) );
     }
 
     /**
@@ -190,8 +191,9 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
         boolean oldHsrESet = hsrESet;
         hsr = HSR_EDEFAULT;
         hsrESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.RED_PROT__HSR, oldHsr, HSR_EDEFAULT, oldHsrESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.RED_PROT__HSR, oldHsr, HSR_EDEFAULT,
+                    oldHsrESet ) );
     }
 
     /**
@@ -225,8 +227,9 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
         prp = newPrp;
         boolean oldPrpESet = prpESet;
         prpESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.RED_PROT__PRP, oldPrp, prp, !oldPrpESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.RED_PROT__PRP, oldPrp, prp,
+                    !oldPrpESet ) );
     }
 
     /**
@@ -240,8 +243,9 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
         boolean oldPrpESet = prpESet;
         prp = PRP_EDEFAULT;
         prpESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.RED_PROT__PRP, oldPrp, PRP_EDEFAULT, oldPrpESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.RED_PROT__PRP, oldPrp, PRP_EDEFAULT,
+                    oldPrpESet ) );
     }
 
     /**
@@ -275,8 +279,9 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
         rstp = newRstp;
         boolean oldRstpESet = rstpESet;
         rstpESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.RED_PROT__RSTP, oldRstp, rstp, !oldRstpESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.RED_PROT__RSTP, oldRstp, rstp,
+                    !oldRstpESet ) );
     }
 
     /**
@@ -290,8 +295,9 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
         boolean oldRstpESet = rstpESet;
         rstp = RSTP_EDEFAULT;
         rstpESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.RED_PROT__RSTP, oldRstp, RSTP_EDEFAULT, oldRstpESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.RED_PROT__RSTP, oldRstp, RSTP_EDEFAULT,
+                    oldRstpESet ) );
     }
 
     /**
@@ -311,8 +317,8 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.RED_PROT__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.RED_PROT__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -320,8 +326,8 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.RED_PROT__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.RED_PROT__PARENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -331,20 +337,23 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.RED_PROT__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.RED_PROT__PARENT_SERVICES && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__RED_PROT, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__RED_PROT,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.RED_PROT__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.RED_PROT__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -354,13 +363,13 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.RED_PROT__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.RED_PROT__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -370,11 +379,11 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.RED_PROT__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.RED_PROT__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -384,11 +393,11 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.RED_PROT__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__RED_PROT, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.RED_PROT__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__RED_PROT, Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -398,17 +407,17 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.RED_PROT__HSR:
-                return getHsr();
-            case SclPackage.RED_PROT__PRP:
-                return getPrp();
-            case SclPackage.RED_PROT__RSTP:
-                return getRstp();
-            case SclPackage.RED_PROT__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.RED_PROT__HSR:
+            return getHsr();
+        case SclPackage.RED_PROT__PRP:
+            return getPrp();
+        case SclPackage.RED_PROT__RSTP:
+            return getRstp();
+        case SclPackage.RED_PROT__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -418,21 +427,21 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.RED_PROT__HSR:
-                setHsr((Boolean)newValue);
-                return;
-            case SclPackage.RED_PROT__PRP:
-                setPrp((Boolean)newValue);
-                return;
-            case SclPackage.RED_PROT__RSTP:
-                setRstp((Boolean)newValue);
-                return;
-            case SclPackage.RED_PROT__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.RED_PROT__HSR:
+            setHsr( ( Boolean ) newValue );
+            return;
+        case SclPackage.RED_PROT__PRP:
+            setPrp( ( Boolean ) newValue );
+            return;
+        case SclPackage.RED_PROT__RSTP:
+            setRstp( ( Boolean ) newValue );
+            return;
+        case SclPackage.RED_PROT__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -442,21 +451,21 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.RED_PROT__HSR:
-                unsetHsr();
-                return;
-            case SclPackage.RED_PROT__PRP:
-                unsetPrp();
-                return;
-            case SclPackage.RED_PROT__RSTP:
-                unsetRstp();
-                return;
-            case SclPackage.RED_PROT__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.RED_PROT__HSR:
+            unsetHsr();
+            return;
+        case SclPackage.RED_PROT__PRP:
+            unsetPrp();
+            return;
+        case SclPackage.RED_PROT__RSTP:
+            unsetRstp();
+            return;
+        case SclPackage.RED_PROT__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -466,17 +475,17 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.RED_PROT__HSR:
-                return isSetHsr();
-            case SclPackage.RED_PROT__PRP:
-                return isSetPrp();
-            case SclPackage.RED_PROT__RSTP:
-                return isSetRstp();
-            case SclPackage.RED_PROT__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.RED_PROT__HSR:
+            return isSetHsr();
+        case SclPackage.RED_PROT__PRP:
+            return isSetPrp();
+        case SclPackage.RED_PROT__RSTP:
+            return isSetRstp();
+        case SclPackage.RED_PROT__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -486,16 +495,25 @@ public class RedProtImpl extends SclObjectImpl implements RedProt {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (hsr: ");
-        if (hsrESet) result.append(hsr); else result.append("<unset>");
-        result.append(", prp: ");
-        if (prpESet) result.append(prp); else result.append("<unset>");
-        result.append(", rstp: ");
-        if (rstpESet) result.append(rstp); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (hsr: " );
+        if( hsrESet )
+            result.append( hsr );
+        else
+            result.append( "<unset>" );
+        result.append( ", prp: " );
+        if( prpESet )
+            result.append( prp );
+        else
+            result.append( "<unset>" );
+        result.append( ", rstp: " );
+        if( rstpESet )
+            result.append( rstp );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ReportControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ReportControlImpl.java
index 791056c..8f57155 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ReportControlImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ReportControlImpl.java
@@ -91,7 +91,7 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      * @generated
      * @ordered
      */
-    protected static final Integer BUF_TIME_EDEFAULT = new Integer(0);
+    protected static final Integer BUF_TIME_EDEFAULT = new Integer( 0 );
 
     /**
      * The cached value of the '{@link #getBufTime() <em>Buf Time</em>}' attribute.
@@ -277,8 +277,9 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
         buffered = newBuffered;
         boolean oldBufferedESet = bufferedESet;
         bufferedESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_CONTROL__BUFFERED, oldBuffered, buffered, !oldBufferedESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_CONTROL__BUFFERED, oldBuffered,
+                    buffered, !oldBufferedESet ) );
     }
 
     /**
@@ -292,8 +293,9 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
         boolean oldBufferedESet = bufferedESet;
         buffered = BUFFERED_EDEFAULT;
         bufferedESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_CONTROL__BUFFERED, oldBuffered, BUFFERED_EDEFAULT, oldBufferedESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.REPORT_CONTROL__BUFFERED, oldBuffered,
+                    BUFFERED_EDEFAULT, oldBufferedESet ) );
     }
 
     /**
@@ -327,8 +329,9 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
         bufTime = newBufTime;
         boolean oldBufTimeESet = bufTimeESet;
         bufTimeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_CONTROL__BUF_TIME, oldBufTime, bufTime, !oldBufTimeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_CONTROL__BUF_TIME, oldBufTime,
+                    bufTime, !oldBufTimeESet ) );
     }
 
     /**
@@ -342,8 +345,9 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
         boolean oldBufTimeESet = bufTimeESet;
         bufTime = BUF_TIME_EDEFAULT;
         bufTimeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_CONTROL__BUF_TIME, oldBufTime, BUF_TIME_EDEFAULT, oldBufTimeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.REPORT_CONTROL__BUF_TIME, oldBufTime,
+                    BUF_TIME_EDEFAULT, oldBufTimeESet ) );
     }
 
     /**
@@ -377,8 +381,9 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
         confRev = newConfRev;
         boolean oldConfRevESet = confRevESet;
         confRevESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_CONTROL__CONF_REV, oldConfRev, confRev, !oldConfRevESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_CONTROL__CONF_REV, oldConfRev,
+                    confRev, !oldConfRevESet ) );
     }
 
     /**
@@ -392,8 +397,9 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
         boolean oldConfRevESet = confRevESet;
         confRev = CONF_REV_EDEFAULT;
         confRevESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_CONTROL__CONF_REV, oldConfRev, CONF_REV_EDEFAULT, oldConfRevESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.REPORT_CONTROL__CONF_REV, oldConfRev,
+                    CONF_REV_EDEFAULT, oldConfRevESet ) );
     }
 
     /**
@@ -427,8 +433,9 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
         indexed = newIndexed;
         boolean oldIndexedESet = indexedESet;
         indexedESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_CONTROL__INDEXED, oldIndexed, indexed, !oldIndexedESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_CONTROL__INDEXED, oldIndexed,
+                    indexed, !oldIndexedESet ) );
     }
 
     /**
@@ -442,8 +449,9 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
         boolean oldIndexedESet = indexedESet;
         indexed = INDEXED_EDEFAULT;
         indexedESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_CONTROL__INDEXED, oldIndexed, INDEXED_EDEFAULT, oldIndexedESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.REPORT_CONTROL__INDEXED, oldIndexed,
+                    INDEXED_EDEFAULT, oldIndexedESet ) );
     }
 
     /**
@@ -477,8 +485,9 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
         rptID = newRptID;
         boolean oldRptIDESet = rptIDESet;
         rptIDESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_CONTROL__RPT_ID, oldRptID, rptID, !oldRptIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_CONTROL__RPT_ID, oldRptID, rptID,
+                    !oldRptIDESet ) );
     }
 
     /**
@@ -492,8 +501,9 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
         boolean oldRptIDESet = rptIDESet;
         rptID = RPT_ID_EDEFAULT;
         rptIDESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_CONTROL__RPT_ID, oldRptID, RPT_ID_EDEFAULT, oldRptIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.REPORT_CONTROL__RPT_ID, oldRptID,
+                    RPT_ID_EDEFAULT, oldRptIDESet ) );
     }
 
     /**
@@ -513,8 +523,8 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      */
     @Override
     public AnyLN getParentAnyLN() {
-        if (eContainerFeatureID() != SclPackage.REPORT_CONTROL__PARENT_ANY_LN) return null;
-        return (AnyLN)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.REPORT_CONTROL__PARENT_ANY_LN ) return null;
+        return ( AnyLN ) eInternalContainer();
     }
 
     /**
@@ -522,8 +532,8 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAnyLN(AnyLN newParentAnyLN, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAnyLN, SclPackage.REPORT_CONTROL__PARENT_ANY_LN, msgs);
+    public NotificationChain basicSetParentAnyLN( AnyLN newParentAnyLN, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAnyLN, SclPackage.REPORT_CONTROL__PARENT_ANY_LN, msgs );
         return msgs;
     }
 
@@ -533,20 +543,23 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      * @generated
      */
     @Override
-    public void setParentAnyLN(AnyLN newParentAnyLN) {
-        if (newParentAnyLN != eInternalContainer() || (eContainerFeatureID() != SclPackage.REPORT_CONTROL__PARENT_ANY_LN && newParentAnyLN != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAnyLN))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAnyLN( AnyLN newParentAnyLN ) {
+        if( newParentAnyLN != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.REPORT_CONTROL__PARENT_ANY_LN && newParentAnyLN != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAnyLN ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAnyLN != null)
-                msgs = ((InternalEObject)newParentAnyLN).eInverseAdd(this, SclPackage.ANY_LN__REPORT_CONTROL, AnyLN.class, msgs);
-            msgs = basicSetParentAnyLN(newParentAnyLN, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAnyLN != null )
+                msgs = ( ( InternalEObject ) newParentAnyLN ).eInverseAdd( this, SclPackage.ANY_LN__REPORT_CONTROL,
+                        AnyLN.class, msgs );
+            msgs = basicSetParentAnyLN( newParentAnyLN, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_CONTROL__PARENT_ANY_LN, newParentAnyLN, newParentAnyLN));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_CONTROL__PARENT_ANY_LN,
+                    newParentAnyLN, newParentAnyLN ) );
     }
 
     /**
@@ -569,9 +582,13 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
         optFields = newOptFields;
         boolean oldOptFieldsESet = optFieldsESet;
         optFieldsESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_CONTROL__OPT_FIELDS, oldOptFields, newOptFields, !oldOptFieldsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.REPORT_CONTROL__OPT_FIELDS, oldOptFields, newOptFields, !oldOptFieldsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -583,20 +600,23 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      */
     @Override
     public void setOptFields( OptFields newOptFields ) {
-        if (newOptFields != optFields) {
+        if( newOptFields != optFields ) {
             NotificationChain msgs = null;
-            if (optFields != null)
-                msgs = ((InternalEObject)optFields).eInverseRemove(this, SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL, OptFields.class, msgs);
-            if (newOptFields != null)
-                msgs = ((InternalEObject)newOptFields).eInverseAdd(this, SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL, OptFields.class, msgs);
-            msgs = basicSetOptFields(newOptFields, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( optFields != null )
+                msgs = ( ( InternalEObject ) optFields ).eInverseRemove( this,
+                        SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL, OptFields.class, msgs );
+            if( newOptFields != null )
+                msgs = ( ( InternalEObject ) newOptFields ).eInverseAdd( this,
+                        SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL, OptFields.class, msgs );
+            msgs = basicSetOptFields( newOptFields, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldOptFieldsESet = optFieldsESet;
             optFieldsESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_CONTROL__OPT_FIELDS, newOptFields, newOptFields, !oldOptFieldsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_CONTROL__OPT_FIELDS,
+                        newOptFields, newOptFields, !oldOptFieldsESet ) );
         }
     }
 
@@ -610,9 +630,13 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
         optFields = null;
         boolean oldOptFieldsESet = optFieldsESet;
         optFieldsESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_CONTROL__OPT_FIELDS, oldOptFields, null, oldOptFieldsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.REPORT_CONTROL__OPT_FIELDS, oldOptFields, null, oldOptFieldsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -624,17 +648,19 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      */
     @Override
     public void unsetOptFields() {
-        if (optFields != null) {
+        if( optFields != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)optFields).eInverseRemove(this, SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL, OptFields.class, msgs);
-            msgs = basicUnsetOptFields(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) optFields ).eInverseRemove( this, SclPackage.OPT_FIELDS__PARENT_REPORT_CONTROL,
+                    OptFields.class, msgs );
+            msgs = basicUnsetOptFields( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldOptFieldsESet = optFieldsESet;
             optFieldsESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_CONTROL__OPT_FIELDS, null, null, oldOptFieldsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.REPORT_CONTROL__OPT_FIELDS, null,
+                        null, oldOptFieldsESet ) );
         }
     }
 
@@ -668,9 +694,13 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
         rptEnabled = newRptEnabled;
         boolean oldRptEnabledESet = rptEnabledESet;
         rptEnabledESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_CONTROL__RPT_ENABLED, oldRptEnabled, newRptEnabled, !oldRptEnabledESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.REPORT_CONTROL__RPT_ENABLED, oldRptEnabled, newRptEnabled, !oldRptEnabledESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -682,20 +712,23 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      */
     @Override
     public void setRptEnabled( RptEnabled newRptEnabled ) {
-        if (newRptEnabled != rptEnabled) {
+        if( newRptEnabled != rptEnabled ) {
             NotificationChain msgs = null;
-            if (rptEnabled != null)
-                msgs = ((InternalEObject)rptEnabled).eInverseRemove(this, SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL, RptEnabled.class, msgs);
-            if (newRptEnabled != null)
-                msgs = ((InternalEObject)newRptEnabled).eInverseAdd(this, SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL, RptEnabled.class, msgs);
-            msgs = basicSetRptEnabled(newRptEnabled, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( rptEnabled != null )
+                msgs = ( ( InternalEObject ) rptEnabled ).eInverseRemove( this,
+                        SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL, RptEnabled.class, msgs );
+            if( newRptEnabled != null )
+                msgs = ( ( InternalEObject ) newRptEnabled ).eInverseAdd( this,
+                        SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL, RptEnabled.class, msgs );
+            msgs = basicSetRptEnabled( newRptEnabled, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRptEnabledESet = rptEnabledESet;
             rptEnabledESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_CONTROL__RPT_ENABLED, newRptEnabled, newRptEnabled, !oldRptEnabledESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_CONTROL__RPT_ENABLED,
+                        newRptEnabled, newRptEnabled, !oldRptEnabledESet ) );
         }
     }
 
@@ -709,9 +742,13 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
         rptEnabled = null;
         boolean oldRptEnabledESet = rptEnabledESet;
         rptEnabledESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_CONTROL__RPT_ENABLED, oldRptEnabled, null, oldRptEnabledESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.REPORT_CONTROL__RPT_ENABLED, oldRptEnabled, null, oldRptEnabledESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -723,17 +760,19 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      */
     @Override
     public void unsetRptEnabled() {
-        if (rptEnabled != null) {
+        if( rptEnabled != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)rptEnabled).eInverseRemove(this, SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL, RptEnabled.class, msgs);
-            msgs = basicUnsetRptEnabled(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) rptEnabled ).eInverseRemove( this,
+                    SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL, RptEnabled.class, msgs );
+            msgs = basicUnsetRptEnabled( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRptEnabledESet = rptEnabledESet;
             rptEnabledESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_CONTROL__RPT_ENABLED, null, null, oldRptEnabledESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.REPORT_CONTROL__RPT_ENABLED, null,
+                        null, oldRptEnabledESet ) );
         }
     }
 
@@ -754,21 +793,23 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.REPORT_CONTROL__PARENT_ANY_LN:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAnyLN((AnyLN)otherEnd, msgs);
-            case SclPackage.REPORT_CONTROL__OPT_FIELDS:
-                if (optFields != null)
-                    msgs = ((InternalEObject)optFields).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.REPORT_CONTROL__OPT_FIELDS, null, msgs);
-                return basicSetOptFields((OptFields)otherEnd, msgs);
-            case SclPackage.REPORT_CONTROL__RPT_ENABLED:
-                if (rptEnabled != null)
-                    msgs = ((InternalEObject)rptEnabled).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.REPORT_CONTROL__RPT_ENABLED, null, msgs);
-                return basicSetRptEnabled((RptEnabled)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.REPORT_CONTROL__PARENT_ANY_LN:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAnyLN( ( AnyLN ) otherEnd, msgs );
+        case SclPackage.REPORT_CONTROL__OPT_FIELDS:
+            if( optFields != null )
+                msgs = ( ( InternalEObject ) optFields ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.REPORT_CONTROL__OPT_FIELDS, null, msgs );
+            return basicSetOptFields( ( OptFields ) otherEnd, msgs );
+        case SclPackage.REPORT_CONTROL__RPT_ENABLED:
+            if( rptEnabled != null )
+                msgs = ( ( InternalEObject ) rptEnabled ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.REPORT_CONTROL__RPT_ENABLED, null, msgs );
+            return basicSetRptEnabled( ( RptEnabled ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -778,15 +819,15 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.REPORT_CONTROL__PARENT_ANY_LN:
-                return basicSetParentAnyLN(null, msgs);
-            case SclPackage.REPORT_CONTROL__OPT_FIELDS:
-                return basicUnsetOptFields(msgs);
-            case SclPackage.REPORT_CONTROL__RPT_ENABLED:
-                return basicUnsetRptEnabled(msgs);
+        switch( featureID ) {
+        case SclPackage.REPORT_CONTROL__PARENT_ANY_LN:
+            return basicSetParentAnyLN( null, msgs );
+        case SclPackage.REPORT_CONTROL__OPT_FIELDS:
+            return basicUnsetOptFields( msgs );
+        case SclPackage.REPORT_CONTROL__RPT_ENABLED:
+            return basicUnsetRptEnabled( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -796,11 +837,11 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.REPORT_CONTROL__PARENT_ANY_LN:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ANY_LN__REPORT_CONTROL, AnyLN.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.REPORT_CONTROL__PARENT_ANY_LN:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ANY_LN__REPORT_CONTROL, AnyLN.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -810,25 +851,25 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.REPORT_CONTROL__BUFFERED:
-                return getBuffered();
-            case SclPackage.REPORT_CONTROL__BUF_TIME:
-                return getBufTime();
-            case SclPackage.REPORT_CONTROL__CONF_REV:
-                return getConfRev();
-            case SclPackage.REPORT_CONTROL__INDEXED:
-                return getIndexed();
-            case SclPackage.REPORT_CONTROL__RPT_ID:
-                return getRptID();
-            case SclPackage.REPORT_CONTROL__PARENT_ANY_LN:
-                return getParentAnyLN();
-            case SclPackage.REPORT_CONTROL__OPT_FIELDS:
-                return getOptFields();
-            case SclPackage.REPORT_CONTROL__RPT_ENABLED:
-                return getRptEnabled();
+        switch( featureID ) {
+        case SclPackage.REPORT_CONTROL__BUFFERED:
+            return getBuffered();
+        case SclPackage.REPORT_CONTROL__BUF_TIME:
+            return getBufTime();
+        case SclPackage.REPORT_CONTROL__CONF_REV:
+            return getConfRev();
+        case SclPackage.REPORT_CONTROL__INDEXED:
+            return getIndexed();
+        case SclPackage.REPORT_CONTROL__RPT_ID:
+            return getRptID();
+        case SclPackage.REPORT_CONTROL__PARENT_ANY_LN:
+            return getParentAnyLN();
+        case SclPackage.REPORT_CONTROL__OPT_FIELDS:
+            return getOptFields();
+        case SclPackage.REPORT_CONTROL__RPT_ENABLED:
+            return getRptEnabled();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -838,33 +879,33 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.REPORT_CONTROL__BUFFERED:
-                setBuffered((Boolean)newValue);
-                return;
-            case SclPackage.REPORT_CONTROL__BUF_TIME:
-                setBufTime((Integer)newValue);
-                return;
-            case SclPackage.REPORT_CONTROL__CONF_REV:
-                setConfRev((Integer)newValue);
-                return;
-            case SclPackage.REPORT_CONTROL__INDEXED:
-                setIndexed((Boolean)newValue);
-                return;
-            case SclPackage.REPORT_CONTROL__RPT_ID:
-                setRptID((String)newValue);
-                return;
-            case SclPackage.REPORT_CONTROL__PARENT_ANY_LN:
-                setParentAnyLN((AnyLN)newValue);
-                return;
-            case SclPackage.REPORT_CONTROL__OPT_FIELDS:
-                setOptFields((OptFields)newValue);
-                return;
-            case SclPackage.REPORT_CONTROL__RPT_ENABLED:
-                setRptEnabled((RptEnabled)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.REPORT_CONTROL__BUFFERED:
+            setBuffered( ( Boolean ) newValue );
+            return;
+        case SclPackage.REPORT_CONTROL__BUF_TIME:
+            setBufTime( ( Integer ) newValue );
+            return;
+        case SclPackage.REPORT_CONTROL__CONF_REV:
+            setConfRev( ( Integer ) newValue );
+            return;
+        case SclPackage.REPORT_CONTROL__INDEXED:
+            setIndexed( ( Boolean ) newValue );
+            return;
+        case SclPackage.REPORT_CONTROL__RPT_ID:
+            setRptID( ( String ) newValue );
+            return;
+        case SclPackage.REPORT_CONTROL__PARENT_ANY_LN:
+            setParentAnyLN( ( AnyLN ) newValue );
+            return;
+        case SclPackage.REPORT_CONTROL__OPT_FIELDS:
+            setOptFields( ( OptFields ) newValue );
+            return;
+        case SclPackage.REPORT_CONTROL__RPT_ENABLED:
+            setRptEnabled( ( RptEnabled ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -874,33 +915,33 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.REPORT_CONTROL__BUFFERED:
-                unsetBuffered();
-                return;
-            case SclPackage.REPORT_CONTROL__BUF_TIME:
-                unsetBufTime();
-                return;
-            case SclPackage.REPORT_CONTROL__CONF_REV:
-                unsetConfRev();
-                return;
-            case SclPackage.REPORT_CONTROL__INDEXED:
-                unsetIndexed();
-                return;
-            case SclPackage.REPORT_CONTROL__RPT_ID:
-                unsetRptID();
-                return;
-            case SclPackage.REPORT_CONTROL__PARENT_ANY_LN:
-                setParentAnyLN((AnyLN)null);
-                return;
-            case SclPackage.REPORT_CONTROL__OPT_FIELDS:
-                unsetOptFields();
-                return;
-            case SclPackage.REPORT_CONTROL__RPT_ENABLED:
-                unsetRptEnabled();
-                return;
+        switch( featureID ) {
+        case SclPackage.REPORT_CONTROL__BUFFERED:
+            unsetBuffered();
+            return;
+        case SclPackage.REPORT_CONTROL__BUF_TIME:
+            unsetBufTime();
+            return;
+        case SclPackage.REPORT_CONTROL__CONF_REV:
+            unsetConfRev();
+            return;
+        case SclPackage.REPORT_CONTROL__INDEXED:
+            unsetIndexed();
+            return;
+        case SclPackage.REPORT_CONTROL__RPT_ID:
+            unsetRptID();
+            return;
+        case SclPackage.REPORT_CONTROL__PARENT_ANY_LN:
+            setParentAnyLN( ( AnyLN ) null );
+            return;
+        case SclPackage.REPORT_CONTROL__OPT_FIELDS:
+            unsetOptFields();
+            return;
+        case SclPackage.REPORT_CONTROL__RPT_ENABLED:
+            unsetRptEnabled();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -910,25 +951,25 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.REPORT_CONTROL__BUFFERED:
-                return isSetBuffered();
-            case SclPackage.REPORT_CONTROL__BUF_TIME:
-                return isSetBufTime();
-            case SclPackage.REPORT_CONTROL__CONF_REV:
-                return isSetConfRev();
-            case SclPackage.REPORT_CONTROL__INDEXED:
-                return isSetIndexed();
-            case SclPackage.REPORT_CONTROL__RPT_ID:
-                return isSetRptID();
-            case SclPackage.REPORT_CONTROL__PARENT_ANY_LN:
-                return getParentAnyLN() != null;
-            case SclPackage.REPORT_CONTROL__OPT_FIELDS:
-                return isSetOptFields();
-            case SclPackage.REPORT_CONTROL__RPT_ENABLED:
-                return isSetRptEnabled();
+        switch( featureID ) {
+        case SclPackage.REPORT_CONTROL__BUFFERED:
+            return isSetBuffered();
+        case SclPackage.REPORT_CONTROL__BUF_TIME:
+            return isSetBufTime();
+        case SclPackage.REPORT_CONTROL__CONF_REV:
+            return isSetConfRev();
+        case SclPackage.REPORT_CONTROL__INDEXED:
+            return isSetIndexed();
+        case SclPackage.REPORT_CONTROL__RPT_ID:
+            return isSetRptID();
+        case SclPackage.REPORT_CONTROL__PARENT_ANY_LN:
+            return getParentAnyLN() != null;
+        case SclPackage.REPORT_CONTROL__OPT_FIELDS:
+            return isSetOptFields();
+        case SclPackage.REPORT_CONTROL__RPT_ENABLED:
+            return isSetRptEnabled();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -938,20 +979,35 @@ public class ReportControlImpl extends ControlWithTriggerOptImpl implements Repo
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (buffered: ");
-        if (bufferedESet) result.append(buffered); else result.append("<unset>");
-        result.append(", bufTime: ");
-        if (bufTimeESet) result.append(bufTime); else result.append("<unset>");
-        result.append(", confRev: ");
-        if (confRevESet) result.append(confRev); else result.append("<unset>");
-        result.append(", indexed: ");
-        if (indexedESet) result.append(indexed); else result.append("<unset>");
-        result.append(", rptID: ");
-        if (rptIDESet) result.append(rptID); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (buffered: " );
+        if( bufferedESet )
+            result.append( buffered );
+        else
+            result.append( "<unset>" );
+        result.append( ", bufTime: " );
+        if( bufTimeESet )
+            result.append( bufTime );
+        else
+            result.append( "<unset>" );
+        result.append( ", confRev: " );
+        if( confRevESet )
+            result.append( confRev );
+        else
+            result.append( "<unset>" );
+        result.append( ", indexed: " );
+        if( indexedESet )
+            result.append( indexed );
+        else
+            result.append( "<unset>" );
+        result.append( ", rptID: " );
+        if( rptIDESet )
+            result.append( rptID );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ReportSettingsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ReportSettingsImpl.java
index 5be69fd..e2ff074 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ReportSettingsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ReportSettingsImpl.java
@@ -296,8 +296,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
         bufTime = newBufTime == null ? BUF_TIME_EDEFAULT : newBufTime;
         boolean oldBufTimeESet = bufTimeESet;
         bufTimeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_SETTINGS__BUF_TIME, oldBufTime, bufTime, !oldBufTimeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_SETTINGS__BUF_TIME, oldBufTime,
+                    bufTime, !oldBufTimeESet ) );
     }
 
     /**
@@ -311,8 +312,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
         boolean oldBufTimeESet = bufTimeESet;
         bufTime = BUF_TIME_EDEFAULT;
         bufTimeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_SETTINGS__BUF_TIME, oldBufTime, BUF_TIME_EDEFAULT, oldBufTimeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.REPORT_SETTINGS__BUF_TIME, oldBufTime,
+                    BUF_TIME_EDEFAULT, oldBufTimeESet ) );
     }
 
     /**
@@ -346,8 +348,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
         intgPd = newIntgPd == null ? INTG_PD_EDEFAULT : newIntgPd;
         boolean oldIntgPdESet = intgPdESet;
         intgPdESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_SETTINGS__INTG_PD, oldIntgPd, intgPd, !oldIntgPdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_SETTINGS__INTG_PD, oldIntgPd,
+                    intgPd, !oldIntgPdESet ) );
     }
 
     /**
@@ -361,8 +364,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
         boolean oldIntgPdESet = intgPdESet;
         intgPd = INTG_PD_EDEFAULT;
         intgPdESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_SETTINGS__INTG_PD, oldIntgPd, INTG_PD_EDEFAULT, oldIntgPdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.REPORT_SETTINGS__INTG_PD, oldIntgPd,
+                    INTG_PD_EDEFAULT, oldIntgPdESet ) );
     }
 
     /**
@@ -396,8 +400,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
         optFields = newOptFields == null ? OPT_FIELDS_EDEFAULT : newOptFields;
         boolean oldOptFieldsESet = optFieldsESet;
         optFieldsESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_SETTINGS__OPT_FIELDS, oldOptFields, optFields, !oldOptFieldsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_SETTINGS__OPT_FIELDS,
+                    oldOptFields, optFields, !oldOptFieldsESet ) );
     }
 
     /**
@@ -411,8 +416,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
         boolean oldOptFieldsESet = optFieldsESet;
         optFields = OPT_FIELDS_EDEFAULT;
         optFieldsESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_SETTINGS__OPT_FIELDS, oldOptFields, OPT_FIELDS_EDEFAULT, oldOptFieldsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.REPORT_SETTINGS__OPT_FIELDS,
+                    oldOptFields, OPT_FIELDS_EDEFAULT, oldOptFieldsESet ) );
     }
 
     /**
@@ -446,8 +452,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
         owner = newOwner;
         boolean oldOwnerESet = ownerESet;
         ownerESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_SETTINGS__OWNER, oldOwner, owner, !oldOwnerESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_SETTINGS__OWNER, oldOwner, owner,
+                    !oldOwnerESet ) );
     }
 
     /**
@@ -461,8 +468,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
         boolean oldOwnerESet = ownerESet;
         owner = OWNER_EDEFAULT;
         ownerESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_SETTINGS__OWNER, oldOwner, OWNER_EDEFAULT, oldOwnerESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.REPORT_SETTINGS__OWNER, oldOwner,
+                    OWNER_EDEFAULT, oldOwnerESet ) );
     }
 
     /**
@@ -496,8 +504,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
         resvTms = newResvTms;
         boolean oldResvTmsESet = resvTmsESet;
         resvTmsESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_SETTINGS__RESV_TMS, oldResvTms, resvTms, !oldResvTmsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_SETTINGS__RESV_TMS, oldResvTms,
+                    resvTms, !oldResvTmsESet ) );
     }
 
     /**
@@ -511,8 +520,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
         boolean oldResvTmsESet = resvTmsESet;
         resvTms = RESV_TMS_EDEFAULT;
         resvTmsESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_SETTINGS__RESV_TMS, oldResvTms, RESV_TMS_EDEFAULT, oldResvTmsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.REPORT_SETTINGS__RESV_TMS, oldResvTms,
+                    RESV_TMS_EDEFAULT, oldResvTmsESet ) );
     }
 
     /**
@@ -546,8 +556,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
         rptID = newRptID == null ? RPT_ID_EDEFAULT : newRptID;
         boolean oldRptIDESet = rptIDESet;
         rptIDESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_SETTINGS__RPT_ID, oldRptID, rptID, !oldRptIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_SETTINGS__RPT_ID, oldRptID, rptID,
+                    !oldRptIDESet ) );
     }
 
     /**
@@ -561,8 +572,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
         boolean oldRptIDESet = rptIDESet;
         rptID = RPT_ID_EDEFAULT;
         rptIDESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_SETTINGS__RPT_ID, oldRptID, RPT_ID_EDEFAULT, oldRptIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.REPORT_SETTINGS__RPT_ID, oldRptID,
+                    RPT_ID_EDEFAULT, oldRptIDESet ) );
     }
 
     /**
@@ -596,8 +608,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
         trgOps = newTrgOps == null ? TRG_OPS_EDEFAULT : newTrgOps;
         boolean oldTrgOpsESet = trgOpsESet;
         trgOpsESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_SETTINGS__TRG_OPS, oldTrgOps, trgOps, !oldTrgOpsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_SETTINGS__TRG_OPS, oldTrgOps,
+                    trgOps, !oldTrgOpsESet ) );
     }
 
     /**
@@ -611,8 +624,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
         boolean oldTrgOpsESet = trgOpsESet;
         trgOps = TRG_OPS_EDEFAULT;
         trgOpsESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.REPORT_SETTINGS__TRG_OPS, oldTrgOps, TRG_OPS_EDEFAULT, oldTrgOpsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.REPORT_SETTINGS__TRG_OPS, oldTrgOps,
+                    TRG_OPS_EDEFAULT, oldTrgOpsESet ) );
     }
 
     /**
@@ -632,8 +646,8 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.REPORT_SETTINGS__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.REPORT_SETTINGS__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -641,8 +655,9 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.REPORT_SETTINGS__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.REPORT_SETTINGS__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -652,20 +667,24 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.REPORT_SETTINGS__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.REPORT_SETTINGS__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__REPORT_SETTINGS, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this,
+                        SclPackage.SERVICES__REPORT_SETTINGS, Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.REPORT_SETTINGS__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.REPORT_SETTINGS__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -675,13 +694,13 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.REPORT_SETTINGS__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.REPORT_SETTINGS__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -691,11 +710,11 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.REPORT_SETTINGS__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.REPORT_SETTINGS__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -705,11 +724,12 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.REPORT_SETTINGS__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__REPORT_SETTINGS, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.REPORT_SETTINGS__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__REPORT_SETTINGS, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -719,25 +739,25 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.REPORT_SETTINGS__BUF_TIME:
-                return getBufTime();
-            case SclPackage.REPORT_SETTINGS__INTG_PD:
-                return getIntgPd();
-            case SclPackage.REPORT_SETTINGS__OPT_FIELDS:
-                return getOptFields();
-            case SclPackage.REPORT_SETTINGS__OWNER:
-                return getOwner();
-            case SclPackage.REPORT_SETTINGS__RESV_TMS:
-                return getResvTms();
-            case SclPackage.REPORT_SETTINGS__RPT_ID:
-                return getRptID();
-            case SclPackage.REPORT_SETTINGS__TRG_OPS:
-                return getTrgOps();
-            case SclPackage.REPORT_SETTINGS__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.REPORT_SETTINGS__BUF_TIME:
+            return getBufTime();
+        case SclPackage.REPORT_SETTINGS__INTG_PD:
+            return getIntgPd();
+        case SclPackage.REPORT_SETTINGS__OPT_FIELDS:
+            return getOptFields();
+        case SclPackage.REPORT_SETTINGS__OWNER:
+            return getOwner();
+        case SclPackage.REPORT_SETTINGS__RESV_TMS:
+            return getResvTms();
+        case SclPackage.REPORT_SETTINGS__RPT_ID:
+            return getRptID();
+        case SclPackage.REPORT_SETTINGS__TRG_OPS:
+            return getTrgOps();
+        case SclPackage.REPORT_SETTINGS__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -747,33 +767,33 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.REPORT_SETTINGS__BUF_TIME:
-                setBufTime((ServiceSettingsEnum)newValue);
-                return;
-            case SclPackage.REPORT_SETTINGS__INTG_PD:
-                setIntgPd((ServiceSettingsEnum)newValue);
-                return;
-            case SclPackage.REPORT_SETTINGS__OPT_FIELDS:
-                setOptFields((ServiceSettingsEnum)newValue);
-                return;
-            case SclPackage.REPORT_SETTINGS__OWNER:
-                setOwner((Boolean)newValue);
-                return;
-            case SclPackage.REPORT_SETTINGS__RESV_TMS:
-                setResvTms((Boolean)newValue);
-                return;
-            case SclPackage.REPORT_SETTINGS__RPT_ID:
-                setRptID((ServiceSettingsEnum)newValue);
-                return;
-            case SclPackage.REPORT_SETTINGS__TRG_OPS:
-                setTrgOps((ServiceSettingsEnum)newValue);
-                return;
-            case SclPackage.REPORT_SETTINGS__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.REPORT_SETTINGS__BUF_TIME:
+            setBufTime( ( ServiceSettingsEnum ) newValue );
+            return;
+        case SclPackage.REPORT_SETTINGS__INTG_PD:
+            setIntgPd( ( ServiceSettingsEnum ) newValue );
+            return;
+        case SclPackage.REPORT_SETTINGS__OPT_FIELDS:
+            setOptFields( ( ServiceSettingsEnum ) newValue );
+            return;
+        case SclPackage.REPORT_SETTINGS__OWNER:
+            setOwner( ( Boolean ) newValue );
+            return;
+        case SclPackage.REPORT_SETTINGS__RESV_TMS:
+            setResvTms( ( Boolean ) newValue );
+            return;
+        case SclPackage.REPORT_SETTINGS__RPT_ID:
+            setRptID( ( ServiceSettingsEnum ) newValue );
+            return;
+        case SclPackage.REPORT_SETTINGS__TRG_OPS:
+            setTrgOps( ( ServiceSettingsEnum ) newValue );
+            return;
+        case SclPackage.REPORT_SETTINGS__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -783,33 +803,33 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.REPORT_SETTINGS__BUF_TIME:
-                unsetBufTime();
-                return;
-            case SclPackage.REPORT_SETTINGS__INTG_PD:
-                unsetIntgPd();
-                return;
-            case SclPackage.REPORT_SETTINGS__OPT_FIELDS:
-                unsetOptFields();
-                return;
-            case SclPackage.REPORT_SETTINGS__OWNER:
-                unsetOwner();
-                return;
-            case SclPackage.REPORT_SETTINGS__RESV_TMS:
-                unsetResvTms();
-                return;
-            case SclPackage.REPORT_SETTINGS__RPT_ID:
-                unsetRptID();
-                return;
-            case SclPackage.REPORT_SETTINGS__TRG_OPS:
-                unsetTrgOps();
-                return;
-            case SclPackage.REPORT_SETTINGS__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.REPORT_SETTINGS__BUF_TIME:
+            unsetBufTime();
+            return;
+        case SclPackage.REPORT_SETTINGS__INTG_PD:
+            unsetIntgPd();
+            return;
+        case SclPackage.REPORT_SETTINGS__OPT_FIELDS:
+            unsetOptFields();
+            return;
+        case SclPackage.REPORT_SETTINGS__OWNER:
+            unsetOwner();
+            return;
+        case SclPackage.REPORT_SETTINGS__RESV_TMS:
+            unsetResvTms();
+            return;
+        case SclPackage.REPORT_SETTINGS__RPT_ID:
+            unsetRptID();
+            return;
+        case SclPackage.REPORT_SETTINGS__TRG_OPS:
+            unsetTrgOps();
+            return;
+        case SclPackage.REPORT_SETTINGS__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -819,25 +839,25 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.REPORT_SETTINGS__BUF_TIME:
-                return isSetBufTime();
-            case SclPackage.REPORT_SETTINGS__INTG_PD:
-                return isSetIntgPd();
-            case SclPackage.REPORT_SETTINGS__OPT_FIELDS:
-                return isSetOptFields();
-            case SclPackage.REPORT_SETTINGS__OWNER:
-                return isSetOwner();
-            case SclPackage.REPORT_SETTINGS__RESV_TMS:
-                return isSetResvTms();
-            case SclPackage.REPORT_SETTINGS__RPT_ID:
-                return isSetRptID();
-            case SclPackage.REPORT_SETTINGS__TRG_OPS:
-                return isSetTrgOps();
-            case SclPackage.REPORT_SETTINGS__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.REPORT_SETTINGS__BUF_TIME:
+            return isSetBufTime();
+        case SclPackage.REPORT_SETTINGS__INTG_PD:
+            return isSetIntgPd();
+        case SclPackage.REPORT_SETTINGS__OPT_FIELDS:
+            return isSetOptFields();
+        case SclPackage.REPORT_SETTINGS__OWNER:
+            return isSetOwner();
+        case SclPackage.REPORT_SETTINGS__RESV_TMS:
+            return isSetResvTms();
+        case SclPackage.REPORT_SETTINGS__RPT_ID:
+            return isSetRptID();
+        case SclPackage.REPORT_SETTINGS__TRG_OPS:
+            return isSetTrgOps();
+        case SclPackage.REPORT_SETTINGS__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -847,24 +867,45 @@ public class ReportSettingsImpl extends ServiceSettingsImpl implements ReportSet
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (bufTime: ");
-        if (bufTimeESet) result.append(bufTime); else result.append("<unset>");
-        result.append(", intgPd: ");
-        if (intgPdESet) result.append(intgPd); else result.append("<unset>");
-        result.append(", optFields: ");
-        if (optFieldsESet) result.append(optFields); else result.append("<unset>");
-        result.append(", owner: ");
-        if (ownerESet) result.append(owner); else result.append("<unset>");
-        result.append(", resvTms: ");
-        if (resvTmsESet) result.append(resvTms); else result.append("<unset>");
-        result.append(", rptID: ");
-        if (rptIDESet) result.append(rptID); else result.append("<unset>");
-        result.append(", trgOps: ");
-        if (trgOpsESet) result.append(trgOps); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (bufTime: " );
+        if( bufTimeESet )
+            result.append( bufTime );
+        else
+            result.append( "<unset>" );
+        result.append( ", intgPd: " );
+        if( intgPdESet )
+            result.append( intgPd );
+        else
+            result.append( "<unset>" );
+        result.append( ", optFields: " );
+        if( optFieldsESet )
+            result.append( optFields );
+        else
+            result.append( "<unset>" );
+        result.append( ", owner: " );
+        if( ownerESet )
+            result.append( owner );
+        else
+            result.append( "<unset>" );
+        result.append( ", resvTms: " );
+        if( resvTmsESet )
+            result.append( resvTms );
+        else
+            result.append( "<unset>" );
+        result.append( ", rptID: " );
+        if( rptIDESet )
+            result.append( rptID );
+        else
+            result.append( "<unset>" );
+        result.append( ", trgOps: " );
+        if( trgOpsESet )
+            result.append( trgOps );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/RptEnabledImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/RptEnabledImpl.java
index 4455940..89f6ed6 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/RptEnabledImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/RptEnabledImpl.java
@@ -89,7 +89,7 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
      * @generated
      * @ordered
      */
-    protected EList<ClientLN> clientLN;
+    protected EList< ClientLN > clientLN;
 
     /**
      * <!-- begin-user-doc -->
@@ -131,8 +131,9 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
         max = newMax;
         boolean oldMaxESet = maxESet;
         maxESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.RPT_ENABLED__MAX, oldMax, max, !oldMaxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.RPT_ENABLED__MAX, oldMax, max,
+                    !oldMaxESet ) );
     }
 
     /**
@@ -146,8 +147,9 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
         boolean oldMaxESet = maxESet;
         max = MAX_EDEFAULT;
         maxESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.RPT_ENABLED__MAX, oldMax, MAX_EDEFAULT, oldMaxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.RPT_ENABLED__MAX, oldMax, MAX_EDEFAULT,
+                    oldMaxESet ) );
     }
 
     /**
@@ -166,9 +168,10 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
      * @generated
      */
     @Override
-    public EList<ClientLN> getClientLN() {
-        if (clientLN == null) {
-            clientLN = new EObjectContainmentWithInverseEList.Unsettable<ClientLN>(ClientLN.class, this, SclPackage.RPT_ENABLED__CLIENT_LN, SclPackage.CLIENT_LN__PARENT_RPT_ENABLED);
+    public EList< ClientLN > getClientLN() {
+        if( clientLN == null ) {
+            clientLN = new EObjectContainmentWithInverseEList.Unsettable< ClientLN >( ClientLN.class, this,
+                    SclPackage.RPT_ENABLED__CLIENT_LN, SclPackage.CLIENT_LN__PARENT_RPT_ENABLED );
         }
         return clientLN;
     }
@@ -180,7 +183,7 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
      */
     @Override
     public void unsetClientLN() {
-        if (clientLN != null) ((InternalEList.Unsettable<?>)clientLN).unset();
+        if( clientLN != null ) ( ( InternalEList.Unsettable< ? > ) clientLN ).unset();
     }
 
     /**
@@ -190,7 +193,7 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
      */
     @Override
     public boolean isSetClientLN() {
-        return clientLN != null && ((InternalEList.Unsettable<?>)clientLN).isSet();
+        return clientLN != null && ( ( InternalEList.Unsettable< ? > ) clientLN ).isSet();
     }
 
     /**
@@ -200,8 +203,8 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
      */
     @Override
     public ReportControl getParentReportControl() {
-        if (eContainerFeatureID() != SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL) return null;
-        return (ReportControl)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL ) return null;
+        return ( ReportControl ) eInternalContainer();
     }
 
     /**
@@ -209,8 +212,10 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentReportControl(ReportControl newParentReportControl, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentReportControl, SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL, msgs);
+    public NotificationChain basicSetParentReportControl( ReportControl newParentReportControl,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentReportControl,
+                SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL, msgs );
         return msgs;
     }
 
@@ -220,20 +225,24 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
      * @generated
      */
     @Override
-    public void setParentReportControl(ReportControl newParentReportControl) {
-        if (newParentReportControl != eInternalContainer() || (eContainerFeatureID() != SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL && newParentReportControl != null)) {
-            if (EcoreUtil.isAncestor(this, newParentReportControl))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentReportControl( ReportControl newParentReportControl ) {
+        if( newParentReportControl != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL
+                        && newParentReportControl != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentReportControl ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentReportControl != null)
-                msgs = ((InternalEObject)newParentReportControl).eInverseAdd(this, SclPackage.REPORT_CONTROL__RPT_ENABLED, ReportControl.class, msgs);
-            msgs = basicSetParentReportControl(newParentReportControl, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentReportControl != null )
+                msgs = ( ( InternalEObject ) newParentReportControl ).eInverseAdd( this,
+                        SclPackage.REPORT_CONTROL__RPT_ENABLED, ReportControl.class, msgs );
+            msgs = basicSetParentReportControl( newParentReportControl, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL, newParentReportControl, newParentReportControl));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL,
+                    newParentReportControl, newParentReportControl ) );
     }
 
     /**
@@ -244,15 +253,16 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.RPT_ENABLED__CLIENT_LN:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getClientLN()).basicAdd(otherEnd, msgs);
-            case SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentReportControl((ReportControl)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.RPT_ENABLED__CLIENT_LN:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getClientLN() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentReportControl( ( ReportControl ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -262,13 +272,13 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.RPT_ENABLED__CLIENT_LN:
-                return ((InternalEList<?>)getClientLN()).basicRemove(otherEnd, msgs);
-            case SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL:
-                return basicSetParentReportControl(null, msgs);
+        switch( featureID ) {
+        case SclPackage.RPT_ENABLED__CLIENT_LN:
+            return ( ( InternalEList< ? > ) getClientLN() ).basicRemove( otherEnd, msgs );
+        case SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL:
+            return basicSetParentReportControl( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -278,11 +288,12 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL:
-                return eInternalContainer().eInverseRemove(this, SclPackage.REPORT_CONTROL__RPT_ENABLED, ReportControl.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL:
+            return eInternalContainer().eInverseRemove( this, SclPackage.REPORT_CONTROL__RPT_ENABLED,
+                    ReportControl.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -292,15 +303,15 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.RPT_ENABLED__MAX:
-                return getMax();
-            case SclPackage.RPT_ENABLED__CLIENT_LN:
-                return getClientLN();
-            case SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL:
-                return getParentReportControl();
+        switch( featureID ) {
+        case SclPackage.RPT_ENABLED__MAX:
+            return getMax();
+        case SclPackage.RPT_ENABLED__CLIENT_LN:
+            return getClientLN();
+        case SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL:
+            return getParentReportControl();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -311,19 +322,19 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.RPT_ENABLED__MAX:
-                setMax((Integer)newValue);
-                return;
-            case SclPackage.RPT_ENABLED__CLIENT_LN:
-                getClientLN().clear();
-                getClientLN().addAll((Collection<? extends ClientLN>)newValue);
-                return;
-            case SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL:
-                setParentReportControl((ReportControl)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.RPT_ENABLED__MAX:
+            setMax( ( Integer ) newValue );
+            return;
+        case SclPackage.RPT_ENABLED__CLIENT_LN:
+            getClientLN().clear();
+            getClientLN().addAll( ( Collection< ? extends ClientLN > ) newValue );
+            return;
+        case SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL:
+            setParentReportControl( ( ReportControl ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -333,18 +344,18 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.RPT_ENABLED__MAX:
-                unsetMax();
-                return;
-            case SclPackage.RPT_ENABLED__CLIENT_LN:
-                unsetClientLN();
-                return;
-            case SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL:
-                setParentReportControl((ReportControl)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.RPT_ENABLED__MAX:
+            unsetMax();
+            return;
+        case SclPackage.RPT_ENABLED__CLIENT_LN:
+            unsetClientLN();
+            return;
+        case SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL:
+            setParentReportControl( ( ReportControl ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -354,15 +365,15 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.RPT_ENABLED__MAX:
-                return isSetMax();
-            case SclPackage.RPT_ENABLED__CLIENT_LN:
-                return isSetClientLN();
-            case SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL:
-                return getParentReportControl() != null;
+        switch( featureID ) {
+        case SclPackage.RPT_ENABLED__MAX:
+            return isSetMax();
+        case SclPackage.RPT_ENABLED__CLIENT_LN:
+            return isSetClientLN();
+        case SclPackage.RPT_ENABLED__PARENT_REPORT_CONTROL:
+            return getParentReportControl() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -372,12 +383,15 @@ public class RptEnabledImpl extends UnNamingImpl implements RptEnabled {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (max: ");
-        if (maxESet) result.append(max); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (max: " );
+        if( maxESet )
+            result.append( max );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SCLImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SCLImpl.java
index 6dbc5bd..86148b8 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SCLImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SCLImpl.java
@@ -147,7 +147,7 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      * @generated
      * @ordered
      */
-    protected EList<Line> line;
+    protected EList< Line > line;
 
     /**
      * The cached value of the '{@link #getProcess() <em>Process</em>}' containment reference list.
@@ -157,7 +157,7 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      * @generated
      * @ordered
      */
-    protected EList<fr.centralesupelec.edf.riseclipse.iec61850.scl.Process> process;
+    protected EList< fr.centralesupelec.edf.riseclipse.iec61850.scl.Process > process;
 
     /**
      * The cached value of the '{@link #getIED() <em>IED</em>}' containment reference list.
@@ -167,7 +167,7 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      * @generated
      * @ordered
      */
-    protected EList<IED> ied;
+    protected EList< IED > ied;
 
     /**
      * The cached value of the '{@link #getDataTypeTemplates() <em>Data Type Templates</em>}' containment reference.
@@ -215,7 +215,7 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      * @generated
      * @ordered
      */
-    protected EList<Substation> substation;
+    protected EList< Substation > substation;
 
     /**
      * The default value of the '{@link #getRelease() <em>Release</em>}' attribute.
@@ -286,8 +286,9 @@ public class SCLImpl extends BaseElementImpl implements SCL {
         revision = newRevision;
         boolean oldRevisionESet = revisionESet;
         revisionESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SCL__REVISION, oldRevision, revision, !oldRevisionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SCL__REVISION, oldRevision, revision,
+                    !oldRevisionESet ) );
     }
 
     /**
@@ -301,8 +302,9 @@ public class SCLImpl extends BaseElementImpl implements SCL {
         boolean oldRevisionESet = revisionESet;
         revision = REVISION_EDEFAULT;
         revisionESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SCL__REVISION, oldRevision, REVISION_EDEFAULT, oldRevisionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SCL__REVISION, oldRevision,
+                    REVISION_EDEFAULT, oldRevisionESet ) );
     }
 
     /**
@@ -336,8 +338,9 @@ public class SCLImpl extends BaseElementImpl implements SCL {
         version = newVersion;
         boolean oldVersionESet = versionESet;
         versionESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SCL__VERSION, oldVersion, version, !oldVersionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SCL__VERSION, oldVersion, version,
+                    !oldVersionESet ) );
     }
 
     /**
@@ -351,8 +354,9 @@ public class SCLImpl extends BaseElementImpl implements SCL {
         boolean oldVersionESet = versionESet;
         version = VERSION_EDEFAULT;
         versionESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SCL__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SCL__VERSION, oldVersion,
+                    VERSION_EDEFAULT, oldVersionESet ) );
     }
 
     /**
@@ -385,9 +389,13 @@ public class SCLImpl extends BaseElementImpl implements SCL {
         header = newHeader;
         boolean oldHeaderESet = headerESet;
         headerESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SCL__HEADER, oldHeader, newHeader, !oldHeaderESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.SCL__HEADER,
+                    oldHeader, newHeader, !oldHeaderESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -399,20 +407,23 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public void setHeader( Header newHeader ) {
-        if (newHeader != header) {
+        if( newHeader != header ) {
             NotificationChain msgs = null;
-            if (header != null)
-                msgs = ((InternalEObject)header).eInverseRemove(this, SclPackage.HEADER__PARENT_SCL, Header.class, msgs);
-            if (newHeader != null)
-                msgs = ((InternalEObject)newHeader).eInverseAdd(this, SclPackage.HEADER__PARENT_SCL, Header.class, msgs);
-            msgs = basicSetHeader(newHeader, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( header != null )
+                msgs = ( ( InternalEObject ) header ).eInverseRemove( this, SclPackage.HEADER__PARENT_SCL, Header.class,
+                        msgs );
+            if( newHeader != null )
+                msgs = ( ( InternalEObject ) newHeader ).eInverseAdd( this, SclPackage.HEADER__PARENT_SCL, Header.class,
+                        msgs );
+            msgs = basicSetHeader( newHeader, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldHeaderESet = headerESet;
             headerESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SCL__HEADER, newHeader, newHeader, !oldHeaderESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SCL__HEADER, newHeader, newHeader,
+                        !oldHeaderESet ) );
         }
     }
 
@@ -426,9 +437,13 @@ public class SCLImpl extends BaseElementImpl implements SCL {
         header = null;
         boolean oldHeaderESet = headerESet;
         headerESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SCL__HEADER, oldHeader, null, oldHeaderESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.SCL__HEADER,
+                    oldHeader, null, oldHeaderESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -440,17 +455,19 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public void unsetHeader() {
-        if (header != null) {
+        if( header != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)header).eInverseRemove(this, SclPackage.HEADER__PARENT_SCL, Header.class, msgs);
-            msgs = basicUnsetHeader(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) header ).eInverseRemove( this, SclPackage.HEADER__PARENT_SCL, Header.class,
+                    msgs );
+            msgs = basicUnsetHeader( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldHeaderESet = headerESet;
             headerESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SCL__HEADER, null, null, oldHeaderESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SCL__HEADER, null, null,
+                        oldHeaderESet ) );
         }
     }
 
@@ -470,9 +487,10 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      * @generated
      */
     @Override
-    public EList<Line> getLine() {
-        if (line == null) {
-            line = new EObjectContainmentWithInverseEList.Unsettable<Line>(Line.class, this, SclPackage.SCL__LINE, SclPackage.LINE__PARENT_SCL);
+    public EList< Line > getLine() {
+        if( line == null ) {
+            line = new EObjectContainmentWithInverseEList.Unsettable< Line >( Line.class, this, SclPackage.SCL__LINE,
+                    SclPackage.LINE__PARENT_SCL );
         }
         return line;
     }
@@ -484,7 +502,7 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public void unsetLine() {
-        if (line != null) ((InternalEList.Unsettable<?>)line).unset();
+        if( line != null ) ( ( InternalEList.Unsettable< ? > ) line ).unset();
     }
 
     /**
@@ -494,7 +512,7 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public boolean isSetLine() {
-        return line != null && ((InternalEList.Unsettable<?>)line).isSet();
+        return line != null && ( ( InternalEList.Unsettable< ? > ) line ).isSet();
     }
 
     /**
@@ -503,9 +521,11 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      * @generated
      */
     @Override
-    public EList<fr.centralesupelec.edf.riseclipse.iec61850.scl.Process> getProcess() {
-        if (process == null) {
-            process = new EObjectContainmentWithInverseEList.Unsettable<fr.centralesupelec.edf.riseclipse.iec61850.scl.Process>(fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, this, SclPackage.SCL__PROCESS, SclPackage.PROCESS__PARENT_SCL);
+    public EList< fr.centralesupelec.edf.riseclipse.iec61850.scl.Process > getProcess() {
+        if( process == null ) {
+            process = new EObjectContainmentWithInverseEList.Unsettable< fr.centralesupelec.edf.riseclipse.iec61850.scl.Process >(
+                    fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, this, SclPackage.SCL__PROCESS,
+                    SclPackage.PROCESS__PARENT_SCL );
         }
         return process;
     }
@@ -517,7 +537,7 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public void unsetProcess() {
-        if (process != null) ((InternalEList.Unsettable<?>)process).unset();
+        if( process != null ) ( ( InternalEList.Unsettable< ? > ) process ).unset();
     }
 
     /**
@@ -527,7 +547,7 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public boolean isSetProcess() {
-        return process != null && ((InternalEList.Unsettable<?>)process).isSet();
+        return process != null && ( ( InternalEList.Unsettable< ? > ) process ).isSet();
     }
 
     /**
@@ -536,9 +556,10 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      * @generated
      */
     @Override
-    public EList<IED> getIED() {
-        if (ied == null) {
-            ied = new EObjectContainmentWithInverseEList.Unsettable<IED>(IED.class, this, SclPackage.SCL__IED, SclPackage.IED__PARENT_SCL);
+    public EList< IED > getIED() {
+        if( ied == null ) {
+            ied = new EObjectContainmentWithInverseEList.Unsettable< IED >( IED.class, this, SclPackage.SCL__IED,
+                    SclPackage.IED__PARENT_SCL );
         }
         return ied;
     }
@@ -550,7 +571,7 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public void unsetIED() {
-        if (ied != null) ((InternalEList.Unsettable<?>)ied).unset();
+        if( ied != null ) ( ( InternalEList.Unsettable< ? > ) ied ).unset();
     }
 
     /**
@@ -560,7 +581,7 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public boolean isSetIED() {
-        return ied != null && ((InternalEList.Unsettable<?>)ied).isSet();
+        return ied != null && ( ( InternalEList.Unsettable< ? > ) ied ).isSet();
     }
 
     /**
@@ -578,14 +599,20 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetDataTypeTemplates( DataTypeTemplates newDataTypeTemplates, NotificationChain msgs ) {
+    public NotificationChain basicSetDataTypeTemplates( DataTypeTemplates newDataTypeTemplates,
+            NotificationChain msgs ) {
         DataTypeTemplates oldDataTypeTemplates = dataTypeTemplates;
         dataTypeTemplates = newDataTypeTemplates;
         boolean oldDataTypeTemplatesESet = dataTypeTemplatesESet;
         dataTypeTemplatesESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SCL__DATA_TYPE_TEMPLATES, oldDataTypeTemplates, newDataTypeTemplates, !oldDataTypeTemplatesESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SCL__DATA_TYPE_TEMPLATES, oldDataTypeTemplates, newDataTypeTemplates,
+                    !oldDataTypeTemplatesESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -597,20 +624,23 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public void setDataTypeTemplates( DataTypeTemplates newDataTypeTemplates ) {
-        if (newDataTypeTemplates != dataTypeTemplates) {
+        if( newDataTypeTemplates != dataTypeTemplates ) {
             NotificationChain msgs = null;
-            if (dataTypeTemplates != null)
-                msgs = ((InternalEObject)dataTypeTemplates).eInverseRemove(this, SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL, DataTypeTemplates.class, msgs);
-            if (newDataTypeTemplates != null)
-                msgs = ((InternalEObject)newDataTypeTemplates).eInverseAdd(this, SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL, DataTypeTemplates.class, msgs);
-            msgs = basicSetDataTypeTemplates(newDataTypeTemplates, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( dataTypeTemplates != null )
+                msgs = ( ( InternalEObject ) dataTypeTemplates ).eInverseRemove( this,
+                        SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL, DataTypeTemplates.class, msgs );
+            if( newDataTypeTemplates != null )
+                msgs = ( ( InternalEObject ) newDataTypeTemplates ).eInverseAdd( this,
+                        SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL, DataTypeTemplates.class, msgs );
+            msgs = basicSetDataTypeTemplates( newDataTypeTemplates, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldDataTypeTemplatesESet = dataTypeTemplatesESet;
             dataTypeTemplatesESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SCL__DATA_TYPE_TEMPLATES, newDataTypeTemplates, newDataTypeTemplates, !oldDataTypeTemplatesESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SCL__DATA_TYPE_TEMPLATES,
+                        newDataTypeTemplates, newDataTypeTemplates, !oldDataTypeTemplatesESet ) );
         }
     }
 
@@ -624,9 +654,13 @@ public class SCLImpl extends BaseElementImpl implements SCL {
         dataTypeTemplates = null;
         boolean oldDataTypeTemplatesESet = dataTypeTemplatesESet;
         dataTypeTemplatesESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SCL__DATA_TYPE_TEMPLATES, oldDataTypeTemplates, null, oldDataTypeTemplatesESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SCL__DATA_TYPE_TEMPLATES, oldDataTypeTemplates, null, oldDataTypeTemplatesESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -638,17 +672,19 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public void unsetDataTypeTemplates() {
-        if (dataTypeTemplates != null) {
+        if( dataTypeTemplates != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)dataTypeTemplates).eInverseRemove(this, SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL, DataTypeTemplates.class, msgs);
-            msgs = basicUnsetDataTypeTemplates(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) dataTypeTemplates ).eInverseRemove( this,
+                    SclPackage.DATA_TYPE_TEMPLATES__PARENT_SCL, DataTypeTemplates.class, msgs );
+            msgs = basicUnsetDataTypeTemplates( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldDataTypeTemplatesESet = dataTypeTemplatesESet;
             dataTypeTemplatesESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SCL__DATA_TYPE_TEMPLATES, null, null, oldDataTypeTemplatesESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SCL__DATA_TYPE_TEMPLATES, null,
+                        null, oldDataTypeTemplatesESet ) );
         }
     }
 
@@ -682,9 +718,13 @@ public class SCLImpl extends BaseElementImpl implements SCL {
         communication = newCommunication;
         boolean oldCommunicationESet = communicationESet;
         communicationESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SCL__COMMUNICATION, oldCommunication, newCommunication, !oldCommunicationESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SCL__COMMUNICATION, oldCommunication, newCommunication, !oldCommunicationESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -696,20 +736,23 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public void setCommunication( Communication newCommunication ) {
-        if (newCommunication != communication) {
+        if( newCommunication != communication ) {
             NotificationChain msgs = null;
-            if (communication != null)
-                msgs = ((InternalEObject)communication).eInverseRemove(this, SclPackage.COMMUNICATION__PARENT_SCL, Communication.class, msgs);
-            if (newCommunication != null)
-                msgs = ((InternalEObject)newCommunication).eInverseAdd(this, SclPackage.COMMUNICATION__PARENT_SCL, Communication.class, msgs);
-            msgs = basicSetCommunication(newCommunication, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( communication != null )
+                msgs = ( ( InternalEObject ) communication ).eInverseRemove( this, SclPackage.COMMUNICATION__PARENT_SCL,
+                        Communication.class, msgs );
+            if( newCommunication != null )
+                msgs = ( ( InternalEObject ) newCommunication ).eInverseAdd( this, SclPackage.COMMUNICATION__PARENT_SCL,
+                        Communication.class, msgs );
+            msgs = basicSetCommunication( newCommunication, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldCommunicationESet = communicationESet;
             communicationESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SCL__COMMUNICATION, newCommunication, newCommunication, !oldCommunicationESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SCL__COMMUNICATION, newCommunication,
+                        newCommunication, !oldCommunicationESet ) );
         }
     }
 
@@ -723,9 +766,13 @@ public class SCLImpl extends BaseElementImpl implements SCL {
         communication = null;
         boolean oldCommunicationESet = communicationESet;
         communicationESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SCL__COMMUNICATION, oldCommunication, null, oldCommunicationESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SCL__COMMUNICATION, oldCommunication, null, oldCommunicationESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -737,17 +784,19 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public void unsetCommunication() {
-        if (communication != null) {
+        if( communication != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)communication).eInverseRemove(this, SclPackage.COMMUNICATION__PARENT_SCL, Communication.class, msgs);
-            msgs = basicUnsetCommunication(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) communication ).eInverseRemove( this, SclPackage.COMMUNICATION__PARENT_SCL,
+                    Communication.class, msgs );
+            msgs = basicUnsetCommunication( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldCommunicationESet = communicationESet;
             communicationESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SCL__COMMUNICATION, null, null, oldCommunicationESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SCL__COMMUNICATION, null, null,
+                        oldCommunicationESet ) );
         }
     }
 
@@ -767,9 +816,10 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      * @generated
      */
     @Override
-    public EList<Substation> getSubstation() {
-        if (substation == null) {
-            substation = new EObjectContainmentWithInverseEList.Unsettable<Substation>(Substation.class, this, SclPackage.SCL__SUBSTATION, SclPackage.SUBSTATION__PARENT_SCL);
+    public EList< Substation > getSubstation() {
+        if( substation == null ) {
+            substation = new EObjectContainmentWithInverseEList.Unsettable< Substation >( Substation.class, this,
+                    SclPackage.SCL__SUBSTATION, SclPackage.SUBSTATION__PARENT_SCL );
         }
         return substation;
     }
@@ -781,7 +831,7 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public void unsetSubstation() {
-        if (substation != null) ((InternalEList.Unsettable<?>)substation).unset();
+        if( substation != null ) ( ( InternalEList.Unsettable< ? > ) substation ).unset();
     }
 
     /**
@@ -791,7 +841,7 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public boolean isSetSubstation() {
-        return substation != null && ((InternalEList.Unsettable<?>)substation).isSet();
+        return substation != null && ( ( InternalEList.Unsettable< ? > ) substation ).isSet();
     }
 
     /**
@@ -810,13 +860,14 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      * @generated
      */
     @Override
-    public void setRelease(Integer newRelease) {
+    public void setRelease( Integer newRelease ) {
         Integer oldRelease = release;
         release = newRelease;
         boolean oldReleaseESet = releaseESet;
         releaseESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SCL__RELEASE, oldRelease, release, !oldReleaseESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SCL__RELEASE, oldRelease, release,
+                    !oldReleaseESet ) );
     }
 
     /**
@@ -830,8 +881,9 @@ public class SCLImpl extends BaseElementImpl implements SCL {
         boolean oldReleaseESet = releaseESet;
         release = RELEASE_EDEFAULT;
         releaseESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SCL__RELEASE, oldRelease, RELEASE_EDEFAULT, oldReleaseESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SCL__RELEASE, oldRelease,
+                    RELEASE_EDEFAULT, oldReleaseESet ) );
     }
 
     /**
@@ -852,29 +904,34 @@ public class SCLImpl extends BaseElementImpl implements SCL {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SCL__HEADER:
-                if (header != null)
-                    msgs = ((InternalEObject)header).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SCL__HEADER, null, msgs);
-                return basicSetHeader((Header)otherEnd, msgs);
-            case SclPackage.SCL__LINE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getLine()).basicAdd(otherEnd, msgs);
-            case SclPackage.SCL__PROCESS:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getProcess()).basicAdd(otherEnd, msgs);
-            case SclPackage.SCL__IED:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getIED()).basicAdd(otherEnd, msgs);
-            case SclPackage.SCL__DATA_TYPE_TEMPLATES:
-                if (dataTypeTemplates != null)
-                    msgs = ((InternalEObject)dataTypeTemplates).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SCL__DATA_TYPE_TEMPLATES, null, msgs);
-                return basicSetDataTypeTemplates((DataTypeTemplates)otherEnd, msgs);
-            case SclPackage.SCL__COMMUNICATION:
-                if (communication != null)
-                    msgs = ((InternalEObject)communication).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SCL__COMMUNICATION, null, msgs);
-                return basicSetCommunication((Communication)otherEnd, msgs);
-            case SclPackage.SCL__SUBSTATION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSubstation()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SCL__HEADER:
+            if( header != null )
+                msgs = ( ( InternalEObject ) header ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SCL__HEADER, null, msgs );
+            return basicSetHeader( ( Header ) otherEnd, msgs );
+        case SclPackage.SCL__LINE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getLine() ).basicAdd( otherEnd, msgs );
+        case SclPackage.SCL__PROCESS:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getProcess() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.SCL__IED:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getIED() ).basicAdd( otherEnd, msgs );
+        case SclPackage.SCL__DATA_TYPE_TEMPLATES:
+            if( dataTypeTemplates != null )
+                msgs = ( ( InternalEObject ) dataTypeTemplates ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SCL__DATA_TYPE_TEMPLATES, null, msgs );
+            return basicSetDataTypeTemplates( ( DataTypeTemplates ) otherEnd, msgs );
+        case SclPackage.SCL__COMMUNICATION:
+            if( communication != null )
+                msgs = ( ( InternalEObject ) communication ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SCL__COMMUNICATION, null, msgs );
+            return basicSetCommunication( ( Communication ) otherEnd, msgs );
+        case SclPackage.SCL__SUBSTATION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSubstation() ).basicAdd( otherEnd,
+                    msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -884,23 +941,23 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SCL__HEADER:
-                return basicUnsetHeader(msgs);
-            case SclPackage.SCL__LINE:
-                return ((InternalEList<?>)getLine()).basicRemove(otherEnd, msgs);
-            case SclPackage.SCL__PROCESS:
-                return ((InternalEList<?>)getProcess()).basicRemove(otherEnd, msgs);
-            case SclPackage.SCL__IED:
-                return ((InternalEList<?>)getIED()).basicRemove(otherEnd, msgs);
-            case SclPackage.SCL__DATA_TYPE_TEMPLATES:
-                return basicUnsetDataTypeTemplates(msgs);
-            case SclPackage.SCL__COMMUNICATION:
-                return basicUnsetCommunication(msgs);
-            case SclPackage.SCL__SUBSTATION:
-                return ((InternalEList<?>)getSubstation()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SCL__HEADER:
+            return basicUnsetHeader( msgs );
+        case SclPackage.SCL__LINE:
+            return ( ( InternalEList< ? > ) getLine() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SCL__PROCESS:
+            return ( ( InternalEList< ? > ) getProcess() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SCL__IED:
+            return ( ( InternalEList< ? > ) getIED() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SCL__DATA_TYPE_TEMPLATES:
+            return basicUnsetDataTypeTemplates( msgs );
+        case SclPackage.SCL__COMMUNICATION:
+            return basicUnsetCommunication( msgs );
+        case SclPackage.SCL__SUBSTATION:
+            return ( ( InternalEList< ? > ) getSubstation() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -910,29 +967,29 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SCL__REVISION:
-                return getRevision();
-            case SclPackage.SCL__VERSION:
-                return getVersion();
-            case SclPackage.SCL__HEADER:
-                return getHeader();
-            case SclPackage.SCL__LINE:
-                return getLine();
-            case SclPackage.SCL__PROCESS:
-                return getProcess();
-            case SclPackage.SCL__IED:
-                return getIED();
-            case SclPackage.SCL__DATA_TYPE_TEMPLATES:
-                return getDataTypeTemplates();
-            case SclPackage.SCL__COMMUNICATION:
-                return getCommunication();
-            case SclPackage.SCL__SUBSTATION:
-                return getSubstation();
-            case SclPackage.SCL__RELEASE:
-                return getRelease();
+        switch( featureID ) {
+        case SclPackage.SCL__REVISION:
+            return getRevision();
+        case SclPackage.SCL__VERSION:
+            return getVersion();
+        case SclPackage.SCL__HEADER:
+            return getHeader();
+        case SclPackage.SCL__LINE:
+            return getLine();
+        case SclPackage.SCL__PROCESS:
+            return getProcess();
+        case SclPackage.SCL__IED:
+            return getIED();
+        case SclPackage.SCL__DATA_TYPE_TEMPLATES:
+            return getDataTypeTemplates();
+        case SclPackage.SCL__COMMUNICATION:
+            return getCommunication();
+        case SclPackage.SCL__SUBSTATION:
+            return getSubstation();
+        case SclPackage.SCL__RELEASE:
+            return getRelease();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -943,43 +1000,44 @@ public class SCLImpl extends BaseElementImpl implements SCL {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SCL__REVISION:
-                setRevision((String)newValue);
-                return;
-            case SclPackage.SCL__VERSION:
-                setVersion((String)newValue);
-                return;
-            case SclPackage.SCL__HEADER:
-                setHeader((Header)newValue);
-                return;
-            case SclPackage.SCL__LINE:
-                getLine().clear();
-                getLine().addAll((Collection<? extends Line>)newValue);
-                return;
-            case SclPackage.SCL__PROCESS:
-                getProcess().clear();
-                getProcess().addAll((Collection<? extends fr.centralesupelec.edf.riseclipse.iec61850.scl.Process>)newValue);
-                return;
-            case SclPackage.SCL__IED:
-                getIED().clear();
-                getIED().addAll((Collection<? extends IED>)newValue);
-                return;
-            case SclPackage.SCL__DATA_TYPE_TEMPLATES:
-                setDataTypeTemplates((DataTypeTemplates)newValue);
-                return;
-            case SclPackage.SCL__COMMUNICATION:
-                setCommunication((Communication)newValue);
-                return;
-            case SclPackage.SCL__SUBSTATION:
-                getSubstation().clear();
-                getSubstation().addAll((Collection<? extends Substation>)newValue);
-                return;
-            case SclPackage.SCL__RELEASE:
-                setRelease((Integer)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SCL__REVISION:
+            setRevision( ( String ) newValue );
+            return;
+        case SclPackage.SCL__VERSION:
+            setVersion( ( String ) newValue );
+            return;
+        case SclPackage.SCL__HEADER:
+            setHeader( ( Header ) newValue );
+            return;
+        case SclPackage.SCL__LINE:
+            getLine().clear();
+            getLine().addAll( ( Collection< ? extends Line > ) newValue );
+            return;
+        case SclPackage.SCL__PROCESS:
+            getProcess().clear();
+            getProcess().addAll(
+                    ( Collection< ? extends fr.centralesupelec.edf.riseclipse.iec61850.scl.Process > ) newValue );
+            return;
+        case SclPackage.SCL__IED:
+            getIED().clear();
+            getIED().addAll( ( Collection< ? extends IED > ) newValue );
+            return;
+        case SclPackage.SCL__DATA_TYPE_TEMPLATES:
+            setDataTypeTemplates( ( DataTypeTemplates ) newValue );
+            return;
+        case SclPackage.SCL__COMMUNICATION:
+            setCommunication( ( Communication ) newValue );
+            return;
+        case SclPackage.SCL__SUBSTATION:
+            getSubstation().clear();
+            getSubstation().addAll( ( Collection< ? extends Substation > ) newValue );
+            return;
+        case SclPackage.SCL__RELEASE:
+            setRelease( ( Integer ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -989,39 +1047,39 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SCL__REVISION:
-                unsetRevision();
-                return;
-            case SclPackage.SCL__VERSION:
-                unsetVersion();
-                return;
-            case SclPackage.SCL__HEADER:
-                unsetHeader();
-                return;
-            case SclPackage.SCL__LINE:
-                unsetLine();
-                return;
-            case SclPackage.SCL__PROCESS:
-                unsetProcess();
-                return;
-            case SclPackage.SCL__IED:
-                unsetIED();
-                return;
-            case SclPackage.SCL__DATA_TYPE_TEMPLATES:
-                unsetDataTypeTemplates();
-                return;
-            case SclPackage.SCL__COMMUNICATION:
-                unsetCommunication();
-                return;
-            case SclPackage.SCL__SUBSTATION:
-                unsetSubstation();
-                return;
-            case SclPackage.SCL__RELEASE:
-                unsetRelease();
-                return;
+        switch( featureID ) {
+        case SclPackage.SCL__REVISION:
+            unsetRevision();
+            return;
+        case SclPackage.SCL__VERSION:
+            unsetVersion();
+            return;
+        case SclPackage.SCL__HEADER:
+            unsetHeader();
+            return;
+        case SclPackage.SCL__LINE:
+            unsetLine();
+            return;
+        case SclPackage.SCL__PROCESS:
+            unsetProcess();
+            return;
+        case SclPackage.SCL__IED:
+            unsetIED();
+            return;
+        case SclPackage.SCL__DATA_TYPE_TEMPLATES:
+            unsetDataTypeTemplates();
+            return;
+        case SclPackage.SCL__COMMUNICATION:
+            unsetCommunication();
+            return;
+        case SclPackage.SCL__SUBSTATION:
+            unsetSubstation();
+            return;
+        case SclPackage.SCL__RELEASE:
+            unsetRelease();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -1031,29 +1089,29 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SCL__REVISION:
-                return isSetRevision();
-            case SclPackage.SCL__VERSION:
-                return isSetVersion();
-            case SclPackage.SCL__HEADER:
-                return isSetHeader();
-            case SclPackage.SCL__LINE:
-                return isSetLine();
-            case SclPackage.SCL__PROCESS:
-                return isSetProcess();
-            case SclPackage.SCL__IED:
-                return isSetIED();
-            case SclPackage.SCL__DATA_TYPE_TEMPLATES:
-                return isSetDataTypeTemplates();
-            case SclPackage.SCL__COMMUNICATION:
-                return isSetCommunication();
-            case SclPackage.SCL__SUBSTATION:
-                return isSetSubstation();
-            case SclPackage.SCL__RELEASE:
-                return isSetRelease();
+        switch( featureID ) {
+        case SclPackage.SCL__REVISION:
+            return isSetRevision();
+        case SclPackage.SCL__VERSION:
+            return isSetVersion();
+        case SclPackage.SCL__HEADER:
+            return isSetHeader();
+        case SclPackage.SCL__LINE:
+            return isSetLine();
+        case SclPackage.SCL__PROCESS:
+            return isSetProcess();
+        case SclPackage.SCL__IED:
+            return isSetIED();
+        case SclPackage.SCL__DATA_TYPE_TEMPLATES:
+            return isSetDataTypeTemplates();
+        case SclPackage.SCL__COMMUNICATION:
+            return isSetCommunication();
+        case SclPackage.SCL__SUBSTATION:
+            return isSetSubstation();
+        case SclPackage.SCL__RELEASE:
+            return isSetRelease();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -1063,16 +1121,25 @@ public class SCLImpl extends BaseElementImpl implements SCL {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (revision: ");
-        if (revisionESet) result.append(revision); else result.append("<unset>");
-        result.append(", version: ");
-        if (versionESet) result.append(version); else result.append("<unset>");
-        result.append(", release: ");
-        if (releaseESet) result.append(release); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (revision: " );
+        if( revisionESet )
+            result.append( revision );
+        else
+            result.append( "<unset>" );
+        result.append( ", version: " );
+        if( versionESet )
+            result.append( version );
+        else
+            result.append( "<unset>" );
+        result.append( ", release: " );
+        if( releaseESet )
+            result.append( release );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDIImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDIImpl.java
index 90bb12b..2bd5839 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDIImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDIImpl.java
@@ -136,7 +136,7 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      * @generated
      * @ordered
      */
-    protected EList<DAI> dai;
+    protected EList< DAI > dai;
 
     /**
      * The cached value of the '{@link #getSubSDI() <em>Sub SDI</em>}' containment reference list.
@@ -146,7 +146,7 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      * @generated
      * @ordered
      */
-    protected EList<SDI> subSDI;
+    protected EList< SDI > subSDI;
 
     /**
      * The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -255,8 +255,8 @@ public class SDIImpl extends UnNamingImpl implements SDI {
         ix = newIx;
         boolean oldIxESet = ixESet;
         ixESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SDI__IX, oldIx, ix, !oldIxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDI__IX, oldIx, ix, !oldIxESet ) );
     }
 
     /**
@@ -270,8 +270,9 @@ public class SDIImpl extends UnNamingImpl implements SDI {
         boolean oldIxESet = ixESet;
         ix = IX_EDEFAULT;
         ixESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SDI__IX, oldIx, IX_EDEFAULT, oldIxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SDI__IX, oldIx, IX_EDEFAULT,
+                    oldIxESet ) );
     }
 
     /**
@@ -305,8 +306,9 @@ public class SDIImpl extends UnNamingImpl implements SDI {
         sAddr = newSAddr;
         boolean oldSAddrESet = sAddrESet;
         sAddrESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SDI__SADDR, oldSAddr, sAddr, !oldSAddrESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDI__SADDR, oldSAddr, sAddr,
+                    !oldSAddrESet ) );
     }
 
     /**
@@ -320,8 +322,9 @@ public class SDIImpl extends UnNamingImpl implements SDI {
         boolean oldSAddrESet = sAddrESet;
         sAddr = SADDR_EDEFAULT;
         sAddrESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SDI__SADDR, oldSAddr, SADDR_EDEFAULT, oldSAddrESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SDI__SADDR, oldSAddr, SADDR_EDEFAULT,
+                    oldSAddrESet ) );
     }
 
     /**
@@ -340,9 +343,10 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      * @generated
      */
     @Override
-    public EList<DAI> getDAI() {
-        if (dai == null) {
-            dai = new EObjectContainmentWithInverseEList.Unsettable<DAI>(DAI.class, this, SclPackage.SDI__DAI, SclPackage.DAI__PARENT_SDI);
+    public EList< DAI > getDAI() {
+        if( dai == null ) {
+            dai = new EObjectContainmentWithInverseEList.Unsettable< DAI >( DAI.class, this, SclPackage.SDI__DAI,
+                    SclPackage.DAI__PARENT_SDI );
         }
         return dai;
     }
@@ -354,7 +358,7 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public void unsetDAI() {
-        if (dai != null) ((InternalEList.Unsettable<?>)dai).unset();
+        if( dai != null ) ( ( InternalEList.Unsettable< ? > ) dai ).unset();
     }
 
     /**
@@ -364,7 +368,7 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public boolean isSetDAI() {
-        return dai != null && ((InternalEList.Unsettable<?>)dai).isSet();
+        return dai != null && ( ( InternalEList.Unsettable< ? > ) dai ).isSet();
     }
 
     /**
@@ -374,8 +378,8 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public DOI getParentDOI() {
-        if (eContainerFeatureID() != SclPackage.SDI__PARENT_DOI) return null;
-        return (DOI)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SDI__PARENT_DOI ) return null;
+        return ( DOI ) eInternalContainer();
     }
 
     /**
@@ -383,8 +387,8 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentDOI(DOI newParentDOI, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentDOI, SclPackage.SDI__PARENT_DOI, msgs);
+    public NotificationChain basicSetParentDOI( DOI newParentDOI, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentDOI, SclPackage.SDI__PARENT_DOI, msgs );
         return msgs;
     }
 
@@ -394,20 +398,22 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      * @generated
      */
     @Override
-    public void setParentDOI(DOI newParentDOI) {
-        if (newParentDOI != eInternalContainer() || (eContainerFeatureID() != SclPackage.SDI__PARENT_DOI && newParentDOI != null)) {
-            if (EcoreUtil.isAncestor(this, newParentDOI))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentDOI( DOI newParentDOI ) {
+        if( newParentDOI != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SDI__PARENT_DOI && newParentDOI != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentDOI ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentDOI != null)
-                msgs = ((InternalEObject)newParentDOI).eInverseAdd(this, SclPackage.DOI__SDI, DOI.class, msgs);
-            msgs = basicSetParentDOI(newParentDOI, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentDOI != null )
+                msgs = ( ( InternalEObject ) newParentDOI ).eInverseAdd( this, SclPackage.DOI__SDI, DOI.class, msgs );
+            msgs = basicSetParentDOI( newParentDOI, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SDI__PARENT_DOI, newParentDOI, newParentDOI));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDI__PARENT_DOI, newParentDOI,
+                    newParentDOI ) );
     }
 
     /**
@@ -416,9 +422,10 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      * @generated
      */
     @Override
-    public EList<SDI> getSubSDI() {
-        if (subSDI == null) {
-            subSDI = new EObjectContainmentWithInverseEList.Unsettable<SDI>(SDI.class, this, SclPackage.SDI__SUB_SDI, SclPackage.SDI__PARENT_SDI);
+    public EList< SDI > getSubSDI() {
+        if( subSDI == null ) {
+            subSDI = new EObjectContainmentWithInverseEList.Unsettable< SDI >( SDI.class, this, SclPackage.SDI__SUB_SDI,
+                    SclPackage.SDI__PARENT_SDI );
         }
         return subSDI;
     }
@@ -430,7 +437,7 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public void unsetSubSDI() {
-        if (subSDI != null) ((InternalEList.Unsettable<?>)subSDI).unset();
+        if( subSDI != null ) ( ( InternalEList.Unsettable< ? > ) subSDI ).unset();
     }
 
     /**
@@ -440,7 +447,7 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public boolean isSetSubSDI() {
-        return subSDI != null && ((InternalEList.Unsettable<?>)subSDI).isSet();
+        return subSDI != null && ( ( InternalEList.Unsettable< ? > ) subSDI ).isSet();
     }
 
     /**
@@ -450,8 +457,8 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public SDI getParentSDI() {
-        if (eContainerFeatureID() != SclPackage.SDI__PARENT_SDI) return null;
-        return (SDI)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SDI__PARENT_SDI ) return null;
+        return ( SDI ) eInternalContainer();
     }
 
     /**
@@ -460,7 +467,7 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      * @generated
      */
     public NotificationChain basicSetParentSDI( SDI newParentSDI, NotificationChain msgs ) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSDI, SclPackage.SDI__PARENT_SDI, msgs);
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSDI, SclPackage.SDI__PARENT_SDI, msgs );
         return msgs;
     }
 
@@ -471,19 +478,22 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public void setParentSDI( SDI newParentSDI ) {
-        if (newParentSDI != eInternalContainer() || (eContainerFeatureID() != SclPackage.SDI__PARENT_SDI && newParentSDI != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSDI))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+        if( newParentSDI != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SDI__PARENT_SDI && newParentSDI != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSDI ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSDI != null)
-                msgs = ((InternalEObject)newParentSDI).eInverseAdd(this, SclPackage.SDI__SUB_SDI, SDI.class, msgs);
-            msgs = basicSetParentSDI(newParentSDI, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSDI != null )
+                msgs = ( ( InternalEObject ) newParentSDI ).eInverseAdd( this, SclPackage.SDI__SUB_SDI, SDI.class,
+                        msgs );
+            msgs = basicSetParentSDI( newParentSDI, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SDI__PARENT_SDI, newParentSDI, newParentSDI));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDI__PARENT_SDI, newParentSDI,
+                    newParentSDI ) );
     }
 
     /**
@@ -502,13 +512,14 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      * @generated
      */
     @Override
-    public void setName(String newName) {
+    public void setName( String newName ) {
         String oldName = name;
         name = newName;
         boolean oldNameESet = nameESet;
         nameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SDI__NAME, oldName, name, !oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDI__NAME, oldName, name,
+                    !oldNameESet ) );
     }
 
     /**
@@ -522,8 +533,9 @@ public class SDIImpl extends UnNamingImpl implements SDI {
         boolean oldNameESet = nameESet;
         name = NAME_EDEFAULT;
         nameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SDI__NAME, oldName, NAME_EDEFAULT, oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SDI__NAME, oldName, NAME_EDEFAULT,
+                    oldNameESet ) );
     }
 
     /**
@@ -551,14 +563,18 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToSDO(SDO newRefersToSDO, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToSDO( SDO newRefersToSDO, NotificationChain msgs ) {
         SDO oldRefersToSDO = refersToSDO;
         refersToSDO = newRefersToSDO;
         boolean oldRefersToSDOESet = refersToSDOESet;
         refersToSDOESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SDI__REFERS_TO_SDO, oldRefersToSDO, newRefersToSDO, !oldRefersToSDOESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SDI__REFERS_TO_SDO, oldRefersToSDO, newRefersToSDO, !oldRefersToSDOESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -569,21 +585,24 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      * @generated
      */
     @Override
-    public void setRefersToSDO(SDO newRefersToSDO) {
-        if (newRefersToSDO != refersToSDO) {
+    public void setRefersToSDO( SDO newRefersToSDO ) {
+        if( newRefersToSDO != refersToSDO ) {
             NotificationChain msgs = null;
-            if (refersToSDO != null)
-                msgs = ((InternalEObject)refersToSDO).eInverseRemove(this, SclPackage.SDO__REFERRED_BY_SDI, SDO.class, msgs);
-            if (newRefersToSDO != null)
-                msgs = ((InternalEObject)newRefersToSDO).eInverseAdd(this, SclPackage.SDO__REFERRED_BY_SDI, SDO.class, msgs);
-            msgs = basicSetRefersToSDO(newRefersToSDO, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToSDO != null )
+                msgs = ( ( InternalEObject ) refersToSDO ).eInverseRemove( this, SclPackage.SDO__REFERRED_BY_SDI,
+                        SDO.class, msgs );
+            if( newRefersToSDO != null )
+                msgs = ( ( InternalEObject ) newRefersToSDO ).eInverseAdd( this, SclPackage.SDO__REFERRED_BY_SDI,
+                        SDO.class, msgs );
+            msgs = basicSetRefersToSDO( newRefersToSDO, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToSDOESet = refersToSDOESet;
             refersToSDOESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SDI__REFERS_TO_SDO, newRefersToSDO, newRefersToSDO, !oldRefersToSDOESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDI__REFERS_TO_SDO, newRefersToSDO,
+                        newRefersToSDO, !oldRefersToSDOESet ) );
         }
     }
 
@@ -592,14 +611,18 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToSDO(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToSDO( NotificationChain msgs ) {
         SDO oldRefersToSDO = refersToSDO;
         refersToSDO = null;
         boolean oldRefersToSDOESet = refersToSDOESet;
         refersToSDOESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SDI__REFERS_TO_SDO, oldRefersToSDO, null, oldRefersToSDOESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SDI__REFERS_TO_SDO, oldRefersToSDO, null, oldRefersToSDOESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -611,17 +634,19 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public void unsetRefersToSDO() {
-        if (refersToSDO != null) {
+        if( refersToSDO != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToSDO).eInverseRemove(this, SclPackage.SDO__REFERRED_BY_SDI, SDO.class, msgs);
-            msgs = basicUnsetRefersToSDO(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToSDO ).eInverseRemove( this, SclPackage.SDO__REFERRED_BY_SDI, SDO.class,
+                    msgs );
+            msgs = basicUnsetRefersToSDO( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToSDOESet = refersToSDOESet;
             refersToSDOESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SDI__REFERS_TO_SDO, null, null, oldRefersToSDOESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SDI__REFERS_TO_SDO, null, null,
+                        oldRefersToSDOESet ) );
         }
     }
 
@@ -650,14 +675,20 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToAbstractDataAttribute(AbstractDataAttribute newRefersToAbstractDataAttribute, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToAbstractDataAttribute(
+            AbstractDataAttribute newRefersToAbstractDataAttribute, NotificationChain msgs ) {
         AbstractDataAttribute oldRefersToAbstractDataAttribute = refersToAbstractDataAttribute;
         refersToAbstractDataAttribute = newRefersToAbstractDataAttribute;
         boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet;
         refersToAbstractDataAttributeESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute, newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute,
+                    newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -668,21 +699,25 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      * @generated
      */
     @Override
-    public void setRefersToAbstractDataAttribute(AbstractDataAttribute newRefersToAbstractDataAttribute) {
-        if (newRefersToAbstractDataAttribute != refersToAbstractDataAttribute) {
+    public void setRefersToAbstractDataAttribute( AbstractDataAttribute newRefersToAbstractDataAttribute ) {
+        if( newRefersToAbstractDataAttribute != refersToAbstractDataAttribute ) {
             NotificationChain msgs = null;
-            if (refersToAbstractDataAttribute != null)
-                msgs = ((InternalEObject)refersToAbstractDataAttribute).eInverseRemove(this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI, AbstractDataAttribute.class, msgs);
-            if (newRefersToAbstractDataAttribute != null)
-                msgs = ((InternalEObject)newRefersToAbstractDataAttribute).eInverseAdd(this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI, AbstractDataAttribute.class, msgs);
-            msgs = basicSetRefersToAbstractDataAttribute(newRefersToAbstractDataAttribute, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToAbstractDataAttribute != null )
+                msgs = ( ( InternalEObject ) refersToAbstractDataAttribute ).eInverseRemove( this,
+                        SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI, AbstractDataAttribute.class, msgs );
+            if( newRefersToAbstractDataAttribute != null )
+                msgs = ( ( InternalEObject ) newRefersToAbstractDataAttribute ).eInverseAdd( this,
+                        SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI, AbstractDataAttribute.class, msgs );
+            msgs = basicSetRefersToAbstractDataAttribute( newRefersToAbstractDataAttribute, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet;
             refersToAbstractDataAttributeESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, newRefersToAbstractDataAttribute, newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET,
+                        SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, newRefersToAbstractDataAttribute,
+                        newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet ) );
         }
     }
 
@@ -691,14 +726,19 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToAbstractDataAttribute(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToAbstractDataAttribute( NotificationChain msgs ) {
         AbstractDataAttribute oldRefersToAbstractDataAttribute = refersToAbstractDataAttribute;
         refersToAbstractDataAttribute = null;
         boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet;
         refersToAbstractDataAttributeESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute, null, oldRefersToAbstractDataAttributeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute, null,
+                    oldRefersToAbstractDataAttributeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -710,17 +750,20 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public void unsetRefersToAbstractDataAttribute() {
-        if (refersToAbstractDataAttribute != null) {
+        if( refersToAbstractDataAttribute != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToAbstractDataAttribute).eInverseRemove(this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI, AbstractDataAttribute.class, msgs);
-            msgs = basicUnsetRefersToAbstractDataAttribute(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToAbstractDataAttribute ).eInverseRemove( this,
+                    SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI, AbstractDataAttribute.class, msgs );
+            msgs = basicUnsetRefersToAbstractDataAttribute( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet;
             refersToAbstractDataAttributeESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, null, null, oldRefersToAbstractDataAttributeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET,
+                        SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, null, null,
+                        oldRefersToAbstractDataAttributeESet ) );
         }
     }
 
@@ -742,29 +785,32 @@ public class SDIImpl extends UnNamingImpl implements SDI {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SDI__DAI:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getDAI()).basicAdd(otherEnd, msgs);
-            case SclPackage.SDI__PARENT_DOI:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentDOI((DOI)otherEnd, msgs);
-            case SclPackage.SDI__SUB_SDI:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSubSDI()).basicAdd(otherEnd, msgs);
-            case SclPackage.SDI__PARENT_SDI:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSDI((SDI)otherEnd, msgs);
-            case SclPackage.SDI__REFERS_TO_SDO:
-                if (refersToSDO != null)
-                    msgs = ((InternalEObject)refersToSDO).eInverseRemove(this, SclPackage.SDO__REFERRED_BY_SDI, SDO.class, msgs);
-                return basicSetRefersToSDO((SDO)otherEnd, msgs);
-            case SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                if (refersToAbstractDataAttribute != null)
-                    msgs = ((InternalEObject)refersToAbstractDataAttribute).eInverseRemove(this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI, AbstractDataAttribute.class, msgs);
-                return basicSetRefersToAbstractDataAttribute((AbstractDataAttribute)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SDI__DAI:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getDAI() ).basicAdd( otherEnd, msgs );
+        case SclPackage.SDI__PARENT_DOI:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentDOI( ( DOI ) otherEnd, msgs );
+        case SclPackage.SDI__SUB_SDI:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSubSDI() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.SDI__PARENT_SDI:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSDI( ( SDI ) otherEnd, msgs );
+        case SclPackage.SDI__REFERS_TO_SDO:
+            if( refersToSDO != null )
+                msgs = ( ( InternalEObject ) refersToSDO ).eInverseRemove( this, SclPackage.SDO__REFERRED_BY_SDI,
+                        SDO.class, msgs );
+            return basicSetRefersToSDO( ( SDO ) otherEnd, msgs );
+        case SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            if( refersToAbstractDataAttribute != null )
+                msgs = ( ( InternalEObject ) refersToAbstractDataAttribute ).eInverseRemove( this,
+                        SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI, AbstractDataAttribute.class, msgs );
+            return basicSetRefersToAbstractDataAttribute( ( AbstractDataAttribute ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -774,21 +820,21 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SDI__DAI:
-                return ((InternalEList<?>)getDAI()).basicRemove(otherEnd, msgs);
-            case SclPackage.SDI__PARENT_DOI:
-                return basicSetParentDOI(null, msgs);
-            case SclPackage.SDI__SUB_SDI:
-                return ((InternalEList<?>)getSubSDI()).basicRemove(otherEnd, msgs);
-            case SclPackage.SDI__PARENT_SDI:
-                return basicSetParentSDI(null, msgs);
-            case SclPackage.SDI__REFERS_TO_SDO:
-                return basicUnsetRefersToSDO(msgs);
-            case SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                return basicUnsetRefersToAbstractDataAttribute(msgs);
+        switch( featureID ) {
+        case SclPackage.SDI__DAI:
+            return ( ( InternalEList< ? > ) getDAI() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SDI__PARENT_DOI:
+            return basicSetParentDOI( null, msgs );
+        case SclPackage.SDI__SUB_SDI:
+            return ( ( InternalEList< ? > ) getSubSDI() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SDI__PARENT_SDI:
+            return basicSetParentSDI( null, msgs );
+        case SclPackage.SDI__REFERS_TO_SDO:
+            return basicUnsetRefersToSDO( msgs );
+        case SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            return basicUnsetRefersToAbstractDataAttribute( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -798,13 +844,13 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SDI__PARENT_DOI:
-                return eInternalContainer().eInverseRemove(this, SclPackage.DOI__SDI, DOI.class, msgs);
-            case SclPackage.SDI__PARENT_SDI:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SDI__SUB_SDI, SDI.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SDI__PARENT_DOI:
+            return eInternalContainer().eInverseRemove( this, SclPackage.DOI__SDI, DOI.class, msgs );
+        case SclPackage.SDI__PARENT_SDI:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SDI__SUB_SDI, SDI.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -814,27 +860,27 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SDI__IX:
-                return getIx();
-            case SclPackage.SDI__SADDR:
-                return getSAddr();
-            case SclPackage.SDI__DAI:
-                return getDAI();
-            case SclPackage.SDI__PARENT_DOI:
-                return getParentDOI();
-            case SclPackage.SDI__SUB_SDI:
-                return getSubSDI();
-            case SclPackage.SDI__PARENT_SDI:
-                return getParentSDI();
-            case SclPackage.SDI__NAME:
-                return getName();
-            case SclPackage.SDI__REFERS_TO_SDO:
-                return getRefersToSDO();
-            case SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                return getRefersToAbstractDataAttribute();
+        switch( featureID ) {
+        case SclPackage.SDI__IX:
+            return getIx();
+        case SclPackage.SDI__SADDR:
+            return getSAddr();
+        case SclPackage.SDI__DAI:
+            return getDAI();
+        case SclPackage.SDI__PARENT_DOI:
+            return getParentDOI();
+        case SclPackage.SDI__SUB_SDI:
+            return getSubSDI();
+        case SclPackage.SDI__PARENT_SDI:
+            return getParentSDI();
+        case SclPackage.SDI__NAME:
+            return getName();
+        case SclPackage.SDI__REFERS_TO_SDO:
+            return getRefersToSDO();
+        case SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            return getRefersToAbstractDataAttribute();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -845,38 +891,38 @@ public class SDIImpl extends UnNamingImpl implements SDI {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SDI__IX:
-                setIx((Integer)newValue);
-                return;
-            case SclPackage.SDI__SADDR:
-                setSAddr((String)newValue);
-                return;
-            case SclPackage.SDI__DAI:
-                getDAI().clear();
-                getDAI().addAll((Collection<? extends DAI>)newValue);
-                return;
-            case SclPackage.SDI__PARENT_DOI:
-                setParentDOI((DOI)newValue);
-                return;
-            case SclPackage.SDI__SUB_SDI:
-                getSubSDI().clear();
-                getSubSDI().addAll((Collection<? extends SDI>)newValue);
-                return;
-            case SclPackage.SDI__PARENT_SDI:
-                setParentSDI((SDI)newValue);
-                return;
-            case SclPackage.SDI__NAME:
-                setName((String)newValue);
-                return;
-            case SclPackage.SDI__REFERS_TO_SDO:
-                setRefersToSDO((SDO)newValue);
-                return;
-            case SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                setRefersToAbstractDataAttribute((AbstractDataAttribute)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SDI__IX:
+            setIx( ( Integer ) newValue );
+            return;
+        case SclPackage.SDI__SADDR:
+            setSAddr( ( String ) newValue );
+            return;
+        case SclPackage.SDI__DAI:
+            getDAI().clear();
+            getDAI().addAll( ( Collection< ? extends DAI > ) newValue );
+            return;
+        case SclPackage.SDI__PARENT_DOI:
+            setParentDOI( ( DOI ) newValue );
+            return;
+        case SclPackage.SDI__SUB_SDI:
+            getSubSDI().clear();
+            getSubSDI().addAll( ( Collection< ? extends SDI > ) newValue );
+            return;
+        case SclPackage.SDI__PARENT_SDI:
+            setParentSDI( ( SDI ) newValue );
+            return;
+        case SclPackage.SDI__NAME:
+            setName( ( String ) newValue );
+            return;
+        case SclPackage.SDI__REFERS_TO_SDO:
+            setRefersToSDO( ( SDO ) newValue );
+            return;
+        case SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            setRefersToAbstractDataAttribute( ( AbstractDataAttribute ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -886,36 +932,36 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SDI__IX:
-                unsetIx();
-                return;
-            case SclPackage.SDI__SADDR:
-                unsetSAddr();
-                return;
-            case SclPackage.SDI__DAI:
-                unsetDAI();
-                return;
-            case SclPackage.SDI__PARENT_DOI:
-                setParentDOI((DOI)null);
-                return;
-            case SclPackage.SDI__SUB_SDI:
-                unsetSubSDI();
-                return;
-            case SclPackage.SDI__PARENT_SDI:
-                setParentSDI((SDI)null);
-                return;
-            case SclPackage.SDI__NAME:
-                unsetName();
-                return;
-            case SclPackage.SDI__REFERS_TO_SDO:
-                unsetRefersToSDO();
-                return;
-            case SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                unsetRefersToAbstractDataAttribute();
-                return;
+        switch( featureID ) {
+        case SclPackage.SDI__IX:
+            unsetIx();
+            return;
+        case SclPackage.SDI__SADDR:
+            unsetSAddr();
+            return;
+        case SclPackage.SDI__DAI:
+            unsetDAI();
+            return;
+        case SclPackage.SDI__PARENT_DOI:
+            setParentDOI( ( DOI ) null );
+            return;
+        case SclPackage.SDI__SUB_SDI:
+            unsetSubSDI();
+            return;
+        case SclPackage.SDI__PARENT_SDI:
+            setParentSDI( ( SDI ) null );
+            return;
+        case SclPackage.SDI__NAME:
+            unsetName();
+            return;
+        case SclPackage.SDI__REFERS_TO_SDO:
+            unsetRefersToSDO();
+            return;
+        case SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            unsetRefersToAbstractDataAttribute();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -925,27 +971,27 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SDI__IX:
-                return isSetIx();
-            case SclPackage.SDI__SADDR:
-                return isSetSAddr();
-            case SclPackage.SDI__DAI:
-                return isSetDAI();
-            case SclPackage.SDI__PARENT_DOI:
-                return getParentDOI() != null;
-            case SclPackage.SDI__SUB_SDI:
-                return isSetSubSDI();
-            case SclPackage.SDI__PARENT_SDI:
-                return getParentSDI() != null;
-            case SclPackage.SDI__NAME:
-                return isSetName();
-            case SclPackage.SDI__REFERS_TO_SDO:
-                return isSetRefersToSDO();
-            case SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
-                return isSetRefersToAbstractDataAttribute();
+        switch( featureID ) {
+        case SclPackage.SDI__IX:
+            return isSetIx();
+        case SclPackage.SDI__SADDR:
+            return isSetSAddr();
+        case SclPackage.SDI__DAI:
+            return isSetDAI();
+        case SclPackage.SDI__PARENT_DOI:
+            return getParentDOI() != null;
+        case SclPackage.SDI__SUB_SDI:
+            return isSetSubSDI();
+        case SclPackage.SDI__PARENT_SDI:
+            return getParentSDI() != null;
+        case SclPackage.SDI__NAME:
+            return isSetName();
+        case SclPackage.SDI__REFERS_TO_SDO:
+            return isSetRefersToSDO();
+        case SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE:
+            return isSetRefersToAbstractDataAttribute();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -955,16 +1001,25 @@ public class SDIImpl extends UnNamingImpl implements SDI {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (ix: ");
-        if (ixESet) result.append(ix); else result.append("<unset>");
-        result.append(", sAddr: ");
-        if (sAddrESet) result.append(sAddr); else result.append("<unset>");
-        result.append(", name: ");
-        if (nameESet) result.append(name); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (ix: " );
+        if( ixESet )
+            result.append( ix );
+        else
+            result.append( "<unset>" );
+        result.append( ", sAddr: " );
+        if( sAddrESet )
+            result.append( sAddr );
+        else
+            result.append( "<unset>" );
+        result.append( ", name: " );
+        if( nameESet )
+            result.append( name );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -972,10 +1027,10 @@ public class SDIImpl extends UnNamingImpl implements SDI {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         String messagePrefix = "[SCL links] while resolving link from SDI on line " + getLineNumber() + ": ";
-        
-        if(( getName() == null ) || getName().isEmpty() ) {
+
+        if( ( getName() == null ) || getName().isEmpty() ) {
             console.warning( messagePrefix, "name is missing" );
             return;
         }
@@ -990,7 +1045,7 @@ public class SDIImpl extends UnNamingImpl implements SDI {
             // Unexpected
         }
     }
-    
+
     private void doResolveLinkWithParentDOI( IRiseClipseConsole console, String messagePrefix ) {
         DO do_ = getParentDOI().getRefersToDO();
         // No error or warning message here: if this happens, error should have been detected before
@@ -1003,11 +1058,10 @@ public class SDIImpl extends UnNamingImpl implements SDI {
         if( dot == null ) return;
         console.verbose( messagePrefix, "found DOType on line ", dot.getLineNumber() );
 
-        List< SDO > res1 =
-                dot
+        List< SDO > res1 = dot
                 .getSDO()
                 .stream()
-                .filter( d -> getName().equals( d.getName() ))
+                .filter( d -> getName().equals( d.getName() ) )
                 .collect( Collectors.toList() );
 
         String mess1 = "SDO( name = " + getName() + " )";
@@ -1017,16 +1071,16 @@ public class SDIImpl extends UnNamingImpl implements SDI {
             return;
         }
         if( res1.size() == 1 ) {
-            setRefersToSDO( res1.get( 0 ));
-            console.info( "[SCL links] SDI on line ", getLineNumber(), " refers to ", mess1, " on line ", getRefersToSDO().getLineNumber() );
+            setRefersToSDO( res1.get( 0 ) );
+            console.info( "[SCL links] SDI on line ", getLineNumber(), " refers to ", mess1, " on line ",
+                    getRefersToSDO().getLineNumber() );
             return;
         }
-        
-        List< DA > res2 =
-                dot
+
+        List< DA > res2 = dot
                 .getDA()
                 .stream()
-                .filter(  d -> getName().equals( d.getName() ))
+                .filter( d -> getName().equals( d.getName() ) )
                 .collect( Collectors.toList() );
 
         String mess2 = "DA( name = " + getName() + " )";
@@ -1039,26 +1093,26 @@ public class SDIImpl extends UnNamingImpl implements SDI {
             console.warning( messagePrefix, "found several ", mess2, " using ParentDOI" );
             return;
         }
-        setRefersToAbstractDataAttribute( res2.get( 0 ));
-        console.info( "[SCL links] SDI on line ", getLineNumber(), " refers to ", mess2, " on line ", getRefersToAbstractDataAttribute().getLineNumber() );
+        setRefersToAbstractDataAttribute( res2.get( 0 ) );
+        console.info( "[SCL links] SDI on line ", getLineNumber(), " refers to ", mess2, " on line ",
+                getRefersToAbstractDataAttribute().getLineNumber() );
     }
-    
+
     private void doResolveLinkWithParentSDI( IRiseClipseConsole console, String messagePrefix ) {
-        SDO sdo = getParentSDI().getRefersToSDO();        
+        SDO sdo = getParentSDI().getRefersToSDO();
         if( sdo != null ) {
             console.verbose( messagePrefix, "found SDO on line ", sdo.getLineNumber() );
             sdo.buildExplicitLinks( console, false );
-            
+
             DOType dot = sdo.getRefersToDOType();
             // No error or warning message here: if this happens, error should have been detected before
             if( dot == null ) return;
             console.verbose( messagePrefix, "found DOType on line ", dot.getLineNumber() );
-            
-            List< SDO > res1 =
-                    dot
+
+            List< SDO > res1 = dot
                     .getSDO()
                     .stream()
-                    .filter(  d -> getName().equals( d.getName() ))
+                    .filter( d -> getName().equals( d.getName() ) )
                     .collect( Collectors.toList() );
 
             String mess1 = "SDO( name = " + getName() + " )";
@@ -1068,16 +1122,16 @@ public class SDIImpl extends UnNamingImpl implements SDI {
                 return;
             }
             if( res1.size() == 1 ) {
-                setRefersToSDO( res1.get( 0 ));
-                console.info( "[SCL links] SDI on line ", getLineNumber(), " refers to ", mess1, " on line ", getRefersToSDO().getLineNumber() );
+                setRefersToSDO( res1.get( 0 ) );
+                console.info( "[SCL links] SDI on line ", getLineNumber(), " refers to ", mess1, " on line ",
+                        getRefersToSDO().getLineNumber() );
                 return;
             }
-            
-            List< DA > res2 =
-                    dot
+
+            List< DA > res2 = dot
                     .getDA()
                     .stream()
-                    .filter( d -> getName().equals( d.getName() ))
+                    .filter( d -> getName().equals( d.getName() ) )
                     .collect( Collectors.toList() );
 
             String mess2 = "DA( name = " + getName() + " )";
@@ -1090,12 +1144,13 @@ public class SDIImpl extends UnNamingImpl implements SDI {
                 console.warning( messagePrefix, "found several ", mess2, " using ParentSDI" );
                 return;
             }
-            setRefersToAbstractDataAttribute( res2.get( 0 ));
-            console.info( "[SCL links] SDI on line ", getLineNumber(), " refers to ", mess2, " on line ", getRefersToAbstractDataAttribute().getLineNumber() );
+            setRefersToAbstractDataAttribute( res2.get( 0 ) );
+            console.info( "[SCL links] SDI on line ", getLineNumber(), " refers to ", mess2, " on line ",
+                    getRefersToAbstractDataAttribute().getLineNumber() );
             return;
-            
+
         }
-        
+
         // When getParentSDI().getRefersToSDO() == null
         AbstractDataAttribute att = getParentSDI().getRefersToAbstractDataAttribute();
         if( att == null ) {
@@ -1109,12 +1164,11 @@ public class SDIImpl extends UnNamingImpl implements SDI {
         // No error or warning message here: if this happens, error should have been detected before
         if( dat == null ) return;
         console.verbose( messagePrefix, "found DAType on line ", dat.getLineNumber() );
-        
-        List< BDA > res =
-                dat
+
+        List< BDA > res = dat
                 .getBDA()
                 .stream()
-                .filter( b -> getName().equals( b.getName() ))
+                .filter( b -> getName().equals( b.getName() ) )
                 .collect( Collectors.toList() );
 
         String mess = "BDA( name = " + getName() + " )";
@@ -1122,8 +1176,9 @@ public class SDIImpl extends UnNamingImpl implements SDI {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess, res.size() );
             return;
         }
-        setRefersToAbstractDataAttribute( res.get( 0 ));
-        console.info( "[SCL links] SDI on line ", getLineNumber(), " refers to ", mess, " on line ", getRefersToAbstractDataAttribute().getLineNumber() );
+        setRefersToAbstractDataAttribute( res.get( 0 ) );
+        console.info( "[SCL links] SDI on line ", getLineNumber(), " refers to ", mess, " on line ",
+                getRefersToAbstractDataAttribute().getLineNumber() );
     }
 
 } //SDIImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDOImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDOImpl.java
index 88c635b..d199357 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDOImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDOImpl.java
@@ -95,7 +95,7 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      * @generated
      * @ordered
      */
-    protected EList<SDI> referredBySDI;
+    protected EList< SDI > referredBySDI;
 
     /**
      * <!-- begin-user-doc -->
@@ -132,13 +132,14 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      * @generated
      */
     @Override
-    public void setCount(String newCount) {
+    public void setCount( String newCount ) {
         String oldCount = count;
         count = newCount;
         boolean oldCountESet = countESet;
         countESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SDO__COUNT, oldCount, count, !oldCountESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDO__COUNT, oldCount, count,
+                    !oldCountESet ) );
     }
 
     /**
@@ -152,8 +153,9 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
         boolean oldCountESet = countESet;
         count = COUNT_EDEFAULT;
         countESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SDO__COUNT, oldCount, COUNT_EDEFAULT, oldCountESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SDO__COUNT, oldCount, COUNT_EDEFAULT,
+                    oldCountESet ) );
     }
 
     /**
@@ -173,8 +175,8 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      */
     @Override
     public DOType getParentDOType() {
-        if (eContainerFeatureID() != SclPackage.SDO__PARENT_DO_TYPE) return null;
-        return (DOType)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SDO__PARENT_DO_TYPE ) return null;
+        return ( DOType ) eInternalContainer();
     }
 
     /**
@@ -182,8 +184,8 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentDOType(DOType newParentDOType, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentDOType, SclPackage.SDO__PARENT_DO_TYPE, msgs);
+    public NotificationChain basicSetParentDOType( DOType newParentDOType, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentDOType, SclPackage.SDO__PARENT_DO_TYPE, msgs );
         return msgs;
     }
 
@@ -193,20 +195,23 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      * @generated
      */
     @Override
-    public void setParentDOType(DOType newParentDOType) {
-        if (newParentDOType != eInternalContainer() || (eContainerFeatureID() != SclPackage.SDO__PARENT_DO_TYPE && newParentDOType != null)) {
-            if (EcoreUtil.isAncestor(this, newParentDOType))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentDOType( DOType newParentDOType ) {
+        if( newParentDOType != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SDO__PARENT_DO_TYPE && newParentDOType != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentDOType ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentDOType != null)
-                msgs = ((InternalEObject)newParentDOType).eInverseAdd(this, SclPackage.DO_TYPE__SDO, DOType.class, msgs);
-            msgs = basicSetParentDOType(newParentDOType, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentDOType != null )
+                msgs = ( ( InternalEObject ) newParentDOType ).eInverseAdd( this, SclPackage.DO_TYPE__SDO, DOType.class,
+                        msgs );
+            msgs = basicSetParentDOType( newParentDOType, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SDO__PARENT_DO_TYPE, newParentDOType, newParentDOType));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDO__PARENT_DO_TYPE, newParentDOType,
+                    newParentDOType ) );
     }
 
     /**
@@ -215,9 +220,10 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      * @generated
      */
     @Override
-    public EList<SDI> getReferredBySDI() {
-        if (referredBySDI == null) {
-            referredBySDI = new EObjectWithInverseEList.Unsettable<SDI>(SDI.class, this, SclPackage.SDO__REFERRED_BY_SDI, SclPackage.SDI__REFERS_TO_SDO);
+    public EList< SDI > getReferredBySDI() {
+        if( referredBySDI == null ) {
+            referredBySDI = new EObjectWithInverseEList.Unsettable< SDI >( SDI.class, this,
+                    SclPackage.SDO__REFERRED_BY_SDI, SclPackage.SDI__REFERS_TO_SDO );
         }
         return referredBySDI;
     }
@@ -229,7 +235,7 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      */
     @Override
     public void unsetReferredBySDI() {
-        if (referredBySDI != null) ((InternalEList.Unsettable<?>)referredBySDI).unset();
+        if( referredBySDI != null ) ( ( InternalEList.Unsettable< ? > ) referredBySDI ).unset();
     }
 
     /**
@@ -239,7 +245,7 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      */
     @Override
     public boolean isSetReferredBySDI() {
-        return referredBySDI != null && ((InternalEList.Unsettable<?>)referredBySDI).isSet();
+        return referredBySDI != null && ( ( InternalEList.Unsettable< ? > ) referredBySDI ).isSet();
     }
 
     /**
@@ -247,18 +253,19 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SDO__PARENT_DO_TYPE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentDOType((DOType)otherEnd, msgs);
-            case SclPackage.SDO__REFERRED_BY_SDI:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getReferredBySDI()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SDO__PARENT_DO_TYPE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentDOType( ( DOType ) otherEnd, msgs );
+        case SclPackage.SDO__REFERRED_BY_SDI:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredBySDI() )
+                    .basicAdd( otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -268,13 +275,13 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SDO__PARENT_DO_TYPE:
-                return basicSetParentDOType(null, msgs);
-            case SclPackage.SDO__REFERRED_BY_SDI:
-                return ((InternalEList<?>)getReferredBySDI()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SDO__PARENT_DO_TYPE:
+            return basicSetParentDOType( null, msgs );
+        case SclPackage.SDO__REFERRED_BY_SDI:
+            return ( ( InternalEList< ? > ) getReferredBySDI() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -284,11 +291,11 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SDO__PARENT_DO_TYPE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.DO_TYPE__SDO, DOType.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SDO__PARENT_DO_TYPE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.DO_TYPE__SDO, DOType.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -298,15 +305,15 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SDO__COUNT:
-                return getCount();
-            case SclPackage.SDO__PARENT_DO_TYPE:
-                return getParentDOType();
-            case SclPackage.SDO__REFERRED_BY_SDI:
-                return getReferredBySDI();
+        switch( featureID ) {
+        case SclPackage.SDO__COUNT:
+            return getCount();
+        case SclPackage.SDO__PARENT_DO_TYPE:
+            return getParentDOType();
+        case SclPackage.SDO__REFERRED_BY_SDI:
+            return getReferredBySDI();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -314,22 +321,22 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SDO__COUNT:
-                setCount((String)newValue);
-                return;
-            case SclPackage.SDO__PARENT_DO_TYPE:
-                setParentDOType((DOType)newValue);
-                return;
-            case SclPackage.SDO__REFERRED_BY_SDI:
-                getReferredBySDI().clear();
-                getReferredBySDI().addAll((Collection<? extends SDI>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SDO__COUNT:
+            setCount( ( String ) newValue );
+            return;
+        case SclPackage.SDO__PARENT_DO_TYPE:
+            setParentDOType( ( DOType ) newValue );
+            return;
+        case SclPackage.SDO__REFERRED_BY_SDI:
+            getReferredBySDI().clear();
+            getReferredBySDI().addAll( ( Collection< ? extends SDI > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -339,18 +346,18 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SDO__COUNT:
-                unsetCount();
-                return;
-            case SclPackage.SDO__PARENT_DO_TYPE:
-                setParentDOType((DOType)null);
-                return;
-            case SclPackage.SDO__REFERRED_BY_SDI:
-                unsetReferredBySDI();
-                return;
+        switch( featureID ) {
+        case SclPackage.SDO__COUNT:
+            unsetCount();
+            return;
+        case SclPackage.SDO__PARENT_DO_TYPE:
+            setParentDOType( ( DOType ) null );
+            return;
+        case SclPackage.SDO__REFERRED_BY_SDI:
+            unsetReferredBySDI();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -360,15 +367,15 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SDO__COUNT:
-                return isSetCount();
-            case SclPackage.SDO__PARENT_DO_TYPE:
-                return getParentDOType() != null;
-            case SclPackage.SDO__REFERRED_BY_SDI:
-                return isSetReferredBySDI();
+        switch( featureID ) {
+        case SclPackage.SDO__COUNT:
+            return isSetCount();
+        case SclPackage.SDO__PARENT_DO_TYPE:
+            return getParentDOType() != null;
+        case SclPackage.SDO__REFERRED_BY_SDI:
+            return isSetReferredBySDI();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -378,12 +385,15 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (count: ");
-        if (countESet) result.append(count); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (count: " );
+        if( countESet )
+            result.append( count );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -391,16 +401,16 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         // name     The SDO name
         // desc     Descriptive text for the SDO
         // type     References the DOType defining the contents of the SDO
         // count    The number or reference to an attribute defining the number of array elements,
         //          if this element has an ARRAY type. If missing, the default value is 0 (no array)
-        
+
         String messagePrefix = "[SCL links] while resolving link from SDO on line " + getLineNumber() + ": ";
 
-        if(( getType() == null ) || getType().isEmpty() ) {
+        if( ( getType() == null ) || getType().isEmpty() ) {
             console.warning( messagePrefix, "type is missing" );
             return;
         }
@@ -410,20 +420,20 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO {
             return;
         }
 
-        List< DOType > res =
-                dtt
+        List< DOType > res = dtt
                 .getDOType()
                 .stream()
-                .filter( sdo -> getType().equals(  sdo.getId() ))
+                .filter( sdo -> getType().equals( sdo.getId() ) )
                 .collect( Collectors.toList() );
-        
+
         String mess = "DOType( id = " + getType() + " )";
         if( res.size() != 1 ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess, res.size() );
             return;
         }
         setRefersToDOType( res.get( 0 ) );
-        console.info( "[SCL links] SDO on line ", getLineNumber(), " refers to ", mess, " on line ", getRefersToDOType().getLineNumber() );
+        console.info( "[SCL links] SDO on line ", getLineNumber(), " refers to ", mess, " on line ",
+                getRefersToDOType().getLineNumber() );
     }
 
 } //SDOImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SGEditImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SGEditImpl.java
index 887eca4..ec5379b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SGEditImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SGEditImpl.java
@@ -115,8 +115,9 @@ public class SGEditImpl extends SclObjectImpl implements SGEdit {
         resvTms = newResvTms;
         boolean oldResvTmsESet = resvTmsESet;
         resvTmsESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SG_EDIT__RESV_TMS, oldResvTms, resvTms, !oldResvTmsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SG_EDIT__RESV_TMS, oldResvTms, resvTms,
+                    !oldResvTmsESet ) );
     }
 
     /**
@@ -130,8 +131,9 @@ public class SGEditImpl extends SclObjectImpl implements SGEdit {
         boolean oldResvTmsESet = resvTmsESet;
         resvTms = RESV_TMS_EDEFAULT;
         resvTmsESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SG_EDIT__RESV_TMS, oldResvTms, RESV_TMS_EDEFAULT, oldResvTmsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SG_EDIT__RESV_TMS, oldResvTms,
+                    RESV_TMS_EDEFAULT, oldResvTmsESet ) );
     }
 
     /**
@@ -151,8 +153,8 @@ public class SGEditImpl extends SclObjectImpl implements SGEdit {
      */
     @Override
     public SettingGroups getParentSettingGroups() {
-        if (eContainerFeatureID() != SclPackage.SG_EDIT__PARENT_SETTING_GROUPS) return null;
-        return (SettingGroups)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SG_EDIT__PARENT_SETTING_GROUPS ) return null;
+        return ( SettingGroups ) eInternalContainer();
     }
 
     /**
@@ -160,8 +162,10 @@ public class SGEditImpl extends SclObjectImpl implements SGEdit {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSettingGroups(SettingGroups newParentSettingGroups, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSettingGroups, SclPackage.SG_EDIT__PARENT_SETTING_GROUPS, msgs);
+    public NotificationChain basicSetParentSettingGroups( SettingGroups newParentSettingGroups,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSettingGroups,
+                SclPackage.SG_EDIT__PARENT_SETTING_GROUPS, msgs );
         return msgs;
     }
 
@@ -171,20 +175,24 @@ public class SGEditImpl extends SclObjectImpl implements SGEdit {
      * @generated
      */
     @Override
-    public void setParentSettingGroups(SettingGroups newParentSettingGroups) {
-        if (newParentSettingGroups != eInternalContainer() || (eContainerFeatureID() != SclPackage.SG_EDIT__PARENT_SETTING_GROUPS && newParentSettingGroups != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSettingGroups))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSettingGroups( SettingGroups newParentSettingGroups ) {
+        if( newParentSettingGroups != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SG_EDIT__PARENT_SETTING_GROUPS
+                        && newParentSettingGroups != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSettingGroups ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSettingGroups != null)
-                msgs = ((InternalEObject)newParentSettingGroups).eInverseAdd(this, SclPackage.SETTING_GROUPS__SG_EDIT, SettingGroups.class, msgs);
-            msgs = basicSetParentSettingGroups(newParentSettingGroups, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSettingGroups != null )
+                msgs = ( ( InternalEObject ) newParentSettingGroups ).eInverseAdd( this,
+                        SclPackage.SETTING_GROUPS__SG_EDIT, SettingGroups.class, msgs );
+            msgs = basicSetParentSettingGroups( newParentSettingGroups, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SG_EDIT__PARENT_SETTING_GROUPS, newParentSettingGroups, newParentSettingGroups));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SG_EDIT__PARENT_SETTING_GROUPS,
+                    newParentSettingGroups, newParentSettingGroups ) );
     }
 
     /**
@@ -194,13 +202,13 @@ public class SGEditImpl extends SclObjectImpl implements SGEdit {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SG_EDIT__PARENT_SETTING_GROUPS:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSettingGroups((SettingGroups)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SG_EDIT__PARENT_SETTING_GROUPS:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSettingGroups( ( SettingGroups ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -210,11 +218,11 @@ public class SGEditImpl extends SclObjectImpl implements SGEdit {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SG_EDIT__PARENT_SETTING_GROUPS:
-                return basicSetParentSettingGroups(null, msgs);
+        switch( featureID ) {
+        case SclPackage.SG_EDIT__PARENT_SETTING_GROUPS:
+            return basicSetParentSettingGroups( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -224,11 +232,12 @@ public class SGEditImpl extends SclObjectImpl implements SGEdit {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SG_EDIT__PARENT_SETTING_GROUPS:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SETTING_GROUPS__SG_EDIT, SettingGroups.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SG_EDIT__PARENT_SETTING_GROUPS:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SETTING_GROUPS__SG_EDIT, SettingGroups.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -238,13 +247,13 @@ public class SGEditImpl extends SclObjectImpl implements SGEdit {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SG_EDIT__RESV_TMS:
-                return getResvTms();
-            case SclPackage.SG_EDIT__PARENT_SETTING_GROUPS:
-                return getParentSettingGroups();
+        switch( featureID ) {
+        case SclPackage.SG_EDIT__RESV_TMS:
+            return getResvTms();
+        case SclPackage.SG_EDIT__PARENT_SETTING_GROUPS:
+            return getParentSettingGroups();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -254,15 +263,15 @@ public class SGEditImpl extends SclObjectImpl implements SGEdit {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SG_EDIT__RESV_TMS:
-                setResvTms((Boolean)newValue);
-                return;
-            case SclPackage.SG_EDIT__PARENT_SETTING_GROUPS:
-                setParentSettingGroups((SettingGroups)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SG_EDIT__RESV_TMS:
+            setResvTms( ( Boolean ) newValue );
+            return;
+        case SclPackage.SG_EDIT__PARENT_SETTING_GROUPS:
+            setParentSettingGroups( ( SettingGroups ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -272,15 +281,15 @@ public class SGEditImpl extends SclObjectImpl implements SGEdit {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SG_EDIT__RESV_TMS:
-                unsetResvTms();
-                return;
-            case SclPackage.SG_EDIT__PARENT_SETTING_GROUPS:
-                setParentSettingGroups((SettingGroups)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.SG_EDIT__RESV_TMS:
+            unsetResvTms();
+            return;
+        case SclPackage.SG_EDIT__PARENT_SETTING_GROUPS:
+            setParentSettingGroups( ( SettingGroups ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -290,13 +299,13 @@ public class SGEditImpl extends SclObjectImpl implements SGEdit {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SG_EDIT__RESV_TMS:
-                return isSetResvTms();
-            case SclPackage.SG_EDIT__PARENT_SETTING_GROUPS:
-                return getParentSettingGroups() != null;
+        switch( featureID ) {
+        case SclPackage.SG_EDIT__RESV_TMS:
+            return isSetResvTms();
+        case SclPackage.SG_EDIT__PARENT_SETTING_GROUPS:
+            return getParentSettingGroups() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -306,12 +315,15 @@ public class SGEditImpl extends SclObjectImpl implements SGEdit {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (resvTms: ");
-        if (resvTmsESet) result.append(resvTms); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (resvTms: " );
+        if( resvTmsESet )
+            result.append( resvTms );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVImpl.java
index aaa9020..81aa987 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVImpl.java
@@ -71,8 +71,8 @@ public class SMVImpl extends ControlBlockImpl implements SMV {
      */
     @Override
     public ConnectedAP getParentConnectedAP() {
-        if (eContainerFeatureID() != SclPackage.SMV__PARENT_CONNECTED_AP) return null;
-        return (ConnectedAP)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SMV__PARENT_CONNECTED_AP ) return null;
+        return ( ConnectedAP ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class SMVImpl extends ControlBlockImpl implements SMV {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentConnectedAP(ConnectedAP newParentConnectedAP, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentConnectedAP, SclPackage.SMV__PARENT_CONNECTED_AP, msgs);
+    public NotificationChain basicSetParentConnectedAP( ConnectedAP newParentConnectedAP, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentConnectedAP, SclPackage.SMV__PARENT_CONNECTED_AP,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,23 @@ public class SMVImpl extends ControlBlockImpl implements SMV {
      * @generated
      */
     @Override
-    public void setParentConnectedAP(ConnectedAP newParentConnectedAP) {
-        if (newParentConnectedAP != eInternalContainer() || (eContainerFeatureID() != SclPackage.SMV__PARENT_CONNECTED_AP && newParentConnectedAP != null)) {
-            if (EcoreUtil.isAncestor(this, newParentConnectedAP))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentConnectedAP( ConnectedAP newParentConnectedAP ) {
+        if( newParentConnectedAP != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SMV__PARENT_CONNECTED_AP && newParentConnectedAP != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentConnectedAP ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentConnectedAP != null)
-                msgs = ((InternalEObject)newParentConnectedAP).eInverseAdd(this, SclPackage.CONNECTED_AP__SMV, ConnectedAP.class, msgs);
-            msgs = basicSetParentConnectedAP(newParentConnectedAP, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentConnectedAP != null )
+                msgs = ( ( InternalEObject ) newParentConnectedAP ).eInverseAdd( this, SclPackage.CONNECTED_AP__SMV,
+                        ConnectedAP.class, msgs );
+            msgs = basicSetParentConnectedAP( newParentConnectedAP, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV__PARENT_CONNECTED_AP, newParentConnectedAP, newParentConnectedAP));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV__PARENT_CONNECTED_AP,
+                    newParentConnectedAP, newParentConnectedAP ) );
     }
 
     /**
@@ -114,13 +118,13 @@ public class SMVImpl extends ControlBlockImpl implements SMV {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SMV__PARENT_CONNECTED_AP:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentConnectedAP((ConnectedAP)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SMV__PARENT_CONNECTED_AP:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentConnectedAP( ( ConnectedAP ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +134,11 @@ public class SMVImpl extends ControlBlockImpl implements SMV {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SMV__PARENT_CONNECTED_AP:
-                return basicSetParentConnectedAP(null, msgs);
+        switch( featureID ) {
+        case SclPackage.SMV__PARENT_CONNECTED_AP:
+            return basicSetParentConnectedAP( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +148,11 @@ public class SMVImpl extends ControlBlockImpl implements SMV {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SMV__PARENT_CONNECTED_AP:
-                return eInternalContainer().eInverseRemove(this, SclPackage.CONNECTED_AP__SMV, ConnectedAP.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SMV__PARENT_CONNECTED_AP:
+            return eInternalContainer().eInverseRemove( this, SclPackage.CONNECTED_AP__SMV, ConnectedAP.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +162,11 @@ public class SMVImpl extends ControlBlockImpl implements SMV {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SMV__PARENT_CONNECTED_AP:
-                return getParentConnectedAP();
+        switch( featureID ) {
+        case SclPackage.SMV__PARENT_CONNECTED_AP:
+            return getParentConnectedAP();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +176,12 @@ public class SMVImpl extends ControlBlockImpl implements SMV {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SMV__PARENT_CONNECTED_AP:
-                setParentConnectedAP((ConnectedAP)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SMV__PARENT_CONNECTED_AP:
+            setParentConnectedAP( ( ConnectedAP ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +191,12 @@ public class SMVImpl extends ControlBlockImpl implements SMV {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SMV__PARENT_CONNECTED_AP:
-                setParentConnectedAP((ConnectedAP)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.SMV__PARENT_CONNECTED_AP:
+            setParentConnectedAP( ( ConnectedAP ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +206,11 @@ public class SMVImpl extends ControlBlockImpl implements SMV {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SMV__PARENT_CONNECTED_AP:
-                return getParentConnectedAP() != null;
+        switch( featureID ) {
+        case SclPackage.SMV__PARENT_CONNECTED_AP:
+            return getParentConnectedAP() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //SMVImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVSecurityImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVSecurityImpl.java
index 701e137..89cf36b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVSecurityImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVSecurityImpl.java
@@ -71,8 +71,8 @@ public class SMVSecurityImpl extends CertificateImpl implements SMVSecurity {
      */
     @Override
     public AccessPoint getParentAccessPoint() {
-        if (eContainerFeatureID() != SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT) return null;
-        return (AccessPoint)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT ) return null;
+        return ( AccessPoint ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class SMVSecurityImpl extends CertificateImpl implements SMVSecurity {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAccessPoint(AccessPoint newParentAccessPoint, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAccessPoint, SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT, msgs);
+    public NotificationChain basicSetParentAccessPoint( AccessPoint newParentAccessPoint, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAccessPoint,
+                SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT, msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class SMVSecurityImpl extends CertificateImpl implements SMVSecurity {
      * @generated
      */
     @Override
-    public void setParentAccessPoint(AccessPoint newParentAccessPoint) {
-        if (newParentAccessPoint != eInternalContainer() || (eContainerFeatureID() != SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT && newParentAccessPoint != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAccessPoint))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAccessPoint( AccessPoint newParentAccessPoint ) {
+        if( newParentAccessPoint != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT
+                        && newParentAccessPoint != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAccessPoint ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAccessPoint != null)
-                msgs = ((InternalEObject)newParentAccessPoint).eInverseAdd(this, SclPackage.ACCESS_POINT__SMV_SECURITY, AccessPoint.class, msgs);
-            msgs = basicSetParentAccessPoint(newParentAccessPoint, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAccessPoint != null )
+                msgs = ( ( InternalEObject ) newParentAccessPoint ).eInverseAdd( this,
+                        SclPackage.ACCESS_POINT__SMV_SECURITY, AccessPoint.class, msgs );
+            msgs = basicSetParentAccessPoint( newParentAccessPoint, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT, newParentAccessPoint, newParentAccessPoint));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT,
+                    newParentAccessPoint, newParentAccessPoint ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class SMVSecurityImpl extends CertificateImpl implements SMVSecurity {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAccessPoint((AccessPoint)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAccessPoint( ( AccessPoint ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class SMVSecurityImpl extends CertificateImpl implements SMVSecurity {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT:
-                return basicSetParentAccessPoint(null, msgs);
+        switch( featureID ) {
+        case SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT:
+            return basicSetParentAccessPoint( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class SMVSecurityImpl extends CertificateImpl implements SMVSecurity {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ACCESS_POINT__SMV_SECURITY, AccessPoint.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ACCESS_POINT__SMV_SECURITY, AccessPoint.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class SMVSecurityImpl extends CertificateImpl implements SMVSecurity {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT:
-                return getParentAccessPoint();
+        switch( featureID ) {
+        case SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT:
+            return getParentAccessPoint();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class SMVSecurityImpl extends CertificateImpl implements SMVSecurity {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT:
-                setParentAccessPoint((AccessPoint)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT:
+            setParentAccessPoint( ( AccessPoint ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class SMVSecurityImpl extends CertificateImpl implements SMVSecurity {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT:
-                setParentAccessPoint((AccessPoint)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT:
+            setParentAccessPoint( ( AccessPoint ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class SMVSecurityImpl extends CertificateImpl implements SMVSecurity {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT:
-                return getParentAccessPoint() != null;
+        switch( featureID ) {
+        case SclPackage.SMV_SECURITY__PARENT_ACCESS_POINT:
+            return getParentAccessPoint() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //SMVSecurityImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVSettingsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVSettingsImpl.java
index b899d6a..0747400 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVSettingsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVSettingsImpl.java
@@ -205,7 +205,7 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      * @ordered
      */
-    protected EList<SmpRate> smpRate;
+    protected EList< SmpRate > smpRate;
     /**
      * The cached value of the '{@link #getSamplesPerSec() <em>Samples Per Sec</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -214,7 +214,7 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      * @ordered
      */
-    protected EList<SamplesPerSec> samplesPerSec;
+    protected EList< SamplesPerSec > samplesPerSec;
     /**
      * The cached value of the '{@link #getSecPerSamples() <em>Sec Per Samples</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -223,7 +223,7 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      * @ordered
      */
-    protected EList<SecPerSamples> secPerSamples;
+    protected EList< SecPerSamples > secPerSamples;
 
     /**
      * The default value of the '{@link #getSynchSrcId() <em>Synch Src Id</em>}' attribute.
@@ -357,13 +357,14 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public void setSvID(ServiceSettingsEnum newSvID) {
+    public void setSvID( ServiceSettingsEnum newSvID ) {
         ServiceSettingsEnum oldSvID = svID;
         svID = newSvID == null ? SV_ID_EDEFAULT : newSvID;
         boolean oldSvIDESet = svIDESet;
         svIDESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_SETTINGS__SV_ID, oldSvID, svID, !oldSvIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_SETTINGS__SV_ID, oldSvID, svID,
+                    !oldSvIDESet ) );
     }
 
     /**
@@ -377,8 +378,9 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
         boolean oldSvIDESet = svIDESet;
         svID = SV_ID_EDEFAULT;
         svIDESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_SETTINGS__SV_ID, oldSvID, SV_ID_EDEFAULT, oldSvIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_SETTINGS__SV_ID, oldSvID,
+                    SV_ID_EDEFAULT, oldSvIDESet ) );
     }
 
     /**
@@ -407,13 +409,14 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public void setOptFields(ServiceSettingsEnum newOptFields) {
+    public void setOptFields( ServiceSettingsEnum newOptFields ) {
         ServiceSettingsEnum oldOptFields = optFields;
         optFields = newOptFields == null ? OPT_FIELDS_EDEFAULT : newOptFields;
         boolean oldOptFieldsESet = optFieldsESet;
         optFieldsESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_SETTINGS__OPT_FIELDS, oldOptFields, optFields, !oldOptFieldsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_SETTINGS__OPT_FIELDS, oldOptFields,
+                    optFields, !oldOptFieldsESet ) );
     }
 
     /**
@@ -427,8 +430,9 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
         boolean oldOptFieldsESet = optFieldsESet;
         optFields = OPT_FIELDS_EDEFAULT;
         optFieldsESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_SETTINGS__OPT_FIELDS, oldOptFields, OPT_FIELDS_EDEFAULT, oldOptFieldsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_SETTINGS__OPT_FIELDS, oldOptFields,
+                    OPT_FIELDS_EDEFAULT, oldOptFieldsESet ) );
     }
 
     /**
@@ -457,13 +461,14 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public void setSmpRateAttribute(ServiceSettingsEnum newSmpRateAttribute) {
+    public void setSmpRateAttribute( ServiceSettingsEnum newSmpRateAttribute ) {
         ServiceSettingsEnum oldSmpRateAttribute = smpRateAttribute;
         smpRateAttribute = newSmpRateAttribute == null ? SMP_RATE_ATTRIBUTE_EDEFAULT : newSmpRateAttribute;
         boolean oldSmpRateAttributeESet = smpRateAttributeESet;
         smpRateAttributeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_SETTINGS__SMP_RATE_ATTRIBUTE, oldSmpRateAttribute, smpRateAttribute, !oldSmpRateAttributeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_SETTINGS__SMP_RATE_ATTRIBUTE,
+                    oldSmpRateAttribute, smpRateAttribute, !oldSmpRateAttributeESet ) );
     }
 
     /**
@@ -477,8 +482,9 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
         boolean oldSmpRateAttributeESet = smpRateAttributeESet;
         smpRateAttribute = SMP_RATE_ATTRIBUTE_EDEFAULT;
         smpRateAttributeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_SETTINGS__SMP_RATE_ATTRIBUTE, oldSmpRateAttribute, SMP_RATE_ATTRIBUTE_EDEFAULT, oldSmpRateAttributeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_SETTINGS__SMP_RATE_ATTRIBUTE,
+                    oldSmpRateAttribute, SMP_RATE_ATTRIBUTE_EDEFAULT, oldSmpRateAttributeESet ) );
     }
 
     /**
@@ -507,13 +513,14 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public void setSamplesPerSecAttribute(boolean newSamplesPerSecAttribute) {
+    public void setSamplesPerSecAttribute( boolean newSamplesPerSecAttribute ) {
         boolean oldSamplesPerSecAttribute = samplesPerSecAttribute;
         samplesPerSecAttribute = newSamplesPerSecAttribute;
         boolean oldSamplesPerSecAttributeESet = samplesPerSecAttributeESet;
         samplesPerSecAttributeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC_ATTRIBUTE, oldSamplesPerSecAttribute, samplesPerSecAttribute, !oldSamplesPerSecAttributeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC_ATTRIBUTE,
+                    oldSamplesPerSecAttribute, samplesPerSecAttribute, !oldSamplesPerSecAttributeESet ) );
     }
 
     /**
@@ -527,8 +534,10 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
         boolean oldSamplesPerSecAttributeESet = samplesPerSecAttributeESet;
         samplesPerSecAttribute = SAMPLES_PER_SEC_ATTRIBUTE_EDEFAULT;
         samplesPerSecAttributeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC_ATTRIBUTE, oldSamplesPerSecAttribute, SAMPLES_PER_SEC_ATTRIBUTE_EDEFAULT, oldSamplesPerSecAttributeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC_ATTRIBUTE, oldSamplesPerSecAttribute,
+                    SAMPLES_PER_SEC_ATTRIBUTE_EDEFAULT, oldSamplesPerSecAttributeESet ) );
     }
 
     /**
@@ -557,13 +566,14 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public void setPdcTimeStamp(boolean newPdcTimeStamp) {
+    public void setPdcTimeStamp( boolean newPdcTimeStamp ) {
         boolean oldPdcTimeStamp = pdcTimeStamp;
         pdcTimeStamp = newPdcTimeStamp;
         boolean oldPdcTimeStampESet = pdcTimeStampESet;
         pdcTimeStampESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_SETTINGS__PDC_TIME_STAMP, oldPdcTimeStamp, pdcTimeStamp, !oldPdcTimeStampESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_SETTINGS__PDC_TIME_STAMP,
+                    oldPdcTimeStamp, pdcTimeStamp, !oldPdcTimeStampESet ) );
     }
 
     /**
@@ -577,8 +587,9 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
         boolean oldPdcTimeStampESet = pdcTimeStampESet;
         pdcTimeStamp = PDC_TIME_STAMP_EDEFAULT;
         pdcTimeStampESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_SETTINGS__PDC_TIME_STAMP, oldPdcTimeStamp, PDC_TIME_STAMP_EDEFAULT, oldPdcTimeStampESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_SETTINGS__PDC_TIME_STAMP,
+                    oldPdcTimeStamp, PDC_TIME_STAMP_EDEFAULT, oldPdcTimeStampESet ) );
     }
 
     /**
@@ -597,9 +608,10 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public EList<SmpRate> getSmpRate() {
-        if (smpRate == null) {
-            smpRate = new EObjectContainmentWithInverseEList.Unsettable<SmpRate>(SmpRate.class, this, SclPackage.SMV_SETTINGS__SMP_RATE, SclPackage.SMP_RATE__PARENT_SMV_SETTINGS);
+    public EList< SmpRate > getSmpRate() {
+        if( smpRate == null ) {
+            smpRate = new EObjectContainmentWithInverseEList.Unsettable< SmpRate >( SmpRate.class, this,
+                    SclPackage.SMV_SETTINGS__SMP_RATE, SclPackage.SMP_RATE__PARENT_SMV_SETTINGS );
         }
         return smpRate;
     }
@@ -611,7 +623,7 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      */
     @Override
     public void unsetSmpRate() {
-        if (smpRate != null) ((InternalEList.Unsettable<?>)smpRate).unset();
+        if( smpRate != null ) ( ( InternalEList.Unsettable< ? > ) smpRate ).unset();
     }
 
     /**
@@ -621,7 +633,7 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      */
     @Override
     public boolean isSetSmpRate() {
-        return smpRate != null && ((InternalEList.Unsettable<?>)smpRate).isSet();
+        return smpRate != null && ( ( InternalEList.Unsettable< ? > ) smpRate ).isSet();
     }
 
     /**
@@ -630,9 +642,10 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public EList<SamplesPerSec> getSamplesPerSec() {
-        if (samplesPerSec == null) {
-            samplesPerSec = new EObjectContainmentWithInverseEList.Unsettable<SamplesPerSec>(SamplesPerSec.class, this, SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC, SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS);
+    public EList< SamplesPerSec > getSamplesPerSec() {
+        if( samplesPerSec == null ) {
+            samplesPerSec = new EObjectContainmentWithInverseEList.Unsettable< SamplesPerSec >( SamplesPerSec.class,
+                    this, SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC, SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS );
         }
         return samplesPerSec;
     }
@@ -644,7 +657,7 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      */
     @Override
     public void unsetSamplesPerSec() {
-        if (samplesPerSec != null) ((InternalEList.Unsettable<?>)samplesPerSec).unset();
+        if( samplesPerSec != null ) ( ( InternalEList.Unsettable< ? > ) samplesPerSec ).unset();
     }
 
     /**
@@ -654,7 +667,7 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      */
     @Override
     public boolean isSetSamplesPerSec() {
-        return samplesPerSec != null && ((InternalEList.Unsettable<?>)samplesPerSec).isSet();
+        return samplesPerSec != null && ( ( InternalEList.Unsettable< ? > ) samplesPerSec ).isSet();
     }
 
     /**
@@ -663,9 +676,10 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public EList<SecPerSamples> getSecPerSamples() {
-        if (secPerSamples == null) {
-            secPerSamples = new EObjectContainmentWithInverseEList.Unsettable<SecPerSamples>(SecPerSamples.class, this, SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES, SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS);
+    public EList< SecPerSamples > getSecPerSamples() {
+        if( secPerSamples == null ) {
+            secPerSamples = new EObjectContainmentWithInverseEList.Unsettable< SecPerSamples >( SecPerSamples.class,
+                    this, SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES, SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS );
         }
         return secPerSamples;
     }
@@ -677,7 +691,7 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      */
     @Override
     public void unsetSecPerSamples() {
-        if (secPerSamples != null) ((InternalEList.Unsettable<?>)secPerSamples).unset();
+        if( secPerSamples != null ) ( ( InternalEList.Unsettable< ? > ) secPerSamples ).unset();
     }
 
     /**
@@ -687,7 +701,7 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      */
     @Override
     public boolean isSetSecPerSamples() {
-        return secPerSamples != null && ((InternalEList.Unsettable<?>)secPerSamples).isSet();
+        return secPerSamples != null && ( ( InternalEList.Unsettable< ? > ) secPerSamples ).isSet();
     }
 
     /**
@@ -697,8 +711,8 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.SMV_SETTINGS__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SMV_SETTINGS__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -706,8 +720,9 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.SMV_SETTINGS__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.SMV_SETTINGS__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -717,20 +732,24 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.SMV_SETTINGS__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SMV_SETTINGS__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__SMV_SETTINGS, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__SMV_SETTINGS,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_SETTINGS__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_SETTINGS__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -749,13 +768,14 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public void setSynchSrcId(Boolean newSynchSrcId) {
+    public void setSynchSrcId( Boolean newSynchSrcId ) {
         Boolean oldSynchSrcId = synchSrcId;
         synchSrcId = newSynchSrcId;
         boolean oldSynchSrcIdESet = synchSrcIdESet;
         synchSrcIdESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_SETTINGS__SYNCH_SRC_ID, oldSynchSrcId, synchSrcId, !oldSynchSrcIdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_SETTINGS__SYNCH_SRC_ID,
+                    oldSynchSrcId, synchSrcId, !oldSynchSrcIdESet ) );
     }
 
     /**
@@ -769,8 +789,9 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
         boolean oldSynchSrcIdESet = synchSrcIdESet;
         synchSrcId = SYNCH_SRC_ID_EDEFAULT;
         synchSrcIdESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_SETTINGS__SYNCH_SRC_ID, oldSynchSrcId, SYNCH_SRC_ID_EDEFAULT, oldSynchSrcIdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_SETTINGS__SYNCH_SRC_ID,
+                    oldSynchSrcId, SYNCH_SRC_ID_EDEFAULT, oldSynchSrcIdESet ) );
     }
 
     /**
@@ -799,13 +820,14 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public void setNofASDU(ServiceSettingsNoDynEnum newNofASDU) {
+    public void setNofASDU( ServiceSettingsNoDynEnum newNofASDU ) {
         ServiceSettingsNoDynEnum oldNofASDU = nofASDU;
         nofASDU = newNofASDU == null ? NOF_ASDU_EDEFAULT : newNofASDU;
         boolean oldNofASDUESet = nofASDUESet;
         nofASDUESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_SETTINGS__NOF_ASDU, oldNofASDU, nofASDU, !oldNofASDUESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_SETTINGS__NOF_ASDU, oldNofASDU,
+                    nofASDU, !oldNofASDUESet ) );
     }
 
     /**
@@ -819,8 +841,9 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
         boolean oldNofASDUESet = nofASDUESet;
         nofASDU = NOF_ASDU_EDEFAULT;
         nofASDUESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_SETTINGS__NOF_ASDU, oldNofASDU, NOF_ASDU_EDEFAULT, oldNofASDUESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_SETTINGS__NOF_ASDU, oldNofASDU,
+                    NOF_ASDU_EDEFAULT, oldNofASDUESet ) );
     }
 
     /**
@@ -849,13 +872,14 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public void setKdaParticipant(Boolean newKdaParticipant) {
+    public void setKdaParticipant( Boolean newKdaParticipant ) {
         Boolean oldKdaParticipant = kdaParticipant;
         kdaParticipant = newKdaParticipant;
         boolean oldKdaParticipantESet = kdaParticipantESet;
         kdaParticipantESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_SETTINGS__KDA_PARTICIPANT, oldKdaParticipant, kdaParticipant, !oldKdaParticipantESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_SETTINGS__KDA_PARTICIPANT,
+                    oldKdaParticipant, kdaParticipant, !oldKdaParticipantESet ) );
     }
 
     /**
@@ -869,8 +893,9 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
         boolean oldKdaParticipantESet = kdaParticipantESet;
         kdaParticipant = KDA_PARTICIPANT_EDEFAULT;
         kdaParticipantESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_SETTINGS__KDA_PARTICIPANT, oldKdaParticipant, KDA_PARTICIPANT_EDEFAULT, oldKdaParticipantESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_SETTINGS__KDA_PARTICIPANT,
+                    oldKdaParticipant, KDA_PARTICIPANT_EDEFAULT, oldKdaParticipantESet ) );
     }
 
     /**
@@ -898,14 +923,18 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetMcSecurity(McSecurity newMcSecurity, NotificationChain msgs) {
+    public NotificationChain basicSetMcSecurity( McSecurity newMcSecurity, NotificationChain msgs ) {
         McSecurity oldMcSecurity = mcSecurity;
         mcSecurity = newMcSecurity;
         boolean oldMcSecurityESet = mcSecurityESet;
         mcSecurityESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SMV_SETTINGS__MC_SECURITY, oldMcSecurity, newMcSecurity, !oldMcSecurityESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SMV_SETTINGS__MC_SECURITY, oldMcSecurity, newMcSecurity, !oldMcSecurityESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -916,21 +945,24 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public void setMcSecurity(McSecurity newMcSecurity) {
-        if (newMcSecurity != mcSecurity) {
+    public void setMcSecurity( McSecurity newMcSecurity ) {
+        if( newMcSecurity != mcSecurity ) {
             NotificationChain msgs = null;
-            if (mcSecurity != null)
-                msgs = ((InternalEObject)mcSecurity).eInverseRemove(this, SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS, McSecurity.class, msgs);
-            if (newMcSecurity != null)
-                msgs = ((InternalEObject)newMcSecurity).eInverseAdd(this, SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS, McSecurity.class, msgs);
-            msgs = basicSetMcSecurity(newMcSecurity, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( mcSecurity != null )
+                msgs = ( ( InternalEObject ) mcSecurity ).eInverseRemove( this,
+                        SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS, McSecurity.class, msgs );
+            if( newMcSecurity != null )
+                msgs = ( ( InternalEObject ) newMcSecurity ).eInverseAdd( this,
+                        SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS, McSecurity.class, msgs );
+            msgs = basicSetMcSecurity( newMcSecurity, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldMcSecurityESet = mcSecurityESet;
             mcSecurityESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_SETTINGS__MC_SECURITY, newMcSecurity, newMcSecurity, !oldMcSecurityESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_SETTINGS__MC_SECURITY,
+                        newMcSecurity, newMcSecurity, !oldMcSecurityESet ) );
         }
     }
 
@@ -939,14 +971,18 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetMcSecurity(NotificationChain msgs) {
+    public NotificationChain basicUnsetMcSecurity( NotificationChain msgs ) {
         McSecurity oldMcSecurity = mcSecurity;
         mcSecurity = null;
         boolean oldMcSecurityESet = mcSecurityESet;
         mcSecurityESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_SETTINGS__MC_SECURITY, oldMcSecurity, null, oldMcSecurityESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SMV_SETTINGS__MC_SECURITY, oldMcSecurity, null, oldMcSecurityESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -958,17 +994,19 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      */
     @Override
     public void unsetMcSecurity() {
-        if (mcSecurity != null) {
+        if( mcSecurity != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)mcSecurity).eInverseRemove(this, SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS, McSecurity.class, msgs);
-            msgs = basicUnsetMcSecurity(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) mcSecurity ).eInverseRemove( this, SclPackage.MC_SECURITY__PARENT_SMV_SETTINGS,
+                    McSecurity.class, msgs );
+            msgs = basicUnsetMcSecurity( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldMcSecurityESet = mcSecurityESet;
             mcSecurityESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_SETTINGS__MC_SECURITY, null, null, oldMcSecurityESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_SETTINGS__MC_SECURITY, null,
+                        null, oldMcSecurityESet ) );
         }
     }
 
@@ -987,26 +1025,30 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     @Override
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.SMV_SETTINGS__SMP_RATE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSmpRate()).basicAdd(otherEnd, msgs);
-            case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSamplesPerSec()).basicAdd(otherEnd, msgs);
-            case SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSecPerSamples()).basicAdd(otherEnd, msgs);
-            case SclPackage.SMV_SETTINGS__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
-            case SclPackage.SMV_SETTINGS__MC_SECURITY:
-                if (mcSecurity != null)
-                    msgs = ((InternalEObject)mcSecurity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SMV_SETTINGS__MC_SECURITY, null, msgs);
-                return basicSetMcSecurity((McSecurity)otherEnd, msgs);
+    public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.SMV_SETTINGS__SMP_RATE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSmpRate() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSamplesPerSec() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSecPerSamples() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.SMV_SETTINGS__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
+        case SclPackage.SMV_SETTINGS__MC_SECURITY:
+            if( mcSecurity != null )
+                msgs = ( ( InternalEObject ) mcSecurity ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SMV_SETTINGS__MC_SECURITY, null, msgs );
+            return basicSetMcSecurity( ( McSecurity ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1015,20 +1057,20 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.SMV_SETTINGS__SMP_RATE:
-                return ((InternalEList<?>)getSmpRate()).basicRemove(otherEnd, msgs);
-            case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC:
-                return ((InternalEList<?>)getSamplesPerSec()).basicRemove(otherEnd, msgs);
-            case SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES:
-                return ((InternalEList<?>)getSecPerSamples()).basicRemove(otherEnd, msgs);
-            case SclPackage.SMV_SETTINGS__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
-            case SclPackage.SMV_SETTINGS__MC_SECURITY:
-                return basicUnsetMcSecurity(msgs);
+    public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.SMV_SETTINGS__SMP_RATE:
+            return ( ( InternalEList< ? > ) getSmpRate() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC:
+            return ( ( InternalEList< ? > ) getSamplesPerSec() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES:
+            return ( ( InternalEList< ? > ) getSecPerSamples() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SMV_SETTINGS__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
+        case SclPackage.SMV_SETTINGS__MC_SECURITY:
+            return basicUnsetMcSecurity( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -1037,12 +1079,12 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SMV_SETTINGS__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__SMV_SETTINGS, Services.class, msgs);
+    public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SMV_SETTINGS__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__SMV_SETTINGS, Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -1051,36 +1093,36 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.SMV_SETTINGS__SV_ID:
-                return getSvID();
-            case SclPackage.SMV_SETTINGS__OPT_FIELDS:
-                return getOptFields();
-            case SclPackage.SMV_SETTINGS__SMP_RATE_ATTRIBUTE:
-                return getSmpRateAttribute();
-            case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC_ATTRIBUTE:
-                return isSamplesPerSecAttribute();
-            case SclPackage.SMV_SETTINGS__PDC_TIME_STAMP:
-                return isPdcTimeStamp();
-            case SclPackage.SMV_SETTINGS__SMP_RATE:
-                return getSmpRate();
-            case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC:
-                return getSamplesPerSec();
-            case SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES:
-                return getSecPerSamples();
-            case SclPackage.SMV_SETTINGS__PARENT_SERVICES:
-                return getParentServices();
-            case SclPackage.SMV_SETTINGS__SYNCH_SRC_ID:
-                return getSynchSrcId();
-            case SclPackage.SMV_SETTINGS__NOF_ASDU:
-                return getNofASDU();
-            case SclPackage.SMV_SETTINGS__KDA_PARTICIPANT:
-                return getKdaParticipant();
-            case SclPackage.SMV_SETTINGS__MC_SECURITY:
-                return getMcSecurity();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.SMV_SETTINGS__SV_ID:
+            return getSvID();
+        case SclPackage.SMV_SETTINGS__OPT_FIELDS:
+            return getOptFields();
+        case SclPackage.SMV_SETTINGS__SMP_RATE_ATTRIBUTE:
+            return getSmpRateAttribute();
+        case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC_ATTRIBUTE:
+            return isSamplesPerSecAttribute();
+        case SclPackage.SMV_SETTINGS__PDC_TIME_STAMP:
+            return isPdcTimeStamp();
+        case SclPackage.SMV_SETTINGS__SMP_RATE:
+            return getSmpRate();
+        case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC:
+            return getSamplesPerSec();
+        case SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES:
+            return getSecPerSamples();
+        case SclPackage.SMV_SETTINGS__PARENT_SERVICES:
+            return getParentServices();
+        case SclPackage.SMV_SETTINGS__SYNCH_SRC_ID:
+            return getSynchSrcId();
+        case SclPackage.SMV_SETTINGS__NOF_ASDU:
+            return getNofASDU();
+        case SclPackage.SMV_SETTINGS__KDA_PARTICIPANT:
+            return getKdaParticipant();
+        case SclPackage.SMV_SETTINGS__MC_SECURITY:
+            return getMcSecurity();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -1088,54 +1130,54 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.SMV_SETTINGS__SV_ID:
-                setSvID((ServiceSettingsEnum)newValue);
-                return;
-            case SclPackage.SMV_SETTINGS__OPT_FIELDS:
-                setOptFields((ServiceSettingsEnum)newValue);
-                return;
-            case SclPackage.SMV_SETTINGS__SMP_RATE_ATTRIBUTE:
-                setSmpRateAttribute((ServiceSettingsEnum)newValue);
-                return;
-            case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC_ATTRIBUTE:
-                setSamplesPerSecAttribute((Boolean)newValue);
-                return;
-            case SclPackage.SMV_SETTINGS__PDC_TIME_STAMP:
-                setPdcTimeStamp((Boolean)newValue);
-                return;
-            case SclPackage.SMV_SETTINGS__SMP_RATE:
-                getSmpRate().clear();
-                getSmpRate().addAll((Collection<? extends SmpRate>)newValue);
-                return;
-            case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC:
-                getSamplesPerSec().clear();
-                getSamplesPerSec().addAll((Collection<? extends SamplesPerSec>)newValue);
-                return;
-            case SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES:
-                getSecPerSamples().clear();
-                getSecPerSamples().addAll((Collection<? extends SecPerSamples>)newValue);
-                return;
-            case SclPackage.SMV_SETTINGS__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
-            case SclPackage.SMV_SETTINGS__SYNCH_SRC_ID:
-                setSynchSrcId((Boolean)newValue);
-                return;
-            case SclPackage.SMV_SETTINGS__NOF_ASDU:
-                setNofASDU((ServiceSettingsNoDynEnum)newValue);
-                return;
-            case SclPackage.SMV_SETTINGS__KDA_PARTICIPANT:
-                setKdaParticipant((Boolean)newValue);
-                return;
-            case SclPackage.SMV_SETTINGS__MC_SECURITY:
-                setMcSecurity((McSecurity)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.SMV_SETTINGS__SV_ID:
+            setSvID( ( ServiceSettingsEnum ) newValue );
+            return;
+        case SclPackage.SMV_SETTINGS__OPT_FIELDS:
+            setOptFields( ( ServiceSettingsEnum ) newValue );
+            return;
+        case SclPackage.SMV_SETTINGS__SMP_RATE_ATTRIBUTE:
+            setSmpRateAttribute( ( ServiceSettingsEnum ) newValue );
+            return;
+        case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC_ATTRIBUTE:
+            setSamplesPerSecAttribute( ( Boolean ) newValue );
+            return;
+        case SclPackage.SMV_SETTINGS__PDC_TIME_STAMP:
+            setPdcTimeStamp( ( Boolean ) newValue );
+            return;
+        case SclPackage.SMV_SETTINGS__SMP_RATE:
+            getSmpRate().clear();
+            getSmpRate().addAll( ( Collection< ? extends SmpRate > ) newValue );
+            return;
+        case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC:
+            getSamplesPerSec().clear();
+            getSamplesPerSec().addAll( ( Collection< ? extends SamplesPerSec > ) newValue );
+            return;
+        case SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES:
+            getSecPerSamples().clear();
+            getSecPerSamples().addAll( ( Collection< ? extends SecPerSamples > ) newValue );
+            return;
+        case SclPackage.SMV_SETTINGS__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
+        case SclPackage.SMV_SETTINGS__SYNCH_SRC_ID:
+            setSynchSrcId( ( Boolean ) newValue );
+            return;
+        case SclPackage.SMV_SETTINGS__NOF_ASDU:
+            setNofASDU( ( ServiceSettingsNoDynEnum ) newValue );
+            return;
+        case SclPackage.SMV_SETTINGS__KDA_PARTICIPANT:
+            setKdaParticipant( ( Boolean ) newValue );
+            return;
+        case SclPackage.SMV_SETTINGS__MC_SECURITY:
+            setMcSecurity( ( McSecurity ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -1144,49 +1186,49 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.SMV_SETTINGS__SV_ID:
-                unsetSvID();
-                return;
-            case SclPackage.SMV_SETTINGS__OPT_FIELDS:
-                unsetOptFields();
-                return;
-            case SclPackage.SMV_SETTINGS__SMP_RATE_ATTRIBUTE:
-                unsetSmpRateAttribute();
-                return;
-            case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC_ATTRIBUTE:
-                unsetSamplesPerSecAttribute();
-                return;
-            case SclPackage.SMV_SETTINGS__PDC_TIME_STAMP:
-                unsetPdcTimeStamp();
-                return;
-            case SclPackage.SMV_SETTINGS__SMP_RATE:
-                unsetSmpRate();
-                return;
-            case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC:
-                unsetSamplesPerSec();
-                return;
-            case SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES:
-                unsetSecPerSamples();
-                return;
-            case SclPackage.SMV_SETTINGS__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
-            case SclPackage.SMV_SETTINGS__SYNCH_SRC_ID:
-                unsetSynchSrcId();
-                return;
-            case SclPackage.SMV_SETTINGS__NOF_ASDU:
-                unsetNofASDU();
-                return;
-            case SclPackage.SMV_SETTINGS__KDA_PARTICIPANT:
-                unsetKdaParticipant();
-                return;
-            case SclPackage.SMV_SETTINGS__MC_SECURITY:
-                unsetMcSecurity();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SMV_SETTINGS__SV_ID:
+            unsetSvID();
+            return;
+        case SclPackage.SMV_SETTINGS__OPT_FIELDS:
+            unsetOptFields();
+            return;
+        case SclPackage.SMV_SETTINGS__SMP_RATE_ATTRIBUTE:
+            unsetSmpRateAttribute();
+            return;
+        case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC_ATTRIBUTE:
+            unsetSamplesPerSecAttribute();
+            return;
+        case SclPackage.SMV_SETTINGS__PDC_TIME_STAMP:
+            unsetPdcTimeStamp();
+            return;
+        case SclPackage.SMV_SETTINGS__SMP_RATE:
+            unsetSmpRate();
+            return;
+        case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC:
+            unsetSamplesPerSec();
+            return;
+        case SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES:
+            unsetSecPerSamples();
+            return;
+        case SclPackage.SMV_SETTINGS__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
+        case SclPackage.SMV_SETTINGS__SYNCH_SRC_ID:
+            unsetSynchSrcId();
+            return;
+        case SclPackage.SMV_SETTINGS__NOF_ASDU:
+            unsetNofASDU();
+            return;
+        case SclPackage.SMV_SETTINGS__KDA_PARTICIPANT:
+            unsetKdaParticipant();
+            return;
+        case SclPackage.SMV_SETTINGS__MC_SECURITY:
+            unsetMcSecurity();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -1195,36 +1237,36 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.SMV_SETTINGS__SV_ID:
-                return isSetSvID();
-            case SclPackage.SMV_SETTINGS__OPT_FIELDS:
-                return isSetOptFields();
-            case SclPackage.SMV_SETTINGS__SMP_RATE_ATTRIBUTE:
-                return isSetSmpRateAttribute();
-            case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC_ATTRIBUTE:
-                return isSetSamplesPerSecAttribute();
-            case SclPackage.SMV_SETTINGS__PDC_TIME_STAMP:
-                return isSetPdcTimeStamp();
-            case SclPackage.SMV_SETTINGS__SMP_RATE:
-                return isSetSmpRate();
-            case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC:
-                return isSetSamplesPerSec();
-            case SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES:
-                return isSetSecPerSamples();
-            case SclPackage.SMV_SETTINGS__PARENT_SERVICES:
-                return getParentServices() != null;
-            case SclPackage.SMV_SETTINGS__SYNCH_SRC_ID:
-                return isSetSynchSrcId();
-            case SclPackage.SMV_SETTINGS__NOF_ASDU:
-                return isSetNofASDU();
-            case SclPackage.SMV_SETTINGS__KDA_PARTICIPANT:
-                return isSetKdaParticipant();
-            case SclPackage.SMV_SETTINGS__MC_SECURITY:
-                return isSetMcSecurity();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SMV_SETTINGS__SV_ID:
+            return isSetSvID();
+        case SclPackage.SMV_SETTINGS__OPT_FIELDS:
+            return isSetOptFields();
+        case SclPackage.SMV_SETTINGS__SMP_RATE_ATTRIBUTE:
+            return isSetSmpRateAttribute();
+        case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC_ATTRIBUTE:
+            return isSetSamplesPerSecAttribute();
+        case SclPackage.SMV_SETTINGS__PDC_TIME_STAMP:
+            return isSetPdcTimeStamp();
+        case SclPackage.SMV_SETTINGS__SMP_RATE:
+            return isSetSmpRate();
+        case SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC:
+            return isSetSamplesPerSec();
+        case SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES:
+            return isSetSecPerSamples();
+        case SclPackage.SMV_SETTINGS__PARENT_SERVICES:
+            return getParentServices() != null;
+        case SclPackage.SMV_SETTINGS__SYNCH_SRC_ID:
+            return isSetSynchSrcId();
+        case SclPackage.SMV_SETTINGS__NOF_ASDU:
+            return isSetNofASDU();
+        case SclPackage.SMV_SETTINGS__KDA_PARTICIPANT:
+            return isSetKdaParticipant();
+        case SclPackage.SMV_SETTINGS__MC_SECURITY:
+            return isSetMcSecurity();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -1234,26 +1276,50 @@ public class SMVSettingsImpl extends ServiceSettingsImpl implements SMVSettings
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (svID: ");
-        if (svIDESet) result.append(svID); else result.append("<unset>");
-        result.append(", optFields: ");
-        if (optFieldsESet) result.append(optFields); else result.append("<unset>");
-        result.append(", smpRateAttribute: ");
-        if (smpRateAttributeESet) result.append(smpRateAttribute); else result.append("<unset>");
-        result.append(", samplesPerSecAttribute: ");
-        if (samplesPerSecAttributeESet) result.append(samplesPerSecAttribute); else result.append("<unset>");
-        result.append(", pdcTimeStamp: ");
-        if (pdcTimeStampESet) result.append(pdcTimeStamp); else result.append("<unset>");
-        result.append(", synchSrcId: ");
-        if (synchSrcIdESet) result.append(synchSrcId); else result.append("<unset>");
-        result.append(", nofASDU: ");
-        if (nofASDUESet) result.append(nofASDU); else result.append("<unset>");
-        result.append(", kdaParticipant: ");
-        if (kdaParticipantESet) result.append(kdaParticipant); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (svID: " );
+        if( svIDESet )
+            result.append( svID );
+        else
+            result.append( "<unset>" );
+        result.append( ", optFields: " );
+        if( optFieldsESet )
+            result.append( optFields );
+        else
+            result.append( "<unset>" );
+        result.append( ", smpRateAttribute: " );
+        if( smpRateAttributeESet )
+            result.append( smpRateAttribute );
+        else
+            result.append( "<unset>" );
+        result.append( ", samplesPerSecAttribute: " );
+        if( samplesPerSecAttributeESet )
+            result.append( samplesPerSecAttribute );
+        else
+            result.append( "<unset>" );
+        result.append( ", pdcTimeStamp: " );
+        if( pdcTimeStampESet )
+            result.append( pdcTimeStamp );
+        else
+            result.append( "<unset>" );
+        result.append( ", synchSrcId: " );
+        if( synchSrcIdESet )
+            result.append( synchSrcId );
+        else
+            result.append( "<unset>" );
+        result.append( ", nofASDU: " );
+        if( nofASDUESet )
+            result.append( nofASDU );
+        else
+            result.append( "<unset>" );
+        result.append( ", kdaParticipant: " );
+        if( kdaParticipantESet )
+            result.append( kdaParticipant );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVscImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVscImpl.java
index 0ca227e..c5d7ed1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVscImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SMVscImpl.java
@@ -206,8 +206,9 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
         delivery = newDelivery == null ? DELIVERY_EDEFAULT : newDelivery;
         boolean oldDeliveryESet = deliveryESet;
         deliveryESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SM_VSC__DELIVERY, oldDelivery, delivery, !oldDeliveryESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SM_VSC__DELIVERY, oldDelivery, delivery,
+                    !oldDeliveryESet ) );
     }
 
     /**
@@ -221,8 +222,9 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
         boolean oldDeliveryESet = deliveryESet;
         delivery = DELIVERY_EDEFAULT;
         deliveryESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SM_VSC__DELIVERY, oldDelivery, DELIVERY_EDEFAULT, oldDeliveryESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SM_VSC__DELIVERY, oldDelivery,
+                    DELIVERY_EDEFAULT, oldDeliveryESet ) );
     }
 
     /**
@@ -256,8 +258,9 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
         deliveryConf = newDeliveryConf;
         boolean oldDeliveryConfESet = deliveryConfESet;
         deliveryConfESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SM_VSC__DELIVERY_CONF, oldDeliveryConf, deliveryConf, !oldDeliveryConfESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SM_VSC__DELIVERY_CONF, oldDeliveryConf,
+                    deliveryConf, !oldDeliveryConfESet ) );
     }
 
     /**
@@ -271,8 +274,9 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
         boolean oldDeliveryConfESet = deliveryConfESet;
         deliveryConf = DELIVERY_CONF_EDEFAULT;
         deliveryConfESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SM_VSC__DELIVERY_CONF, oldDeliveryConf, DELIVERY_CONF_EDEFAULT, oldDeliveryConfESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SM_VSC__DELIVERY_CONF, oldDeliveryConf,
+                    DELIVERY_CONF_EDEFAULT, oldDeliveryConfESet ) );
     }
 
     /**
@@ -292,8 +296,8 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.SM_VSC__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SM_VSC__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -301,8 +305,8 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.SM_VSC__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.SM_VSC__PARENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -312,20 +316,23 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.SM_VSC__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SM_VSC__PARENT_SERVICES && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__SM_VSC, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__SM_VSC,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SM_VSC__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SM_VSC__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -344,13 +351,13 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
      * @generated
      */
     @Override
-    public void setSv(Boolean newSv) {
+    public void setSv( Boolean newSv ) {
         Boolean oldSv = sv;
         sv = newSv;
         boolean oldSvESet = svESet;
         svESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SM_VSC__SV, oldSv, sv, !oldSvESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SM_VSC__SV, oldSv, sv, !oldSvESet ) );
     }
 
     /**
@@ -364,8 +371,9 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
         boolean oldSvESet = svESet;
         sv = SV_EDEFAULT;
         svESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SM_VSC__SV, oldSv, SV_EDEFAULT, oldSvESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SM_VSC__SV, oldSv, SV_EDEFAULT,
+                    oldSvESet ) );
     }
 
     /**
@@ -394,13 +402,14 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
      * @generated
      */
     @Override
-    public void setRSV(Boolean newRSV) {
+    public void setRSV( Boolean newRSV ) {
         Boolean oldRSV = rSV;
         rSV = newRSV;
         boolean oldRSVESet = rSVESet;
         rSVESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SM_VSC__RSV, oldRSV, rSV, !oldRSVESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SM_VSC__RSV, oldRSV, rSV,
+                    !oldRSVESet ) );
     }
 
     /**
@@ -414,8 +423,9 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
         boolean oldRSVESet = rSVESet;
         rSV = RSV_EDEFAULT;
         rSVESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SM_VSC__RSV, oldRSV, RSV_EDEFAULT, oldRSVESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SM_VSC__RSV, oldRSV, RSV_EDEFAULT,
+                    oldRSVESet ) );
     }
 
     /**
@@ -435,13 +445,13 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SM_VSC__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SM_VSC__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -451,11 +461,11 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SM_VSC__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.SM_VSC__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -465,11 +475,11 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SM_VSC__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__SM_VSC, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SM_VSC__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__SM_VSC, Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -479,19 +489,19 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SM_VSC__DELIVERY:
-                return getDelivery();
-            case SclPackage.SM_VSC__DELIVERY_CONF:
-                return getDeliveryConf();
-            case SclPackage.SM_VSC__PARENT_SERVICES:
-                return getParentServices();
-            case SclPackage.SM_VSC__SV:
-                return getSv();
-            case SclPackage.SM_VSC__RSV:
-                return getRSV();
+        switch( featureID ) {
+        case SclPackage.SM_VSC__DELIVERY:
+            return getDelivery();
+        case SclPackage.SM_VSC__DELIVERY_CONF:
+            return getDeliveryConf();
+        case SclPackage.SM_VSC__PARENT_SERVICES:
+            return getParentServices();
+        case SclPackage.SM_VSC__SV:
+            return getSv();
+        case SclPackage.SM_VSC__RSV:
+            return getRSV();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -501,24 +511,24 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SM_VSC__DELIVERY:
-                setDelivery((SMVDeliveryEnum)newValue);
-                return;
-            case SclPackage.SM_VSC__DELIVERY_CONF:
-                setDeliveryConf((Boolean)newValue);
-                return;
-            case SclPackage.SM_VSC__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
-            case SclPackage.SM_VSC__SV:
-                setSv((Boolean)newValue);
-                return;
-            case SclPackage.SM_VSC__RSV:
-                setRSV((Boolean)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SM_VSC__DELIVERY:
+            setDelivery( ( SMVDeliveryEnum ) newValue );
+            return;
+        case SclPackage.SM_VSC__DELIVERY_CONF:
+            setDeliveryConf( ( Boolean ) newValue );
+            return;
+        case SclPackage.SM_VSC__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
+        case SclPackage.SM_VSC__SV:
+            setSv( ( Boolean ) newValue );
+            return;
+        case SclPackage.SM_VSC__RSV:
+            setRSV( ( Boolean ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -528,24 +538,24 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SM_VSC__DELIVERY:
-                unsetDelivery();
-                return;
-            case SclPackage.SM_VSC__DELIVERY_CONF:
-                unsetDeliveryConf();
-                return;
-            case SclPackage.SM_VSC__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
-            case SclPackage.SM_VSC__SV:
-                unsetSv();
-                return;
-            case SclPackage.SM_VSC__RSV:
-                unsetRSV();
-                return;
+        switch( featureID ) {
+        case SclPackage.SM_VSC__DELIVERY:
+            unsetDelivery();
+            return;
+        case SclPackage.SM_VSC__DELIVERY_CONF:
+            unsetDeliveryConf();
+            return;
+        case SclPackage.SM_VSC__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
+        case SclPackage.SM_VSC__SV:
+            unsetSv();
+            return;
+        case SclPackage.SM_VSC__RSV:
+            unsetRSV();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -555,19 +565,19 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SM_VSC__DELIVERY:
-                return isSetDelivery();
-            case SclPackage.SM_VSC__DELIVERY_CONF:
-                return isSetDeliveryConf();
-            case SclPackage.SM_VSC__PARENT_SERVICES:
-                return getParentServices() != null;
-            case SclPackage.SM_VSC__SV:
-                return isSetSv();
-            case SclPackage.SM_VSC__RSV:
-                return isSetRSV();
+        switch( featureID ) {
+        case SclPackage.SM_VSC__DELIVERY:
+            return isSetDelivery();
+        case SclPackage.SM_VSC__DELIVERY_CONF:
+            return isSetDeliveryConf();
+        case SclPackage.SM_VSC__PARENT_SERVICES:
+            return getParentServices() != null;
+        case SclPackage.SM_VSC__SV:
+            return isSetSv();
+        case SclPackage.SM_VSC__RSV:
+            return isSetRSV();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -577,18 +587,30 @@ public class SMVscImpl extends ServiceWithMaxImpl implements SMVsc {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (delivery: ");
-        if (deliveryESet) result.append(delivery); else result.append("<unset>");
-        result.append(", deliveryConf: ");
-        if (deliveryConfESet) result.append(deliveryConf); else result.append("<unset>");
-        result.append(", sv: ");
-        if (svESet) result.append(sv); else result.append("<unset>");
-        result.append(", rSV: ");
-        if (rSVESet) result.append(rSV); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (delivery: " );
+        if( deliveryESet )
+            result.append( delivery );
+        else
+            result.append( "<unset>" );
+        result.append( ", deliveryConf: " );
+        if( deliveryConfESet )
+            result.append( deliveryConf );
+        else
+            result.append( "<unset>" );
+        result.append( ", sv: " );
+        if( svESet )
+            result.append( sv );
+        else
+            result.append( "<unset>" );
+        result.append( ", rSV: " );
+        if( rSVESet )
+            result.append( rSV );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SampledValueControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SampledValueControlImpl.java
index c208b2f..8a603a5 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SampledValueControlImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SampledValueControlImpl.java
@@ -289,8 +289,9 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
         multicast = newMulticast;
         boolean oldMulticastESet = multicastESet;
         multicastESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__MULTICAST, oldMulticast, multicast, !oldMulticastESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__MULTICAST,
+                    oldMulticast, multicast, !oldMulticastESet ) );
     }
 
     /**
@@ -304,8 +305,9 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
         boolean oldMulticastESet = multicastESet;
         multicast = MULTICAST_EDEFAULT;
         multicastESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__MULTICAST, oldMulticast, MULTICAST_EDEFAULT, oldMulticastESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__MULTICAST,
+                    oldMulticast, MULTICAST_EDEFAULT, oldMulticastESet ) );
     }
 
     /**
@@ -339,8 +341,9 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
         nofASDU = newNofASDU;
         boolean oldNofASDUESet = nofASDUESet;
         nofASDUESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__NOF_ASDU, oldNofASDU, nofASDU, !oldNofASDUESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__NOF_ASDU,
+                    oldNofASDU, nofASDU, !oldNofASDUESet ) );
     }
 
     /**
@@ -354,8 +357,9 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
         boolean oldNofASDUESet = nofASDUESet;
         nofASDU = NOF_ASDU_EDEFAULT;
         nofASDUESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__NOF_ASDU, oldNofASDU, NOF_ASDU_EDEFAULT, oldNofASDUESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__NOF_ASDU,
+                    oldNofASDU, NOF_ASDU_EDEFAULT, oldNofASDUESet ) );
     }
 
     /**
@@ -389,8 +393,9 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
         securityEnable = newSecurityEnable == null ? SECURITY_ENABLE_EDEFAULT : newSecurityEnable;
         boolean oldSecurityEnableESet = securityEnableESet;
         securityEnableESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__SECURITY_ENABLE, oldSecurityEnable, securityEnable, !oldSecurityEnableESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__SECURITY_ENABLE,
+                    oldSecurityEnable, securityEnable, !oldSecurityEnableESet ) );
     }
 
     /**
@@ -404,8 +409,9 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
         boolean oldSecurityEnableESet = securityEnableESet;
         securityEnable = SECURITY_ENABLE_EDEFAULT;
         securityEnableESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__SECURITY_ENABLE, oldSecurityEnable, SECURITY_ENABLE_EDEFAULT, oldSecurityEnableESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__SECURITY_ENABLE,
+                    oldSecurityEnable, SECURITY_ENABLE_EDEFAULT, oldSecurityEnableESet ) );
     }
 
     /**
@@ -439,8 +445,9 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
         smpMod = newSmpMod == null ? SMP_MOD_EDEFAULT : newSmpMod;
         boolean oldSmpModESet = smpModESet;
         smpModESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__SMP_MOD, oldSmpMod, smpMod, !oldSmpModESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__SMP_MOD,
+                    oldSmpMod, smpMod, !oldSmpModESet ) );
     }
 
     /**
@@ -454,8 +461,9 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
         boolean oldSmpModESet = smpModESet;
         smpMod = SMP_MOD_EDEFAULT;
         smpModESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__SMP_MOD, oldSmpMod, SMP_MOD_EDEFAULT, oldSmpModESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__SMP_MOD,
+                    oldSmpMod, SMP_MOD_EDEFAULT, oldSmpModESet ) );
     }
 
     /**
@@ -489,8 +497,9 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
         smpRate = newSmpRate;
         boolean oldSmpRateESet = smpRateESet;
         smpRateESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__SMP_RATE, oldSmpRate, smpRate, !oldSmpRateESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__SMP_RATE,
+                    oldSmpRate, smpRate, !oldSmpRateESet ) );
     }
 
     /**
@@ -504,8 +513,9 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
         boolean oldSmpRateESet = smpRateESet;
         smpRate = SMP_RATE_EDEFAULT;
         smpRateESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__SMP_RATE, oldSmpRate, SMP_RATE_EDEFAULT, oldSmpRateESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__SMP_RATE,
+                    oldSmpRate, SMP_RATE_EDEFAULT, oldSmpRateESet ) );
     }
 
     /**
@@ -539,8 +549,9 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
         smvID = newSmvID;
         boolean oldSmvIDESet = smvIDESet;
         smvIDESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__SMV_ID, oldSmvID, smvID, !oldSmvIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__SMV_ID, oldSmvID,
+                    smvID, !oldSmvIDESet ) );
     }
 
     /**
@@ -554,8 +565,9 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
         boolean oldSmvIDESet = smvIDESet;
         smvID = SMV_ID_EDEFAULT;
         smvIDESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__SMV_ID, oldSmvID, SMV_ID_EDEFAULT, oldSmvIDESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__SMV_ID,
+                    oldSmvID, SMV_ID_EDEFAULT, oldSmvIDESet ) );
     }
 
     /**
@@ -575,8 +587,8 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
      */
     @Override
     public LN0 getParentLN0() {
-        if (eContainerFeatureID() != SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0) return null;
-        return (LN0)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0 ) return null;
+        return ( LN0 ) eInternalContainer();
     }
 
     /**
@@ -584,8 +596,9 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentLN0(LN0 newParentLN0, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentLN0, SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0, msgs);
+    public NotificationChain basicSetParentLN0( LN0 newParentLN0, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentLN0, SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0,
+                msgs );
         return msgs;
     }
 
@@ -595,20 +608,23 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
      * @generated
      */
     @Override
-    public void setParentLN0(LN0 newParentLN0) {
-        if (newParentLN0 != eInternalContainer() || (eContainerFeatureID() != SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0 && newParentLN0 != null)) {
-            if (EcoreUtil.isAncestor(this, newParentLN0))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentLN0( LN0 newParentLN0 ) {
+        if( newParentLN0 != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0 && newParentLN0 != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentLN0 ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentLN0 != null)
-                msgs = ((InternalEObject)newParentLN0).eInverseAdd(this, SclPackage.LN0__SAMPLED_VALUE_CONTROL, LN0.class, msgs);
-            msgs = basicSetParentLN0(newParentLN0, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentLN0 != null )
+                msgs = ( ( InternalEObject ) newParentLN0 ).eInverseAdd( this, SclPackage.LN0__SAMPLED_VALUE_CONTROL,
+                        LN0.class, msgs );
+            msgs = basicSetParentLN0( newParentLN0, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0, newParentLN0, newParentLN0));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0,
+                    newParentLN0, newParentLN0 ) );
     }
 
     /**
@@ -631,9 +647,13 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
         smvOpts = newSmvOpts;
         boolean oldSmvOptsESet = smvOptsESet;
         smvOptsESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS, oldSmvOpts, newSmvOpts, !oldSmvOptsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS, oldSmvOpts, newSmvOpts, !oldSmvOptsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -645,20 +665,23 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
      */
     @Override
     public void setSmvOpts( SmvOpts newSmvOpts ) {
-        if (newSmvOpts != smvOpts) {
+        if( newSmvOpts != smvOpts ) {
             NotificationChain msgs = null;
-            if (smvOpts != null)
-                msgs = ((InternalEObject)smvOpts).eInverseRemove(this, SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL, SmvOpts.class, msgs);
-            if (newSmvOpts != null)
-                msgs = ((InternalEObject)newSmvOpts).eInverseAdd(this, SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL, SmvOpts.class, msgs);
-            msgs = basicSetSmvOpts(newSmvOpts, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( smvOpts != null )
+                msgs = ( ( InternalEObject ) smvOpts ).eInverseRemove( this,
+                        SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL, SmvOpts.class, msgs );
+            if( newSmvOpts != null )
+                msgs = ( ( InternalEObject ) newSmvOpts ).eInverseAdd( this,
+                        SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL, SmvOpts.class, msgs );
+            msgs = basicSetSmvOpts( newSmvOpts, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSmvOptsESet = smvOptsESet;
             smvOptsESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS, newSmvOpts, newSmvOpts, !oldSmvOptsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS,
+                        newSmvOpts, newSmvOpts, !oldSmvOptsESet ) );
         }
     }
 
@@ -672,9 +695,13 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
         smvOpts = null;
         boolean oldSmvOptsESet = smvOptsESet;
         smvOptsESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS, oldSmvOpts, null, oldSmvOptsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS, oldSmvOpts, null, oldSmvOptsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -686,17 +713,19 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
      */
     @Override
     public void unsetSmvOpts() {
-        if (smvOpts != null) {
+        if( smvOpts != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)smvOpts).eInverseRemove(this, SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL, SmvOpts.class, msgs);
-            msgs = basicUnsetSmvOpts(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) smvOpts ).eInverseRemove( this,
+                    SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL, SmvOpts.class, msgs );
+            msgs = basicUnsetSmvOpts( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSmvOptsESet = smvOptsESet;
             smvOptsESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS, null, null, oldSmvOptsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS,
+                        null, null, oldSmvOptsESet ) );
         }
     }
 
@@ -717,17 +746,18 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentLN0((LN0)otherEnd, msgs);
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS:
-                if (smvOpts != null)
-                    msgs = ((InternalEObject)smvOpts).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS, null, msgs);
-                return basicSetSmvOpts((SmvOpts)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentLN0( ( LN0 ) otherEnd, msgs );
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS:
+            if( smvOpts != null )
+                msgs = ( ( InternalEObject ) smvOpts ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS, null, msgs );
+            return basicSetSmvOpts( ( SmvOpts ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -737,13 +767,13 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0:
-                return basicSetParentLN0(null, msgs);
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS:
-                return basicUnsetSmvOpts(msgs);
+        switch( featureID ) {
+        case SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0:
+            return basicSetParentLN0( null, msgs );
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS:
+            return basicUnsetSmvOpts( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -753,11 +783,11 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0:
-                return eInternalContainer().eInverseRemove(this, SclPackage.LN0__SAMPLED_VALUE_CONTROL, LN0.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0:
+            return eInternalContainer().eInverseRemove( this, SclPackage.LN0__SAMPLED_VALUE_CONTROL, LN0.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -767,25 +797,25 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SAMPLED_VALUE_CONTROL__MULTICAST:
-                return getMulticast();
-            case SclPackage.SAMPLED_VALUE_CONTROL__NOF_ASDU:
-                return getNofASDU();
-            case SclPackage.SAMPLED_VALUE_CONTROL__SECURITY_ENABLE:
-                return getSecurityEnable();
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMP_MOD:
-                return getSmpMod();
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMP_RATE:
-                return getSmpRate();
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMV_ID:
-                return getSmvID();
-            case SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0:
-                return getParentLN0();
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS:
-                return getSmvOpts();
+        switch( featureID ) {
+        case SclPackage.SAMPLED_VALUE_CONTROL__MULTICAST:
+            return getMulticast();
+        case SclPackage.SAMPLED_VALUE_CONTROL__NOF_ASDU:
+            return getNofASDU();
+        case SclPackage.SAMPLED_VALUE_CONTROL__SECURITY_ENABLE:
+            return getSecurityEnable();
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMP_MOD:
+            return getSmpMod();
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMP_RATE:
+            return getSmpRate();
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMV_ID:
+            return getSmvID();
+        case SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0:
+            return getParentLN0();
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS:
+            return getSmvOpts();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -795,33 +825,33 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SAMPLED_VALUE_CONTROL__MULTICAST:
-                setMulticast((Boolean)newValue);
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__NOF_ASDU:
-                setNofASDU((Integer)newValue);
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__SECURITY_ENABLE:
-                setSecurityEnable((PredefinedTypeOfSecurityEnum)newValue);
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMP_MOD:
-                setSmpMod((SmpMod)newValue);
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMP_RATE:
-                setSmpRate((Integer)newValue);
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMV_ID:
-                setSmvID((String)newValue);
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0:
-                setParentLN0((LN0)newValue);
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS:
-                setSmvOpts((SmvOpts)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SAMPLED_VALUE_CONTROL__MULTICAST:
+            setMulticast( ( Boolean ) newValue );
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__NOF_ASDU:
+            setNofASDU( ( Integer ) newValue );
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__SECURITY_ENABLE:
+            setSecurityEnable( ( PredefinedTypeOfSecurityEnum ) newValue );
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMP_MOD:
+            setSmpMod( ( SmpMod ) newValue );
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMP_RATE:
+            setSmpRate( ( Integer ) newValue );
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMV_ID:
+            setSmvID( ( String ) newValue );
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0:
+            setParentLN0( ( LN0 ) newValue );
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS:
+            setSmvOpts( ( SmvOpts ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -831,33 +861,33 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SAMPLED_VALUE_CONTROL__MULTICAST:
-                unsetMulticast();
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__NOF_ASDU:
-                unsetNofASDU();
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__SECURITY_ENABLE:
-                unsetSecurityEnable();
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMP_MOD:
-                unsetSmpMod();
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMP_RATE:
-                unsetSmpRate();
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMV_ID:
-                unsetSmvID();
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0:
-                setParentLN0((LN0)null);
-                return;
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS:
-                unsetSmvOpts();
-                return;
+        switch( featureID ) {
+        case SclPackage.SAMPLED_VALUE_CONTROL__MULTICAST:
+            unsetMulticast();
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__NOF_ASDU:
+            unsetNofASDU();
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__SECURITY_ENABLE:
+            unsetSecurityEnable();
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMP_MOD:
+            unsetSmpMod();
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMP_RATE:
+            unsetSmpRate();
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMV_ID:
+            unsetSmvID();
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0:
+            setParentLN0( ( LN0 ) null );
+            return;
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS:
+            unsetSmvOpts();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -867,25 +897,25 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SAMPLED_VALUE_CONTROL__MULTICAST:
-                return isSetMulticast();
-            case SclPackage.SAMPLED_VALUE_CONTROL__NOF_ASDU:
-                return isSetNofASDU();
-            case SclPackage.SAMPLED_VALUE_CONTROL__SECURITY_ENABLE:
-                return isSetSecurityEnable();
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMP_MOD:
-                return isSetSmpMod();
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMP_RATE:
-                return isSetSmpRate();
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMV_ID:
-                return isSetSmvID();
-            case SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0:
-                return getParentLN0() != null;
-            case SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS:
-                return isSetSmvOpts();
+        switch( featureID ) {
+        case SclPackage.SAMPLED_VALUE_CONTROL__MULTICAST:
+            return isSetMulticast();
+        case SclPackage.SAMPLED_VALUE_CONTROL__NOF_ASDU:
+            return isSetNofASDU();
+        case SclPackage.SAMPLED_VALUE_CONTROL__SECURITY_ENABLE:
+            return isSetSecurityEnable();
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMP_MOD:
+            return isSetSmpMod();
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMP_RATE:
+            return isSetSmpRate();
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMV_ID:
+            return isSetSmvID();
+        case SclPackage.SAMPLED_VALUE_CONTROL__PARENT_LN0:
+            return getParentLN0() != null;
+        case SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS:
+            return isSetSmvOpts();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -895,22 +925,40 @@ public class SampledValueControlImpl extends ControlWithIEDNameImpl implements S
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (multicast: ");
-        if (multicastESet) result.append(multicast); else result.append("<unset>");
-        result.append(", nofASDU: ");
-        if (nofASDUESet) result.append(nofASDU); else result.append("<unset>");
-        result.append(", securityEnable: ");
-        if (securityEnableESet) result.append(securityEnable); else result.append("<unset>");
-        result.append(", smpMod: ");
-        if (smpModESet) result.append(smpMod); else result.append("<unset>");
-        result.append(", smpRate: ");
-        if (smpRateESet) result.append(smpRate); else result.append("<unset>");
-        result.append(", smvID: ");
-        if (smvIDESet) result.append(smvID); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (multicast: " );
+        if( multicastESet )
+            result.append( multicast );
+        else
+            result.append( "<unset>" );
+        result.append( ", nofASDU: " );
+        if( nofASDUESet )
+            result.append( nofASDU );
+        else
+            result.append( "<unset>" );
+        result.append( ", securityEnable: " );
+        if( securityEnableESet )
+            result.append( securityEnable );
+        else
+            result.append( "<unset>" );
+        result.append( ", smpMod: " );
+        if( smpModESet )
+            result.append( smpMod );
+        else
+            result.append( "<unset>" );
+        result.append( ", smpRate: " );
+        if( smpRateESet )
+            result.append( smpRate );
+        else
+            result.append( "<unset>" );
+        result.append( ", smvID: " );
+        if( smvIDESet )
+            result.append( smvID );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SamplesPerSecImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SamplesPerSecImpl.java
index b5381c9..3017d37 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SamplesPerSecImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SamplesPerSecImpl.java
@@ -103,11 +103,12 @@ public class SamplesPerSecImpl extends SclObjectImpl implements SamplesPerSec {
      * @generated
      */
     @Override
-    public void setValue(Integer newValue) {
+    public void setValue( Integer newValue ) {
         Integer oldValue = value;
         value = newValue;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SAMPLES_PER_SEC__VALUE, oldValue, value));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SAMPLES_PER_SEC__VALUE, oldValue,
+                    value ) );
     }
 
     /**
@@ -117,8 +118,8 @@ public class SamplesPerSecImpl extends SclObjectImpl implements SamplesPerSec {
      */
     @Override
     public SMVSettings getParentSMVSettings() {
-        if (eContainerFeatureID() != SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS) return null;
-        return (SMVSettings)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS ) return null;
+        return ( SMVSettings ) eInternalContainer();
     }
 
     /**
@@ -126,8 +127,9 @@ public class SamplesPerSecImpl extends SclObjectImpl implements SamplesPerSec {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSMVSettings(SMVSettings newParentSMVSettings, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSMVSettings, SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS, msgs);
+    public NotificationChain basicSetParentSMVSettings( SMVSettings newParentSMVSettings, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSMVSettings,
+                SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS, msgs );
         return msgs;
     }
 
@@ -137,20 +139,24 @@ public class SamplesPerSecImpl extends SclObjectImpl implements SamplesPerSec {
      * @generated
      */
     @Override
-    public void setParentSMVSettings(SMVSettings newParentSMVSettings) {
-        if (newParentSMVSettings != eInternalContainer() || (eContainerFeatureID() != SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS && newParentSMVSettings != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSMVSettings))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSMVSettings( SMVSettings newParentSMVSettings ) {
+        if( newParentSMVSettings != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS
+                        && newParentSMVSettings != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSMVSettings ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSMVSettings != null)
-                msgs = ((InternalEObject)newParentSMVSettings).eInverseAdd(this, SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC, SMVSettings.class, msgs);
-            msgs = basicSetParentSMVSettings(newParentSMVSettings, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSMVSettings != null )
+                msgs = ( ( InternalEObject ) newParentSMVSettings ).eInverseAdd( this,
+                        SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC, SMVSettings.class, msgs );
+            msgs = basicSetParentSMVSettings( newParentSMVSettings, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS, newParentSMVSettings, newParentSMVSettings));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS,
+                    newParentSMVSettings, newParentSMVSettings ) );
     }
 
     /**
@@ -159,14 +165,14 @@ public class SamplesPerSecImpl extends SclObjectImpl implements SamplesPerSec {
      * @generated
      */
     @Override
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSMVSettings((SMVSettings)otherEnd, msgs);
+    public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSMVSettings( ( SMVSettings ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -175,12 +181,12 @@ public class SamplesPerSecImpl extends SclObjectImpl implements SamplesPerSec {
      * @generated
      */
     @Override
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS:
-                return basicSetParentSMVSettings(null, msgs);
+    public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS:
+            return basicSetParentSMVSettings( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -189,12 +195,13 @@ public class SamplesPerSecImpl extends SclObjectImpl implements SamplesPerSec {
      * @generated
      */
     @Override
-    public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC, SMVSettings.class, msgs);
+    public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SMV_SETTINGS__SAMPLES_PER_SEC,
+                    SMVSettings.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -203,14 +210,14 @@ public class SamplesPerSecImpl extends SclObjectImpl implements SamplesPerSec {
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.SAMPLES_PER_SEC__VALUE:
-                return getValue();
-            case SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS:
-                return getParentSMVSettings();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.SAMPLES_PER_SEC__VALUE:
+            return getValue();
+        case SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS:
+            return getParentSMVSettings();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -219,16 +226,16 @@ public class SamplesPerSecImpl extends SclObjectImpl implements SamplesPerSec {
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.SAMPLES_PER_SEC__VALUE:
-                setValue((Integer)newValue);
-                return;
-            case SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS:
-                setParentSMVSettings((SMVSettings)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.SAMPLES_PER_SEC__VALUE:
+            setValue( ( Integer ) newValue );
+            return;
+        case SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS:
+            setParentSMVSettings( ( SMVSettings ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -237,16 +244,16 @@ public class SamplesPerSecImpl extends SclObjectImpl implements SamplesPerSec {
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.SAMPLES_PER_SEC__VALUE:
-                setValue(VALUE_EDEFAULT);
-                return;
-            case SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS:
-                setParentSMVSettings((SMVSettings)null);
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SAMPLES_PER_SEC__VALUE:
+            setValue( VALUE_EDEFAULT );
+            return;
+        case SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS:
+            setParentSMVSettings( ( SMVSettings ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -255,14 +262,14 @@ public class SamplesPerSecImpl extends SclObjectImpl implements SamplesPerSec {
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.SAMPLES_PER_SEC__VALUE:
-                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-            case SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS:
-                return getParentSMVSettings() != null;
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SAMPLES_PER_SEC__VALUE:
+            return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals( value );
+        case SclPackage.SAMPLES_PER_SEC__PARENT_SMV_SETTINGS:
+            return getParentSMVSettings() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -272,12 +279,12 @@ public class SamplesPerSecImpl extends SclObjectImpl implements SamplesPerSec {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (value: ");
-        result.append(value);
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (value: " );
+        result.append( value );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclFactoryImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclFactoryImpl.java
index 9cdfb84..df756c2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclFactoryImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclFactoryImpl.java
@@ -44,13 +44,13 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      */
     public static SclFactory init() {
         try {
-            SclFactory theSclFactory = (SclFactory)EPackage.Registry.INSTANCE.getEFactory(SclPackage.eNS_URI);
-            if (theSclFactory != null) {
+            SclFactory theSclFactory = ( SclFactory ) EPackage.Registry.INSTANCE.getEFactory( SclPackage.eNS_URI );
+            if( theSclFactory != null ) {
                 return theSclFactory;
             }
         }
-        catch (Exception exception) {
-            EcorePlugin.INSTANCE.log(exception);
+        catch( Exception exception ) {
+            EcorePlugin.INSTANCE.log( exception );
         }
         return new SclFactoryImpl();
     }
@@ -72,161 +72,313 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      */
     @Override
     public EObject create( EClass eClass ) {
-        switch (eClass.getClassifierID()) {
-            case SclPackage.HEADER: return createHeader();
-            case SclPackage.HISTORY: return createHistory();
-            case SclPackage.HITEM: return createHitem();
-            case SclPackage.ID_NAMING: return createIDNaming();
-            case SclPackage.LINE: return createLine();
-            case SclPackage.PRIVATE: return createPrivate();
-            case SclPackage.PROCESS: return createProcess();
-            case SclPackage.SCL: return createSCL();
-            case SclPackage.TEXT: return createText();
-            case SclPackage.ADDRESS: return createAddress();
-            case SclPackage.COMMUNICATION: return createCommunication();
-            case SclPackage.CONNECTED_AP: return createConnectedAP();
-            case SclPackage.GSE: return createGSE();
-            case SclPackage.P: return createP();
-            case SclPackage.PADDR: return createPAddr();
-            case SclPackage.PPHYS_CONN: return createP_PhysConn();
-            case SclPackage.PHYS_CONN: return createPhysConn();
-            case SclPackage.SMV: return createSMV();
-            case SclPackage.SUB_NETWORK: return createSubNetwork();
-            case SclPackage.BDA: return createBDA();
-            case SclPackage.DA: return createDA();
-            case SclPackage.DA_TYPE: return createDAType();
-            case SclPackage.DO: return createDO();
-            case SclPackage.DO_TYPE: return createDOType();
-            case SclPackage.DATA_TYPE_TEMPLATES: return createDataTypeTemplates();
-            case SclPackage.ENUM_TYPE: return createEnumType();
-            case SclPackage.ENUM_VAL: return createEnumVal();
-            case SclPackage.LNODE_TYPE: return createLNodeType();
-            case SclPackage.PROT_NS: return createProtNs();
-            case SclPackage.SDO: return createSDO();
-            case SclPackage.VAL: return createVal();
-            case SclPackage.ACCESS_CONTROL: return createAccessControl();
-            case SclPackage.ACCESS_POINT: return createAccessPoint();
-            case SclPackage.ASSOCIATION: return createAssociation();
-            case SclPackage.AUTHENTICATION: return createAuthentication();
-            case SclPackage.CERTIFICATE: return createCertificate();
-            case SclPackage.CLIENT_LN: return createClientLN();
-            case SclPackage.CLIENT_SERVICES: return createClientServices();
-            case SclPackage.COMM_PROT: return createCommProt();
-            case SclPackage.CONF_DATA_SET: return createConfDataSet();
-            case SclPackage.CONF_LNS: return createConfLNs();
-            case SclPackage.CONF_LD_NAME: return createConfLdName();
-            case SclPackage.CONF_LOG_CONTROL: return createConfLogControl();
-            case SclPackage.CONF_REPORT_CONTROL: return createConfReportControl();
-            case SclPackage.CONF_SG: return createConfSG();
-            case SclPackage.CONF_SIG_REF: return createConfSigRef();
-            case SclPackage.CONTROL_WITH_IED_NAME: return createControlWithIEDName();
-            case SclPackage.DAI: return createDAI();
-            case SclPackage.DOI: return createDOI();
-            case SclPackage.DATA_OBJECT_DIRECTORY: return createDataObjectDirectory();
-            case SclPackage.DATA_SET: return createDataSet();
-            case SclPackage.DATA_SET_DIRECTORY: return createDataSetDirectory();
-            case SclPackage.DYN_ASSOCIATION: return createDynAssociation();
-            case SclPackage.DYN_DATA_SET: return createDynDataSet();
-            case SclPackage.EXT_REF: return createExtRef();
-            case SclPackage.FCDA: return createFCDA();
-            case SclPackage.FILE_HANDLING: return createFileHandling();
-            case SclPackage.GOOSE: return createGOOSE();
-            case SclPackage.GOOSE_SECURITY: return createGOOSESecurity();
-            case SclPackage.GSE_CONTROL: return createGSEControl();
-            case SclPackage.GSE_DIR: return createGSEDir();
-            case SclPackage.GSE_SETTINGS: return createGSESettings();
-            case SclPackage.GSSE: return createGSSE();
-            case SclPackage.GET_CB_VALUES: return createGetCBValues();
-            case SclPackage.GET_DATA_OBJECT_DEFINITION: return createGetDataObjectDefinition();
-            case SclPackage.GET_DATA_SET_VALUE: return createGetDataSetValue();
-            case SclPackage.GET_DIRECTORY: return createGetDirectory();
-            case SclPackage.IED: return createIED();
-            case SclPackage.IED_NAME: return createIEDName();
-            case SclPackage.INPUTS: return createInputs();
-            case SclPackage.ISSUER_NAME: return createIssuerName();
-            case SclPackage.KDC: return createKDC();
-            case SclPackage.LDEVICE: return createLDevice();
-            case SclPackage.LN: return createLN();
-            case SclPackage.LN0: return createLN0();
-            case SclPackage.LOG: return createLog();
-            case SclPackage.LOG_CONTROL: return createLogControl();
-            case SclPackage.LOG_SETTINGS: return createLogSettings();
-            case SclPackage.OPT_FIELDS: return createOptFields();
-            case SclPackage.PROTOCOL: return createProtocol();
-            case SclPackage.READ_WRITE: return createReadWrite();
-            case SclPackage.RED_PROT: return createRedProt();
-            case SclPackage.REPORT_CONTROL: return createReportControl();
-            case SclPackage.REPORT_SETTINGS: return createReportSettings();
-            case SclPackage.RPT_ENABLED: return createRptEnabled();
-            case SclPackage.SDI: return createSDI();
-            case SclPackage.SG_EDIT: return createSGEdit();
-            case SclPackage.SMV_SECURITY: return createSMVSecurity();
-            case SclPackage.SMV_SETTINGS: return createSMVSettings();
-            case SclPackage.SM_VSC: return createSMVsc();
-            case SclPackage.SAMPLED_VALUE_CONTROL: return createSampledValueControl();
-            case SclPackage.SERVER: return createServer();
-            case SclPackage.SERVER_AT: return createServerAt();
-            case SclPackage.SERVICE_SETTINGS: return createServiceSettings();
-            case SclPackage.SERVICE_WITH_MAX: return createServiceWithMax();
-            case SclPackage.SERVICES: return createServices();
-            case SclPackage.SET_DATA_SET_VALUE: return createSetDataSetValue();
-            case SclPackage.SETTING_CONTROL: return createSettingControl();
-            case SclPackage.SETTING_GROUPS: return createSettingGroups();
-            case SclPackage.SMV_OPTS: return createSmvOpts();
-            case SclPackage.SUBJECT: return createSubject();
-            case SclPackage.SUP_SUBSCRIPTION: return createSupSubscription();
-            case SclPackage.TIME_SYNC_PROT: return createTimeSyncProt();
-            case SclPackage.TIMER_ACTIVATED_CONTROL: return createTimerActivatedControl();
-            case SclPackage.TRG_OPS: return createTrgOps();
-            case SclPackage.VALUE_HANDLING: return createValueHandling();
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT: return createAbstractConductingEquipment();
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC: return createAbstractEqFuncSubFunc();
-            case SclPackage.BAY: return createBay();
-            case SclPackage.CONDUCTING_EQUIPMENT: return createConductingEquipment();
-            case SclPackage.CONNECTIVITY_NODE: return createConnectivityNode();
-            case SclPackage.EQ_FUNCTION: return createEqFunction();
-            case SclPackage.EQ_SUB_FUNCTION: return createEqSubFunction();
-            case SclPackage.EQUIPMENT: return createEquipment();
-            case SclPackage.EQUIPMENT_CONTAINER: return createEquipmentContainer();
-            case SclPackage.FUNCTION: return createFunction();
-            case SclPackage.GENERAL_EQUIPMENT: return createGeneralEquipment();
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER: return createGeneralEquipmentContainer();
-            case SclPackage.LNODE: return createLNode();
-            case SclPackage.LNODE_CONTAINER: return createLNodeContainer();
-            case SclPackage.NEUTRAL_POINT: return createNeutralPoint();
-            case SclPackage.POWER_SYSTEM_RESOURCE: return createPowerSystemResource();
-            case SclPackage.POWER_TRANSFORMER: return createPowerTransformer();
-            case SclPackage.SUB_EQUIPMENT: return createSubEquipment();
-            case SclPackage.SUB_FUNCTION: return createSubFunction();
-            case SclPackage.SUBSTATION: return createSubstation();
-            case SclPackage.TAP_CHANGER: return createTapChanger();
-            case SclPackage.TERMINAL: return createTerminal();
-            case SclPackage.TRANSFORMER_WINDING: return createTransformerWinding();
-            case SclPackage.VOLTAGE: return createVoltage();
-            case SclPackage.VOLTAGE_LEVEL: return createVoltageLevel();
-            case SclPackage.SERVICE_YES_NO: return createServiceYesNo();
-            case SclPackage.SERVICE_WITH_OPTIONAL_MAX: return createServiceWithOptionalMax();
-            case SclPackage.SERVICE_WITH_MAX_NON_ZERO: return createServiceWithMaxNonZero();
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL: return createServiceConfReportControl();
-            case SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES: return createServiceWithMaxAndMaxAttributes();
-            case SclPackage.SERVICE_WITH_MAX_AND_MODIFY: return createServiceWithMaxAndModify();
-            case SclPackage.SERVICE_FOR_CONF_DATA_SET: return createServiceForConfDataSet();
-            case SclPackage.CERT: return createCert();
-            case SclPackage.VALUE_WITH_UNIT: return createValueWithUnit();
-            case SclPackage.DURATION_IN_SEC: return createDurationInSec();
-            case SclPackage.DURATION_IN_MILLI_SEC: return createDurationInMilliSec();
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC: return createBitRateInMbPerSec();
-            case SclPackage.MIN_TIME: return createMinTime();
-            case SclPackage.MAX_TIME: return createMaxTime();
-            case SclPackage.BIT_RATE: return createBitRate();
-            case SclPackage.SMP_RATE: return createSmpRate();
-            case SclPackage.SAMPLES_PER_SEC: return createSamplesPerSec();
-            case SclPackage.SEC_PER_SAMPLES: return createSecPerSamples();
-            case SclPackage.MC_SECURITY: return createMcSecurity();
-            case SclPackage.AG_AUTHENTICATION: return createAgAuthentication();
-            case SclPackage.AG_LN_REF: return createAgLNRef();
-            default:
-                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+        switch( eClass.getClassifierID() ) {
+        case SclPackage.HEADER:
+            return createHeader();
+        case SclPackage.HISTORY:
+            return createHistory();
+        case SclPackage.HITEM:
+            return createHitem();
+        case SclPackage.ID_NAMING:
+            return createIDNaming();
+        case SclPackage.LINE:
+            return createLine();
+        case SclPackage.PRIVATE:
+            return createPrivate();
+        case SclPackage.PROCESS:
+            return createProcess();
+        case SclPackage.SCL:
+            return createSCL();
+        case SclPackage.TEXT:
+            return createText();
+        case SclPackage.ADDRESS:
+            return createAddress();
+        case SclPackage.COMMUNICATION:
+            return createCommunication();
+        case SclPackage.CONNECTED_AP:
+            return createConnectedAP();
+        case SclPackage.GSE:
+            return createGSE();
+        case SclPackage.P:
+            return createP();
+        case SclPackage.PADDR:
+            return createPAddr();
+        case SclPackage.PPHYS_CONN:
+            return createP_PhysConn();
+        case SclPackage.PHYS_CONN:
+            return createPhysConn();
+        case SclPackage.SMV:
+            return createSMV();
+        case SclPackage.SUB_NETWORK:
+            return createSubNetwork();
+        case SclPackage.BDA:
+            return createBDA();
+        case SclPackage.DA:
+            return createDA();
+        case SclPackage.DA_TYPE:
+            return createDAType();
+        case SclPackage.DO:
+            return createDO();
+        case SclPackage.DO_TYPE:
+            return createDOType();
+        case SclPackage.DATA_TYPE_TEMPLATES:
+            return createDataTypeTemplates();
+        case SclPackage.ENUM_TYPE:
+            return createEnumType();
+        case SclPackage.ENUM_VAL:
+            return createEnumVal();
+        case SclPackage.LNODE_TYPE:
+            return createLNodeType();
+        case SclPackage.PROT_NS:
+            return createProtNs();
+        case SclPackage.SDO:
+            return createSDO();
+        case SclPackage.VAL:
+            return createVal();
+        case SclPackage.ACCESS_CONTROL:
+            return createAccessControl();
+        case SclPackage.ACCESS_POINT:
+            return createAccessPoint();
+        case SclPackage.ASSOCIATION:
+            return createAssociation();
+        case SclPackage.AUTHENTICATION:
+            return createAuthentication();
+        case SclPackage.CERTIFICATE:
+            return createCertificate();
+        case SclPackage.CLIENT_LN:
+            return createClientLN();
+        case SclPackage.CLIENT_SERVICES:
+            return createClientServices();
+        case SclPackage.COMM_PROT:
+            return createCommProt();
+        case SclPackage.CONF_DATA_SET:
+            return createConfDataSet();
+        case SclPackage.CONF_LNS:
+            return createConfLNs();
+        case SclPackage.CONF_LD_NAME:
+            return createConfLdName();
+        case SclPackage.CONF_LOG_CONTROL:
+            return createConfLogControl();
+        case SclPackage.CONF_REPORT_CONTROL:
+            return createConfReportControl();
+        case SclPackage.CONF_SG:
+            return createConfSG();
+        case SclPackage.CONF_SIG_REF:
+            return createConfSigRef();
+        case SclPackage.CONTROL_WITH_IED_NAME:
+            return createControlWithIEDName();
+        case SclPackage.DAI:
+            return createDAI();
+        case SclPackage.DOI:
+            return createDOI();
+        case SclPackage.DATA_OBJECT_DIRECTORY:
+            return createDataObjectDirectory();
+        case SclPackage.DATA_SET:
+            return createDataSet();
+        case SclPackage.DATA_SET_DIRECTORY:
+            return createDataSetDirectory();
+        case SclPackage.DYN_ASSOCIATION:
+            return createDynAssociation();
+        case SclPackage.DYN_DATA_SET:
+            return createDynDataSet();
+        case SclPackage.EXT_REF:
+            return createExtRef();
+        case SclPackage.FCDA:
+            return createFCDA();
+        case SclPackage.FILE_HANDLING:
+            return createFileHandling();
+        case SclPackage.GOOSE:
+            return createGOOSE();
+        case SclPackage.GOOSE_SECURITY:
+            return createGOOSESecurity();
+        case SclPackage.GSE_CONTROL:
+            return createGSEControl();
+        case SclPackage.GSE_DIR:
+            return createGSEDir();
+        case SclPackage.GSE_SETTINGS:
+            return createGSESettings();
+        case SclPackage.GSSE:
+            return createGSSE();
+        case SclPackage.GET_CB_VALUES:
+            return createGetCBValues();
+        case SclPackage.GET_DATA_OBJECT_DEFINITION:
+            return createGetDataObjectDefinition();
+        case SclPackage.GET_DATA_SET_VALUE:
+            return createGetDataSetValue();
+        case SclPackage.GET_DIRECTORY:
+            return createGetDirectory();
+        case SclPackage.IED:
+            return createIED();
+        case SclPackage.IED_NAME:
+            return createIEDName();
+        case SclPackage.INPUTS:
+            return createInputs();
+        case SclPackage.ISSUER_NAME:
+            return createIssuerName();
+        case SclPackage.KDC:
+            return createKDC();
+        case SclPackage.LDEVICE:
+            return createLDevice();
+        case SclPackage.LN:
+            return createLN();
+        case SclPackage.LN0:
+            return createLN0();
+        case SclPackage.LOG:
+            return createLog();
+        case SclPackage.LOG_CONTROL:
+            return createLogControl();
+        case SclPackage.LOG_SETTINGS:
+            return createLogSettings();
+        case SclPackage.OPT_FIELDS:
+            return createOptFields();
+        case SclPackage.PROTOCOL:
+            return createProtocol();
+        case SclPackage.READ_WRITE:
+            return createReadWrite();
+        case SclPackage.RED_PROT:
+            return createRedProt();
+        case SclPackage.REPORT_CONTROL:
+            return createReportControl();
+        case SclPackage.REPORT_SETTINGS:
+            return createReportSettings();
+        case SclPackage.RPT_ENABLED:
+            return createRptEnabled();
+        case SclPackage.SDI:
+            return createSDI();
+        case SclPackage.SG_EDIT:
+            return createSGEdit();
+        case SclPackage.SMV_SECURITY:
+            return createSMVSecurity();
+        case SclPackage.SMV_SETTINGS:
+            return createSMVSettings();
+        case SclPackage.SM_VSC:
+            return createSMVsc();
+        case SclPackage.SAMPLED_VALUE_CONTROL:
+            return createSampledValueControl();
+        case SclPackage.SERVER:
+            return createServer();
+        case SclPackage.SERVER_AT:
+            return createServerAt();
+        case SclPackage.SERVICE_SETTINGS:
+            return createServiceSettings();
+        case SclPackage.SERVICE_WITH_MAX:
+            return createServiceWithMax();
+        case SclPackage.SERVICES:
+            return createServices();
+        case SclPackage.SET_DATA_SET_VALUE:
+            return createSetDataSetValue();
+        case SclPackage.SETTING_CONTROL:
+            return createSettingControl();
+        case SclPackage.SETTING_GROUPS:
+            return createSettingGroups();
+        case SclPackage.SMV_OPTS:
+            return createSmvOpts();
+        case SclPackage.SUBJECT:
+            return createSubject();
+        case SclPackage.SUP_SUBSCRIPTION:
+            return createSupSubscription();
+        case SclPackage.TIME_SYNC_PROT:
+            return createTimeSyncProt();
+        case SclPackage.TIMER_ACTIVATED_CONTROL:
+            return createTimerActivatedControl();
+        case SclPackage.TRG_OPS:
+            return createTrgOps();
+        case SclPackage.VALUE_HANDLING:
+            return createValueHandling();
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT:
+            return createAbstractConductingEquipment();
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC:
+            return createAbstractEqFuncSubFunc();
+        case SclPackage.BAY:
+            return createBay();
+        case SclPackage.CONDUCTING_EQUIPMENT:
+            return createConductingEquipment();
+        case SclPackage.CONNECTIVITY_NODE:
+            return createConnectivityNode();
+        case SclPackage.EQ_FUNCTION:
+            return createEqFunction();
+        case SclPackage.EQ_SUB_FUNCTION:
+            return createEqSubFunction();
+        case SclPackage.EQUIPMENT:
+            return createEquipment();
+        case SclPackage.EQUIPMENT_CONTAINER:
+            return createEquipmentContainer();
+        case SclPackage.FUNCTION:
+            return createFunction();
+        case SclPackage.GENERAL_EQUIPMENT:
+            return createGeneralEquipment();
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER:
+            return createGeneralEquipmentContainer();
+        case SclPackage.LNODE:
+            return createLNode();
+        case SclPackage.LNODE_CONTAINER:
+            return createLNodeContainer();
+        case SclPackage.NEUTRAL_POINT:
+            return createNeutralPoint();
+        case SclPackage.POWER_SYSTEM_RESOURCE:
+            return createPowerSystemResource();
+        case SclPackage.POWER_TRANSFORMER:
+            return createPowerTransformer();
+        case SclPackage.SUB_EQUIPMENT:
+            return createSubEquipment();
+        case SclPackage.SUB_FUNCTION:
+            return createSubFunction();
+        case SclPackage.SUBSTATION:
+            return createSubstation();
+        case SclPackage.TAP_CHANGER:
+            return createTapChanger();
+        case SclPackage.TERMINAL:
+            return createTerminal();
+        case SclPackage.TRANSFORMER_WINDING:
+            return createTransformerWinding();
+        case SclPackage.VOLTAGE:
+            return createVoltage();
+        case SclPackage.VOLTAGE_LEVEL:
+            return createVoltageLevel();
+        case SclPackage.SERVICE_YES_NO:
+            return createServiceYesNo();
+        case SclPackage.SERVICE_WITH_OPTIONAL_MAX:
+            return createServiceWithOptionalMax();
+        case SclPackage.SERVICE_WITH_MAX_NON_ZERO:
+            return createServiceWithMaxNonZero();
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL:
+            return createServiceConfReportControl();
+        case SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES:
+            return createServiceWithMaxAndMaxAttributes();
+        case SclPackage.SERVICE_WITH_MAX_AND_MODIFY:
+            return createServiceWithMaxAndModify();
+        case SclPackage.SERVICE_FOR_CONF_DATA_SET:
+            return createServiceForConfDataSet();
+        case SclPackage.CERT:
+            return createCert();
+        case SclPackage.VALUE_WITH_UNIT:
+            return createValueWithUnit();
+        case SclPackage.DURATION_IN_SEC:
+            return createDurationInSec();
+        case SclPackage.DURATION_IN_MILLI_SEC:
+            return createDurationInMilliSec();
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC:
+            return createBitRateInMbPerSec();
+        case SclPackage.MIN_TIME:
+            return createMinTime();
+        case SclPackage.MAX_TIME:
+            return createMaxTime();
+        case SclPackage.BIT_RATE:
+            return createBitRate();
+        case SclPackage.SMP_RATE:
+            return createSmpRate();
+        case SclPackage.SAMPLES_PER_SEC:
+            return createSamplesPerSec();
+        case SclPackage.SEC_PER_SAMPLES:
+            return createSecPerSamples();
+        case SclPackage.MC_SECURITY:
+            return createMcSecurity();
+        case SclPackage.AG_AUTHENTICATION:
+            return createAgAuthentication();
+        case SclPackage.AG_LN_REF:
+            return createAgLNRef();
+        default:
+            throw new IllegalArgumentException( "The class '" + eClass.getName() + "' is not a valid classifier" );
         }
     }
 
@@ -237,35 +389,36 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      */
     @Override
     public Object createFromString( EDataType eDataType, String initialValue ) {
-        switch (eDataType.getClassifierID()) {
-            case SclPackage.ASSOCIATION_KIND_ENUM:
-                return createAssociationKindEnumFromString(eDataType, initialValue);
-            case SclPackage.FC_ENUM:
-                return createFCEnumFromString(eDataType, initialValue);
-            case SclPackage.GSE_CONTROL_TYPE_ENUM:
-                return createGSEControlTypeEnumFromString(eDataType, initialValue);
-            case SclPackage.PHASE_ENUM:
-                return createPhaseEnumFromString(eDataType, initialValue);
-            case SclPackage.PREDEFINED_TYPE_OF_SECURITY_ENUM:
-                return createPredefinedTypeOfSecurityEnumFromString(eDataType, initialValue);
-            case SclPackage.SMV_DELIVERY_ENUM:
-                return createSMVDeliveryEnumFromString(eDataType, initialValue);
-            case SclPackage.SERVICE_SETTINGS_ENUM:
-                return createServiceSettingsEnumFromString(eDataType, initialValue);
-            case SclPackage.SERVICE_SETTINGS_NO_DYN_ENUM:
-                return createServiceSettingsNoDynEnumFromString(eDataType, initialValue);
-            case SclPackage.SERVICE_TYPE:
-                return createServiceTypeFromString(eDataType, initialValue);
-            case SclPackage.SMP_MOD:
-                return createSmpModFromString(eDataType, initialValue);
-            case SclPackage.UNIT_MULTIPLIER_ENUM:
-                return createUnitMultiplierEnumFromString(eDataType, initialValue);
-            case SclPackage.VAL_KIND_ENUM:
-                return createValKindEnumFromString(eDataType, initialValue);
-            case SclPackage.BUF_MODE_ENUM:
-                return createbufModeEnumFromString(eDataType, initialValue);
-            default:
-                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+        switch( eDataType.getClassifierID() ) {
+        case SclPackage.ASSOCIATION_KIND_ENUM:
+            return createAssociationKindEnumFromString( eDataType, initialValue );
+        case SclPackage.FC_ENUM:
+            return createFCEnumFromString( eDataType, initialValue );
+        case SclPackage.GSE_CONTROL_TYPE_ENUM:
+            return createGSEControlTypeEnumFromString( eDataType, initialValue );
+        case SclPackage.PHASE_ENUM:
+            return createPhaseEnumFromString( eDataType, initialValue );
+        case SclPackage.PREDEFINED_TYPE_OF_SECURITY_ENUM:
+            return createPredefinedTypeOfSecurityEnumFromString( eDataType, initialValue );
+        case SclPackage.SMV_DELIVERY_ENUM:
+            return createSMVDeliveryEnumFromString( eDataType, initialValue );
+        case SclPackage.SERVICE_SETTINGS_ENUM:
+            return createServiceSettingsEnumFromString( eDataType, initialValue );
+        case SclPackage.SERVICE_SETTINGS_NO_DYN_ENUM:
+            return createServiceSettingsNoDynEnumFromString( eDataType, initialValue );
+        case SclPackage.SERVICE_TYPE:
+            return createServiceTypeFromString( eDataType, initialValue );
+        case SclPackage.SMP_MOD:
+            return createSmpModFromString( eDataType, initialValue );
+        case SclPackage.UNIT_MULTIPLIER_ENUM:
+            return createUnitMultiplierEnumFromString( eDataType, initialValue );
+        case SclPackage.VAL_KIND_ENUM:
+            return createValKindEnumFromString( eDataType, initialValue );
+        case SclPackage.BUF_MODE_ENUM:
+            return createbufModeEnumFromString( eDataType, initialValue );
+        default:
+            throw new IllegalArgumentException(
+                    "The datatype '" + eDataType.getName() + "' is not a valid classifier" );
         }
     }
 
@@ -276,35 +429,36 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      */
     @Override
     public String convertToString( EDataType eDataType, Object instanceValue ) {
-        switch (eDataType.getClassifierID()) {
-            case SclPackage.ASSOCIATION_KIND_ENUM:
-                return convertAssociationKindEnumToString(eDataType, instanceValue);
-            case SclPackage.FC_ENUM:
-                return convertFCEnumToString(eDataType, instanceValue);
-            case SclPackage.GSE_CONTROL_TYPE_ENUM:
-                return convertGSEControlTypeEnumToString(eDataType, instanceValue);
-            case SclPackage.PHASE_ENUM:
-                return convertPhaseEnumToString(eDataType, instanceValue);
-            case SclPackage.PREDEFINED_TYPE_OF_SECURITY_ENUM:
-                return convertPredefinedTypeOfSecurityEnumToString(eDataType, instanceValue);
-            case SclPackage.SMV_DELIVERY_ENUM:
-                return convertSMVDeliveryEnumToString(eDataType, instanceValue);
-            case SclPackage.SERVICE_SETTINGS_ENUM:
-                return convertServiceSettingsEnumToString(eDataType, instanceValue);
-            case SclPackage.SERVICE_SETTINGS_NO_DYN_ENUM:
-                return convertServiceSettingsNoDynEnumToString(eDataType, instanceValue);
-            case SclPackage.SERVICE_TYPE:
-                return convertServiceTypeToString(eDataType, instanceValue);
-            case SclPackage.SMP_MOD:
-                return convertSmpModToString(eDataType, instanceValue);
-            case SclPackage.UNIT_MULTIPLIER_ENUM:
-                return convertUnitMultiplierEnumToString(eDataType, instanceValue);
-            case SclPackage.VAL_KIND_ENUM:
-                return convertValKindEnumToString(eDataType, instanceValue);
-            case SclPackage.BUF_MODE_ENUM:
-                return convertbufModeEnumToString(eDataType, instanceValue);
-            default:
-                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+        switch( eDataType.getClassifierID() ) {
+        case SclPackage.ASSOCIATION_KIND_ENUM:
+            return convertAssociationKindEnumToString( eDataType, instanceValue );
+        case SclPackage.FC_ENUM:
+            return convertFCEnumToString( eDataType, instanceValue );
+        case SclPackage.GSE_CONTROL_TYPE_ENUM:
+            return convertGSEControlTypeEnumToString( eDataType, instanceValue );
+        case SclPackage.PHASE_ENUM:
+            return convertPhaseEnumToString( eDataType, instanceValue );
+        case SclPackage.PREDEFINED_TYPE_OF_SECURITY_ENUM:
+            return convertPredefinedTypeOfSecurityEnumToString( eDataType, instanceValue );
+        case SclPackage.SMV_DELIVERY_ENUM:
+            return convertSMVDeliveryEnumToString( eDataType, instanceValue );
+        case SclPackage.SERVICE_SETTINGS_ENUM:
+            return convertServiceSettingsEnumToString( eDataType, instanceValue );
+        case SclPackage.SERVICE_SETTINGS_NO_DYN_ENUM:
+            return convertServiceSettingsNoDynEnumToString( eDataType, instanceValue );
+        case SclPackage.SERVICE_TYPE:
+            return convertServiceTypeToString( eDataType, instanceValue );
+        case SclPackage.SMP_MOD:
+            return convertSmpModToString( eDataType, instanceValue );
+        case SclPackage.UNIT_MULTIPLIER_ENUM:
+            return convertUnitMultiplierEnumToString( eDataType, instanceValue );
+        case SclPackage.VAL_KIND_ENUM:
+            return convertValKindEnumToString( eDataType, instanceValue );
+        case SclPackage.BUF_MODE_ENUM:
+            return convertbufModeEnumToString( eDataType, instanceValue );
+        default:
+            throw new IllegalArgumentException(
+                    "The datatype '" + eDataType.getName() + "' is not a valid classifier" );
         }
     }
 
@@ -1986,8 +2140,9 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      * @generated
      */
     public AssociationKindEnum createAssociationKindEnumFromString( EDataType eDataType, String initialValue ) {
-        AssociationKindEnum result = AssociationKindEnum.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+        AssociationKindEnum result = AssociationKindEnum.get( initialValue );
+        if( result == null ) throw new IllegalArgumentException(
+                "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
     }
 
@@ -2006,8 +2161,9 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      * @generated
      */
     public FCEnum createFCEnumFromString( EDataType eDataType, String initialValue ) {
-        FCEnum result = FCEnum.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+        FCEnum result = FCEnum.get( initialValue );
+        if( result == null ) throw new IllegalArgumentException(
+                "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
     }
 
@@ -2026,8 +2182,9 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      * @generated
      */
     public GSEControlTypeEnum createGSEControlTypeEnumFromString( EDataType eDataType, String initialValue ) {
-        GSEControlTypeEnum result = GSEControlTypeEnum.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+        GSEControlTypeEnum result = GSEControlTypeEnum.get( initialValue );
+        if( result == null ) throw new IllegalArgumentException(
+                "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
     }
 
@@ -2046,8 +2203,9 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      * @generated
      */
     public PhaseEnum createPhaseEnumFromString( EDataType eDataType, String initialValue ) {
-        PhaseEnum result = PhaseEnum.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+        PhaseEnum result = PhaseEnum.get( initialValue );
+        if( result == null ) throw new IllegalArgumentException(
+                "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
     }
 
@@ -2067,8 +2225,9 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      */
     public PredefinedTypeOfSecurityEnum createPredefinedTypeOfSecurityEnumFromString( EDataType eDataType,
             String initialValue ) {
-        PredefinedTypeOfSecurityEnum result = PredefinedTypeOfSecurityEnum.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+        PredefinedTypeOfSecurityEnum result = PredefinedTypeOfSecurityEnum.get( initialValue );
+        if( result == null ) throw new IllegalArgumentException(
+                "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
     }
 
@@ -2087,8 +2246,9 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      * @generated
      */
     public SMVDeliveryEnum createSMVDeliveryEnumFromString( EDataType eDataType, String initialValue ) {
-        SMVDeliveryEnum result = SMVDeliveryEnum.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+        SMVDeliveryEnum result = SMVDeliveryEnum.get( initialValue );
+        if( result == null ) throw new IllegalArgumentException(
+                "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
     }
 
@@ -2107,8 +2267,9 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      * @generated
      */
     public ServiceSettingsEnum createServiceSettingsEnumFromString( EDataType eDataType, String initialValue ) {
-        ServiceSettingsEnum result = ServiceSettingsEnum.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+        ServiceSettingsEnum result = ServiceSettingsEnum.get( initialValue );
+        if( result == null ) throw new IllegalArgumentException(
+                "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
     }
 
@@ -2126,9 +2287,11 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      * <!-- end-user-doc -->
      * @generated
      */
-    public ServiceSettingsNoDynEnum createServiceSettingsNoDynEnumFromString( EDataType eDataType, String initialValue ) {
-        ServiceSettingsNoDynEnum result = ServiceSettingsNoDynEnum.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    public ServiceSettingsNoDynEnum createServiceSettingsNoDynEnumFromString( EDataType eDataType,
+            String initialValue ) {
+        ServiceSettingsNoDynEnum result = ServiceSettingsNoDynEnum.get( initialValue );
+        if( result == null ) throw new IllegalArgumentException(
+                "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
     }
 
@@ -2147,8 +2310,9 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      * @generated
      */
     public ServiceType createServiceTypeFromString( EDataType eDataType, String initialValue ) {
-        ServiceType result = ServiceType.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+        ServiceType result = ServiceType.get( initialValue );
+        if( result == null ) throw new IllegalArgumentException(
+                "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
     }
 
@@ -2167,8 +2331,9 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      * @generated
      */
     public SmpMod createSmpModFromString( EDataType eDataType, String initialValue ) {
-        SmpMod result = SmpMod.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+        SmpMod result = SmpMod.get( initialValue );
+        if( result == null ) throw new IllegalArgumentException(
+                "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
     }
 
@@ -2187,8 +2352,9 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      * @generated
      */
     public UnitMultiplierEnum createUnitMultiplierEnumFromString( EDataType eDataType, String initialValue ) {
-        UnitMultiplierEnum result = UnitMultiplierEnum.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+        UnitMultiplierEnum result = UnitMultiplierEnum.get( initialValue );
+        if( result == null ) throw new IllegalArgumentException(
+                "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
     }
 
@@ -2207,8 +2373,9 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      * @generated
      */
     public ValKindEnum createValKindEnumFromString( EDataType eDataType, String initialValue ) {
-        ValKindEnum result = ValKindEnum.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+        ValKindEnum result = ValKindEnum.get( initialValue );
+        if( result == null ) throw new IllegalArgumentException(
+                "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
     }
 
@@ -2227,8 +2394,9 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      * @generated
      */
     public bufModeEnum createbufModeEnumFromString( EDataType eDataType, String initialValue ) {
-        bufModeEnum result = bufModeEnum.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+        bufModeEnum result = bufModeEnum.get( initialValue );
+        if( result == null ) throw new IllegalArgumentException(
+                "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'" );
         return result;
     }
 
@@ -2248,7 +2416,7 @@ public class SclFactoryImpl extends EFactoryImpl implements SclFactory {
      */
     @Override
     public SclPackage getSclPackage() {
-        return (SclPackage)getEPackage();
+        return ( SclPackage ) getEPackage();
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java
index e9ce36b..bc08074 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java
@@ -127,8 +127,9 @@ public abstract class SclObjectImpl extends MinimalEObjectImpl.Container impleme
     public void setLineNumber( int newLineNumber ) {
         int oldLineNumber = lineNumber;
         lineNumber = newLineNumber;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SCL_OBJECT__LINE_NUMBER, oldLineNumber, lineNumber));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SCL_OBJECT__LINE_NUMBER, oldLineNumber,
+                    lineNumber ) );
     }
 
     /**
@@ -147,11 +148,12 @@ public abstract class SclObjectImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public void setExplicitLinksBuilt(boolean newExplicitLinksBuilt) {
+    public void setExplicitLinksBuilt( boolean newExplicitLinksBuilt ) {
         boolean oldExplicitLinksBuilt = explicitLinksBuilt;
         explicitLinksBuilt = newExplicitLinksBuilt;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT, oldExplicitLinksBuilt, explicitLinksBuilt));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT,
+                    oldExplicitLinksBuilt, explicitLinksBuilt ) );
     }
 
     /**
@@ -161,12 +163,12 @@ public abstract class SclObjectImpl extends MinimalEObjectImpl.Container impleme
      */
     @Override
     public boolean buildExplicitLinks( IRiseClipseConsole console, Boolean forceUpdate ) {
-        if( ( ! forceUpdate ) && isExplicitLinksBuilt() ) return true;
-        
+        if( ( !forceUpdate ) && isExplicitLinksBuilt() ) return true;
+
         // Parent's links must be built before children's one
         // because children may need them
         doBuildExplicitLinks( console );
-        
+
         // Calls on children may lead to recursion
         setExplicitLinksBuilt( true );
 
@@ -180,7 +182,7 @@ public abstract class SclObjectImpl extends MinimalEObjectImpl.Container impleme
 
         return false;
     }
-    
+
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // Default do nothing
     }
@@ -192,13 +194,13 @@ public abstract class SclObjectImpl extends MinimalEObjectImpl.Container impleme
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SCL_OBJECT__LINE_NUMBER:
-                return getLineNumber();
-            case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT:
-                return isExplicitLinksBuilt();
+        switch( featureID ) {
+        case SclPackage.SCL_OBJECT__LINE_NUMBER:
+            return getLineNumber();
+        case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT:
+            return isExplicitLinksBuilt();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -208,15 +210,15 @@ public abstract class SclObjectImpl extends MinimalEObjectImpl.Container impleme
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SCL_OBJECT__LINE_NUMBER:
-                setLineNumber((Integer)newValue);
-                return;
-            case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT:
-                setExplicitLinksBuilt((Boolean)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SCL_OBJECT__LINE_NUMBER:
+            setLineNumber( ( Integer ) newValue );
+            return;
+        case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT:
+            setExplicitLinksBuilt( ( Boolean ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -226,15 +228,15 @@ public abstract class SclObjectImpl extends MinimalEObjectImpl.Container impleme
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SCL_OBJECT__LINE_NUMBER:
-                setLineNumber(LINE_NUMBER_EDEFAULT);
-                return;
-            case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT:
-                setExplicitLinksBuilt(EXPLICIT_LINKS_BUILT_EDEFAULT);
-                return;
+        switch( featureID ) {
+        case SclPackage.SCL_OBJECT__LINE_NUMBER:
+            setLineNumber( LINE_NUMBER_EDEFAULT );
+            return;
+        case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT:
+            setExplicitLinksBuilt( EXPLICIT_LINKS_BUILT_EDEFAULT );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -244,13 +246,13 @@ public abstract class SclObjectImpl extends MinimalEObjectImpl.Container impleme
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SCL_OBJECT__LINE_NUMBER:
-                return lineNumber != LINE_NUMBER_EDEFAULT;
-            case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT:
-                return explicitLinksBuilt != EXPLICIT_LINKS_BUILT_EDEFAULT;
+        switch( featureID ) {
+        case SclPackage.SCL_OBJECT__LINE_NUMBER:
+            return lineNumber != LINE_NUMBER_EDEFAULT;
+        case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT:
+            return explicitLinksBuilt != EXPLICIT_LINKS_BUILT_EDEFAULT;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -259,12 +261,12 @@ public abstract class SclObjectImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
-    public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-        switch (operationID) {
-            case SclPackage.SCL_OBJECT___BUILD_EXPLICIT_LINKS__IRISECLIPSECONSOLE_BOOLEAN:
-                return buildExplicitLinks((IRiseClipseConsole)arguments.get(0), (Boolean)arguments.get(1));
+    public Object eInvoke( int operationID, EList< ? > arguments ) throws InvocationTargetException {
+        switch( operationID ) {
+        case SclPackage.SCL_OBJECT___BUILD_EXPLICIT_LINKS__IRISECLIPSECONSOLE_BOOLEAN:
+            return buildExplicitLinks( ( IRiseClipseConsole ) arguments.get( 0 ), ( Boolean ) arguments.get( 1 ) );
         }
-        return super.eInvoke(operationID, arguments);
+        return super.eInvoke( operationID, arguments );
     }
 
     /**
@@ -274,14 +276,14 @@ public abstract class SclObjectImpl extends MinimalEObjectImpl.Container impleme
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (lineNumber: ");
-        result.append(lineNumber);
-        result.append(", explicitLinksBuilt: ");
-        result.append(explicitLinksBuilt);
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (lineNumber: " );
+        result.append( lineNumber );
+        result.append( ", explicitLinksBuilt: " );
+        result.append( explicitLinksBuilt );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclPackageImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclPackageImpl.java
index 19cc1b3..867d24c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclPackageImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclPackageImpl.java
@@ -1349,7 +1349,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      * @generated
      */
     private SclPackageImpl() {
-        super(eNS_URI, SclFactory.eINSTANCE);
+        super( eNS_URI, SclFactory.eINSTANCE );
     }
 
     /**
@@ -1370,11 +1370,13 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      * @generated
      */
     public static SclPackage init() {
-        if (isInited) return (SclPackage)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI);
+        if( isInited ) return ( SclPackage ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI );
 
         // Obtain or create and register package
-        Object registeredSclPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
-        SclPackageImpl theSclPackage = registeredSclPackage instanceof SclPackageImpl ? (SclPackageImpl)registeredSclPackage : new SclPackageImpl();
+        Object registeredSclPackage = EPackage.Registry.INSTANCE.get( eNS_URI );
+        SclPackageImpl theSclPackage = registeredSclPackage instanceof SclPackageImpl
+                ? ( SclPackageImpl ) registeredSclPackage
+                : new SclPackageImpl();
 
         isInited = true;
 
@@ -1388,7 +1390,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
         theSclPackage.freeze();
 
         // Update the registry and return the package
-        EPackage.Registry.INSTANCE.put(SclPackage.eNS_URI, theSclPackage);
+        EPackage.Registry.INSTANCE.put( SclPackage.eNS_URI, theSclPackage );
         return theSclPackage;
     }
 
@@ -1399,8 +1401,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAnyContentFromOtherNamespace() {
-        if (anyContentFromOtherNamespaceEClass == null) {
-            anyContentFromOtherNamespaceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(0);
+        if( anyContentFromOtherNamespaceEClass == null ) {
+            anyContentFromOtherNamespaceEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 0 );
         }
         return anyContentFromOtherNamespaceEClass;
     }
@@ -1412,7 +1415,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAnyContentFromOtherNamespace_Mixed() {
-        return (EAttribute)getAnyContentFromOtherNamespace().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAnyContentFromOtherNamespace().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1422,7 +1425,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAnyContentFromOtherNamespace_Group() {
-        return (EAttribute)getAnyContentFromOtherNamespace().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getAnyContentFromOtherNamespace().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1432,7 +1435,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAnyContentFromOtherNamespace_Any() {
-        return (EAttribute)getAnyContentFromOtherNamespace().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getAnyContentFromOtherNamespace().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -1442,7 +1445,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAnyContentFromOtherNamespace_AnyAttribute() {
-        return (EAttribute)getAnyContentFromOtherNamespace().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getAnyContentFromOtherNamespace().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -1452,8 +1455,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getBaseElement() {
-        if (baseElementEClass == null) {
-            baseElementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(1);
+        if( baseElementEClass == null ) {
+            baseElementEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 1 );
         }
         return baseElementEClass;
     }
@@ -1465,7 +1469,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getBaseElement_Private() {
-        return (EReference)getBaseElement().getEStructuralFeatures().get(0);
+        return ( EReference ) getBaseElement().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1475,7 +1479,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getBaseElement_Text() {
-        return (EReference)getBaseElement().getEStructuralFeatures().get(1);
+        return ( EReference ) getBaseElement().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1485,7 +1489,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getBaseElement_Any() {
-        return (EAttribute)getBaseElement().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getBaseElement().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -1495,7 +1499,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getBaseElement_AnyAttribute() {
-        return (EAttribute)getBaseElement().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getBaseElement().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -1505,8 +1509,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getHeader() {
-        if (headerEClass == null) {
-            headerEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(2);
+        if( headerEClass == null ) {
+            headerEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 2 );
         }
         return headerEClass;
     }
@@ -1518,7 +1523,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getHeader_Id() {
-        return (EAttribute)getHeader().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getHeader().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1528,7 +1533,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getHeader_NameStructure() {
-        return (EAttribute)getHeader().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getHeader().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1538,7 +1543,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getHeader_Revision() {
-        return (EAttribute)getHeader().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getHeader().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -1548,7 +1553,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getHeader_ToolID() {
-        return (EAttribute)getHeader().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getHeader().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -1558,7 +1563,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getHeader_Version() {
-        return (EAttribute)getHeader().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getHeader().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -1568,7 +1573,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getHeader_ParentSCL() {
-        return (EReference)getHeader().getEStructuralFeatures().get(5);
+        return ( EReference ) getHeader().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -1578,7 +1583,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getHeader_Text() {
-        return (EReference)getHeader().getEStructuralFeatures().get(6);
+        return ( EReference ) getHeader().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -1588,7 +1593,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getHeader_History() {
-        return (EReference)getHeader().getEStructuralFeatures().get(7);
+        return ( EReference ) getHeader().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -1598,8 +1603,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getHistory() {
-        if (historyEClass == null) {
-            historyEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(3);
+        if( historyEClass == null ) {
+            historyEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 3 );
         }
         return historyEClass;
     }
@@ -1611,7 +1617,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getHistory_ParentHeader() {
-        return (EReference)getHistory().getEStructuralFeatures().get(0);
+        return ( EReference ) getHistory().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1621,7 +1627,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getHistory_Hitem() {
-        return (EReference)getHistory().getEStructuralFeatures().get(1);
+        return ( EReference ) getHistory().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1631,8 +1637,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getHitem() {
-        if (hitemEClass == null) {
-            hitemEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(4);
+        if( hitemEClass == null ) {
+            hitemEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 4 );
         }
         return hitemEClass;
     }
@@ -1644,7 +1651,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getHitem_Revision() {
-        return (EAttribute)getHitem().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getHitem().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1654,7 +1661,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getHitem_Version() {
-        return (EAttribute)getHitem().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getHitem().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1664,7 +1671,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getHitem_What() {
-        return (EAttribute)getHitem().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getHitem().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -1674,7 +1681,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getHitem_When() {
-        return (EAttribute)getHitem().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getHitem().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -1684,7 +1691,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getHitem_Who() {
-        return (EAttribute)getHitem().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getHitem().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -1694,7 +1701,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getHitem_Why() {
-        return (EAttribute)getHitem().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getHitem().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -1704,7 +1711,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getHitem_ParentHistory() {
-        return (EReference)getHitem().getEStructuralFeatures().get(6);
+        return ( EReference ) getHitem().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -1714,8 +1721,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getIDNaming() {
-        if (idNamingEClass == null) {
-            idNamingEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(5);
+        if( idNamingEClass == null ) {
+            idNamingEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 5 );
         }
         return idNamingEClass;
     }
@@ -1727,7 +1735,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIDNaming_Id() {
-        return (EAttribute)getIDNaming().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getIDNaming().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1737,8 +1745,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getLine() {
-        if (lineEClass == null) {
-            lineEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(6);
+        if( lineEClass == null ) {
+            lineEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 6 );
         }
         return lineEClass;
     }
@@ -1750,7 +1759,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLine_Type() {
-        return (EAttribute)getLine().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getLine().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1760,7 +1769,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLine_ParentProcess() {
-        return (EReference)getLine().getEStructuralFeatures().get(1);
+        return ( EReference ) getLine().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1770,7 +1779,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLine_ParentSCL() {
-        return (EReference)getLine().getEStructuralFeatures().get(2);
+        return ( EReference ) getLine().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -1780,7 +1789,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLine_ConnectivityNode() {
-        return (EReference)getLine().getEStructuralFeatures().get(3);
+        return ( EReference ) getLine().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -1790,7 +1799,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLine_ConductingEquipment() {
-        return (EReference)getLine().getEStructuralFeatures().get(4);
+        return ( EReference ) getLine().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -1800,7 +1809,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLine_Voltage() {
-        return (EReference)getLine().getEStructuralFeatures().get(5);
+        return ( EReference ) getLine().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -1810,7 +1819,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLine_NomFreq() {
-        return (EAttribute)getLine().getEStructuralFeatures().get(6);
+        return ( EAttribute ) getLine().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -1820,7 +1829,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLine_NumPhases() {
-        return (EAttribute)getLine().getEStructuralFeatures().get(7);
+        return ( EAttribute ) getLine().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -1830,8 +1839,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getNaming() {
-        if (namingEClass == null) {
-            namingEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(7);
+        if( namingEClass == null ) {
+            namingEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 7 );
         }
         return namingEClass;
     }
@@ -1843,7 +1853,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getNaming_Name() {
-        return (EAttribute)getNaming().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getNaming().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1853,8 +1863,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getPrivate() {
-        if (privateEClass == null) {
-            privateEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(8);
+        if( privateEClass == null ) {
+            privateEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 8 );
         }
         return privateEClass;
     }
@@ -1866,7 +1877,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getPrivate_Source() {
-        return (EAttribute)getPrivate().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getPrivate().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1876,7 +1887,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getPrivate_Type() {
-        return (EAttribute)getPrivate().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getPrivate().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1886,7 +1897,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getPrivate_ParentBaseElement() {
-        return (EReference)getPrivate().getEStructuralFeatures().get(2);
+        return ( EReference ) getPrivate().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -1896,8 +1907,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getProcess() {
-        if (processEClass == null) {
-            processEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(9);
+        if( processEClass == null ) {
+            processEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 9 );
         }
         return processEClass;
     }
@@ -1909,7 +1921,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getProcess_Type() {
-        return (EAttribute)getProcess().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getProcess().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -1919,7 +1931,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getProcess_Line() {
-        return (EReference)getProcess().getEStructuralFeatures().get(1);
+        return ( EReference ) getProcess().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -1929,7 +1941,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getProcess_ParentSCL() {
-        return (EReference)getProcess().getEStructuralFeatures().get(2);
+        return ( EReference ) getProcess().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -1939,7 +1951,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getProcess_ConductingEquipment() {
-        return (EReference)getProcess().getEStructuralFeatures().get(3);
+        return ( EReference ) getProcess().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -1949,7 +1961,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getProcess_Substation() {
-        return (EReference)getProcess().getEStructuralFeatures().get(4);
+        return ( EReference ) getProcess().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -1959,7 +1971,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getProcess_SubProcesses() {
-        return (EReference)getProcess().getEStructuralFeatures().get(5);
+        return ( EReference ) getProcess().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -1969,7 +1981,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getProcess_ParentProcess() {
-        return (EReference)getProcess().getEStructuralFeatures().get(6);
+        return ( EReference ) getProcess().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -1979,8 +1991,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSCL() {
-        if (sclEClass == null) {
-            sclEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(10);
+        if( sclEClass == null ) {
+            sclEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 10 );
         }
         return sclEClass;
     }
@@ -1992,7 +2005,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSCL_Revision() {
-        return (EAttribute)getSCL().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSCL().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2002,7 +2015,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSCL_Version() {
-        return (EAttribute)getSCL().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getSCL().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2012,7 +2025,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSCL_Header() {
-        return (EReference)getSCL().getEStructuralFeatures().get(2);
+        return ( EReference ) getSCL().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2022,7 +2035,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSCL_Line() {
-        return (EReference)getSCL().getEStructuralFeatures().get(3);
+        return ( EReference ) getSCL().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2032,7 +2045,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSCL_Process() {
-        return (EReference)getSCL().getEStructuralFeatures().get(4);
+        return ( EReference ) getSCL().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -2042,7 +2055,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSCL_IED() {
-        return (EReference)getSCL().getEStructuralFeatures().get(5);
+        return ( EReference ) getSCL().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -2052,7 +2065,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSCL_DataTypeTemplates() {
-        return (EReference)getSCL().getEStructuralFeatures().get(6);
+        return ( EReference ) getSCL().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -2062,7 +2075,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSCL_Communication() {
-        return (EReference)getSCL().getEStructuralFeatures().get(7);
+        return ( EReference ) getSCL().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -2072,7 +2085,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSCL_Substation() {
-        return (EReference)getSCL().getEStructuralFeatures().get(8);
+        return ( EReference ) getSCL().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -2082,7 +2095,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSCL_Release() {
-        return (EAttribute)getSCL().getEStructuralFeatures().get(9);
+        return ( EAttribute ) getSCL().getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -2092,8 +2105,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getText() {
-        if (textEClass == null) {
-            textEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(11);
+        if( textEClass == null ) {
+            textEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 11 );
         }
         return textEClass;
     }
@@ -2105,7 +2119,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getText_Source() {
-        return (EAttribute)getText().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getText().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2115,7 +2129,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getText_ParentBaseElement() {
-        return (EReference)getText().getEStructuralFeatures().get(1);
+        return ( EReference ) getText().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2125,7 +2139,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getText_ParentHeader() {
-        return (EReference)getText().getEStructuralFeatures().get(2);
+        return ( EReference ) getText().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2135,7 +2149,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getText_Value() {
-        return (EAttribute)getText().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getText().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2145,8 +2159,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAddress() {
-        if (addressEClass == null) {
-            addressEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(12);
+        if( addressEClass == null ) {
+            addressEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 12 );
         }
         return addressEClass;
     }
@@ -2158,7 +2173,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAddress_ParentConnectedAP() {
-        return (EReference)getAddress().getEStructuralFeatures().get(0);
+        return ( EReference ) getAddress().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2168,7 +2183,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAddress_ParentControlBlock() {
-        return (EReference)getAddress().getEStructuralFeatures().get(1);
+        return ( EReference ) getAddress().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2178,7 +2193,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAddress_P() {
-        return (EReference)getAddress().getEStructuralFeatures().get(2);
+        return ( EReference ) getAddress().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2188,8 +2203,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getCommunication() {
-        if (communicationEClass == null) {
-            communicationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(13);
+        if( communicationEClass == null ) {
+            communicationEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 13 );
         }
         return communicationEClass;
     }
@@ -2201,7 +2217,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getCommunication_SubNetwork() {
-        return (EReference)getCommunication().getEStructuralFeatures().get(0);
+        return ( EReference ) getCommunication().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2211,7 +2227,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getCommunication_ParentSCL() {
-        return (EReference)getCommunication().getEStructuralFeatures().get(1);
+        return ( EReference ) getCommunication().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2221,8 +2237,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getConnectedAP() {
-        if (connectedAPEClass == null) {
-            connectedAPEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(14);
+        if( connectedAPEClass == null ) {
+            connectedAPEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 14 );
         }
         return connectedAPEClass;
     }
@@ -2234,7 +2251,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getConnectedAP_ApName() {
-        return (EAttribute)getConnectedAP().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getConnectedAP().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2244,7 +2261,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getConnectedAP_IedName() {
-        return (EAttribute)getConnectedAP().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getConnectedAP().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2254,7 +2271,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getConnectedAP_RedProt() {
-        return (EAttribute)getConnectedAP().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getConnectedAP().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2264,7 +2281,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConnectedAP_Address() {
-        return (EReference)getConnectedAP().getEStructuralFeatures().get(3);
+        return ( EReference ) getConnectedAP().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2274,7 +2291,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConnectedAP_ParentSubNetwork() {
-        return (EReference)getConnectedAP().getEStructuralFeatures().get(4);
+        return ( EReference ) getConnectedAP().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -2284,7 +2301,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConnectedAP_RefersToAccessPoint() {
-        return (EReference)getConnectedAP().getEStructuralFeatures().get(5);
+        return ( EReference ) getConnectedAP().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -2294,7 +2311,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConnectedAP_PhysConn() {
-        return (EReference)getConnectedAP().getEStructuralFeatures().get(6);
+        return ( EReference ) getConnectedAP().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -2304,7 +2321,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConnectedAP_GSE() {
-        return (EReference)getConnectedAP().getEStructuralFeatures().get(7);
+        return ( EReference ) getConnectedAP().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -2314,7 +2331,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConnectedAP_SMV() {
-        return (EReference)getConnectedAP().getEStructuralFeatures().get(8);
+        return ( EReference ) getConnectedAP().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -2324,7 +2341,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getConnectedAP_ControlBlock() {
-        return (EAttribute)getConnectedAP().getEStructuralFeatures().get(9);
+        return ( EAttribute ) getConnectedAP().getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -2334,8 +2351,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getControlBlock() {
-        if (controlBlockEClass == null) {
-            controlBlockEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(15);
+        if( controlBlockEClass == null ) {
+            controlBlockEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 15 );
         }
         return controlBlockEClass;
     }
@@ -2347,7 +2365,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getControlBlock_CbName() {
-        return (EAttribute)getControlBlock().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getControlBlock().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2357,7 +2375,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getControlBlock_LdInst() {
-        return (EAttribute)getControlBlock().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getControlBlock().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2367,7 +2385,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getControlBlock_Address() {
-        return (EReference)getControlBlock().getEStructuralFeatures().get(2);
+        return ( EReference ) getControlBlock().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2377,7 +2395,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getControlBlock_RefersToControlWithIEDName() {
-        return (EReference)getControlBlock().getEStructuralFeatures().get(3);
+        return ( EReference ) getControlBlock().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2387,7 +2405,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EOperation getControlBlock__GetParentConnectedAP() {
-        return getControlBlock().getEOperations().get(0);
+        return getControlBlock().getEOperations().get( 0 );
     }
 
     /**
@@ -2397,8 +2415,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getGSE() {
-        if (gseEClass == null) {
-            gseEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(16);
+        if( gseEClass == null ) {
+            gseEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 16 );
         }
         return gseEClass;
     }
@@ -2410,7 +2429,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGSE_MaxTime() {
-        return (EReference)getGSE().getEStructuralFeatures().get(1);
+        return ( EReference ) getGSE().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2420,7 +2439,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGSE_ParentConnectedAP() {
-        return (EReference)getGSE().getEStructuralFeatures().get(2);
+        return ( EReference ) getGSE().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2430,7 +2449,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGSE_MinTime() {
-        return (EReference)getGSE().getEStructuralFeatures().get(0);
+        return ( EReference ) getGSE().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2440,8 +2459,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getP() {
-        if (pEClass == null) {
-            pEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(17);
+        if( pEClass == null ) {
+            pEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 17 );
         }
         return pEClass;
     }
@@ -2453,7 +2473,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getP_ParentAddress() {
-        return (EReference)getP().getEStructuralFeatures().get(0);
+        return ( EReference ) getP().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2463,8 +2483,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getPAddr() {
-        if (pAddrEClass == null) {
-            pAddrEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(18);
+        if( pAddrEClass == null ) {
+            pAddrEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 18 );
         }
         return pAddrEClass;
     }
@@ -2476,7 +2497,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getPAddr_Type() {
-        return (EAttribute)getPAddr().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getPAddr().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2486,7 +2507,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getPAddr_Value() {
-        return (EAttribute)getPAddr().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getPAddr().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2496,8 +2517,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getP_PhysConn() {
-        if (p_PhysConnEClass == null) {
-            p_PhysConnEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(19);
+        if( p_PhysConnEClass == null ) {
+            p_PhysConnEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 19 );
         }
         return p_PhysConnEClass;
     }
@@ -2509,7 +2531,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getP_PhysConn_ParentPhysConn() {
-        return (EReference)getP_PhysConn().getEStructuralFeatures().get(0);
+        return ( EReference ) getP_PhysConn().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2519,8 +2541,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getPhysConn() {
-        if (physConnEClass == null) {
-            physConnEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(20);
+        if( physConnEClass == null ) {
+            physConnEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 20 );
         }
         return physConnEClass;
     }
@@ -2532,7 +2555,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getPhysConn_Type() {
-        return (EAttribute)getPhysConn().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getPhysConn().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2542,7 +2565,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getPhysConn_ParentConnectedAP() {
-        return (EReference)getPhysConn().getEStructuralFeatures().get(1);
+        return ( EReference ) getPhysConn().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2552,7 +2575,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getPhysConn_P() {
-        return (EReference)getPhysConn().getEStructuralFeatures().get(2);
+        return ( EReference ) getPhysConn().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2562,8 +2585,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSMV() {
-        if (smvEClass == null) {
-            smvEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(21);
+        if( smvEClass == null ) {
+            smvEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 21 );
         }
         return smvEClass;
     }
@@ -2575,7 +2599,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSMV_ParentConnectedAP() {
-        return (EReference)getSMV().getEStructuralFeatures().get(0);
+        return ( EReference ) getSMV().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2585,8 +2609,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSubNetwork() {
-        if (subNetworkEClass == null) {
-            subNetworkEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(22);
+        if( subNetworkEClass == null ) {
+            subNetworkEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 22 );
         }
         return subNetworkEClass;
     }
@@ -2598,7 +2623,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSubNetwork_Type() {
-        return (EAttribute)getSubNetwork().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSubNetwork().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2608,7 +2633,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubNetwork_BitRate() {
-        return (EReference)getSubNetwork().getEStructuralFeatures().get(1);
+        return ( EReference ) getSubNetwork().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2618,7 +2643,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubNetwork_ParentCommunication() {
-        return (EReference)getSubNetwork().getEStructuralFeatures().get(2);
+        return ( EReference ) getSubNetwork().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2628,7 +2653,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubNetwork_ConnectedAP() {
-        return (EReference)getSubNetwork().getEStructuralFeatures().get(3);
+        return ( EReference ) getSubNetwork().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2638,8 +2663,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAbstractDataAttribute() {
-        if (abstractDataAttributeEClass == null) {
-            abstractDataAttributeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(23);
+        if( abstractDataAttributeEClass == null ) {
+            abstractDataAttributeEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 23 );
         }
         return abstractDataAttributeEClass;
     }
@@ -2651,7 +2677,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAbstractDataAttribute_BType() {
-        return (EAttribute)getAbstractDataAttribute().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAbstractDataAttribute().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2661,7 +2687,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAbstractDataAttribute_Count() {
-        return (EAttribute)getAbstractDataAttribute().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getAbstractDataAttribute().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2671,7 +2697,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAbstractDataAttribute_SAddr() {
-        return (EAttribute)getAbstractDataAttribute().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getAbstractDataAttribute().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2681,7 +2707,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAbstractDataAttribute_Type() {
-        return (EAttribute)getAbstractDataAttribute().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getAbstractDataAttribute().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2691,7 +2717,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAbstractDataAttribute_ValImport() {
-        return (EAttribute)getAbstractDataAttribute().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getAbstractDataAttribute().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -2701,7 +2727,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAbstractDataAttribute_ValKind() {
-        return (EAttribute)getAbstractDataAttribute().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getAbstractDataAttribute().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -2711,7 +2737,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAbstractDataAttribute_RefersToEnumType() {
-        return (EReference)getAbstractDataAttribute().getEStructuralFeatures().get(6);
+        return ( EReference ) getAbstractDataAttribute().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -2721,7 +2747,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAbstractDataAttribute_Val() {
-        return (EReference)getAbstractDataAttribute().getEStructuralFeatures().get(7);
+        return ( EReference ) getAbstractDataAttribute().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -2731,7 +2757,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAbstractDataAttribute_RefersToDAType() {
-        return (EReference)getAbstractDataAttribute().getEStructuralFeatures().get(8);
+        return ( EReference ) getAbstractDataAttribute().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -2741,7 +2767,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAbstractDataAttribute_ReferredByFCDA() {
-        return (EReference)getAbstractDataAttribute().getEStructuralFeatures().get(9);
+        return ( EReference ) getAbstractDataAttribute().getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -2751,7 +2777,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAbstractDataAttribute_ReferredByExtRef() {
-        return (EReference)getAbstractDataAttribute().getEStructuralFeatures().get(10);
+        return ( EReference ) getAbstractDataAttribute().getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -2761,7 +2787,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAbstractDataAttribute_Name() {
-        return (EAttribute)getAbstractDataAttribute().getEStructuralFeatures().get(11);
+        return ( EAttribute ) getAbstractDataAttribute().getEStructuralFeatures().get( 11 );
     }
 
     /**
@@ -2771,7 +2797,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAbstractDataAttribute_ReferredByDAI() {
-        return (EReference)getAbstractDataAttribute().getEStructuralFeatures().get(12);
+        return ( EReference ) getAbstractDataAttribute().getEStructuralFeatures().get( 12 );
     }
 
     /**
@@ -2781,7 +2807,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAbstractDataAttribute_ReferredBySDI() {
-        return (EReference)getAbstractDataAttribute().getEStructuralFeatures().get(13);
+        return ( EReference ) getAbstractDataAttribute().getEStructuralFeatures().get( 13 );
     }
 
     /**
@@ -2791,8 +2817,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getBDA() {
-        if (bdaEClass == null) {
-            bdaEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(24);
+        if( bdaEClass == null ) {
+            bdaEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 24 );
         }
         return bdaEClass;
     }
@@ -2804,7 +2831,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getBDA_ParentDAType() {
-        return (EReference)getBDA().getEStructuralFeatures().get(0);
+        return ( EReference ) getBDA().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2814,8 +2841,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getDA() {
-        if (daEClass == null) {
-            daEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(25);
+        if( daEClass == null ) {
+            daEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 25 );
         }
         return daEClass;
     }
@@ -2827,7 +2855,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDA_Fc() {
-        return (EAttribute)getDA().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getDA().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2837,7 +2865,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDA_ParentDOType() {
-        return (EReference)getDA().getEStructuralFeatures().get(1);
+        return ( EReference ) getDA().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2847,7 +2875,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDA_ProtNs() {
-        return (EReference)getDA().getEStructuralFeatures().get(2);
+        return ( EReference ) getDA().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2857,8 +2885,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getDAType() {
-        if (daTypeEClass == null) {
-            daTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(26);
+        if( daTypeEClass == null ) {
+            daTypeEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 26 );
         }
         return daTypeEClass;
     }
@@ -2870,7 +2899,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDAType_IedType() {
-        return (EAttribute)getDAType().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getDAType().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2880,7 +2909,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDAType_BDA() {
-        return (EReference)getDAType().getEStructuralFeatures().get(1);
+        return ( EReference ) getDAType().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2890,7 +2919,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDAType_ReferredByAbstractDataAttribute() {
-        return (EReference)getDAType().getEStructuralFeatures().get(2);
+        return ( EReference ) getDAType().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2900,7 +2929,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDAType_ParentDataTypeTemplates() {
-        return (EReference)getDAType().getEStructuralFeatures().get(3);
+        return ( EReference ) getDAType().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2910,7 +2939,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDAType_ProtNs() {
-        return (EReference)getDAType().getEStructuralFeatures().get(4);
+        return ( EReference ) getDAType().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -2920,8 +2949,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getDO() {
-        if (doEClass == null) {
-            doEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(27);
+        if( doEClass == null ) {
+            doEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 27 );
         }
         return doEClass;
     }
@@ -2933,7 +2963,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDO_Transient() {
-        return (EAttribute)getDO().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getDO().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2943,7 +2973,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDO_ParentLNodeType() {
-        return (EReference)getDO().getEStructuralFeatures().get(1);
+        return ( EReference ) getDO().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -2953,7 +2983,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDO_AccessControl() {
-        return (EAttribute)getDO().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getDO().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -2963,7 +2993,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDO_ReferredByDOI() {
-        return (EReference)getDO().getEStructuralFeatures().get(3);
+        return ( EReference ) getDO().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -2973,8 +3003,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getDOType() {
-        if (doTypeEClass == null) {
-            doTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(28);
+        if( doTypeEClass == null ) {
+            doTypeEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 28 );
         }
         return doTypeEClass;
     }
@@ -2986,7 +3017,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDOType_Cdc() {
-        return (EAttribute)getDOType().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getDOType().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -2996,7 +3027,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDOType_IedType() {
-        return (EAttribute)getDOType().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getDOType().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3006,7 +3037,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDOType_DA() {
-        return (EReference)getDOType().getEStructuralFeatures().get(2);
+        return ( EReference ) getDOType().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3016,7 +3047,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDOType_ReferredByAbstractDataObject() {
-        return (EReference)getDOType().getEStructuralFeatures().get(3);
+        return ( EReference ) getDOType().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3026,7 +3057,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDOType_ParentDataTypeTemplates() {
-        return (EReference)getDOType().getEStructuralFeatures().get(4);
+        return ( EReference ) getDOType().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -3036,7 +3067,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDOType_SDO() {
-        return (EReference)getDOType().getEStructuralFeatures().get(5);
+        return ( EReference ) getDOType().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -3046,8 +3077,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getDataTypeTemplates() {
-        if (dataTypeTemplatesEClass == null) {
-            dataTypeTemplatesEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(29);
+        if( dataTypeTemplatesEClass == null ) {
+            dataTypeTemplatesEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 29 );
         }
         return dataTypeTemplatesEClass;
     }
@@ -3059,7 +3091,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDataTypeTemplates_DAType() {
-        return (EReference)getDataTypeTemplates().getEStructuralFeatures().get(0);
+        return ( EReference ) getDataTypeTemplates().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3069,7 +3101,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDataTypeTemplates_DOType() {
-        return (EReference)getDataTypeTemplates().getEStructuralFeatures().get(1);
+        return ( EReference ) getDataTypeTemplates().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3079,7 +3111,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDataTypeTemplates_EnumType() {
-        return (EReference)getDataTypeTemplates().getEStructuralFeatures().get(2);
+        return ( EReference ) getDataTypeTemplates().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3089,7 +3121,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDataTypeTemplates_LNodeType() {
-        return (EReference)getDataTypeTemplates().getEStructuralFeatures().get(3);
+        return ( EReference ) getDataTypeTemplates().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3099,7 +3131,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDataTypeTemplates_ParentSCL() {
-        return (EReference)getDataTypeTemplates().getEStructuralFeatures().get(4);
+        return ( EReference ) getDataTypeTemplates().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -3109,8 +3141,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getEnumType() {
-        if (enumTypeEClass == null) {
-            enumTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(30);
+        if( enumTypeEClass == null ) {
+            enumTypeEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 30 );
         }
         return enumTypeEClass;
     }
@@ -3122,7 +3155,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getEnumType_ReferredByAbstractDataAttribute() {
-        return (EReference)getEnumType().getEStructuralFeatures().get(0);
+        return ( EReference ) getEnumType().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3132,7 +3165,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getEnumType_ParentDataTypeTemplates() {
-        return (EReference)getEnumType().getEStructuralFeatures().get(1);
+        return ( EReference ) getEnumType().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3142,7 +3175,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getEnumType_EnumVal() {
-        return (EReference)getEnumType().getEStructuralFeatures().get(2);
+        return ( EReference ) getEnumType().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3152,8 +3185,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getEnumVal() {
-        if (enumValEClass == null) {
-            enumValEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(31);
+        if( enumValEClass == null ) {
+            enumValEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 31 );
         }
         return enumValEClass;
     }
@@ -3165,7 +3199,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getEnumVal_Ord() {
-        return (EAttribute)getEnumVal().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getEnumVal().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3175,7 +3209,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getEnumVal_ParentEnumType() {
-        return (EReference)getEnumVal().getEStructuralFeatures().get(1);
+        return ( EReference ) getEnumVal().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3185,7 +3219,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getEnumVal_Value() {
-        return (EAttribute)getEnumVal().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getEnumVal().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3195,8 +3229,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getLNodeType() {
-        if (lNodeTypeEClass == null) {
-            lNodeTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(32);
+        if( lNodeTypeEClass == null ) {
+            lNodeTypeEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 32 );
         }
         return lNodeTypeEClass;
     }
@@ -3208,7 +3243,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLNodeType_IedType() {
-        return (EAttribute)getLNodeType().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getLNodeType().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3218,7 +3253,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLNodeType_LnClass() {
-        return (EAttribute)getLNodeType().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getLNodeType().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3228,7 +3263,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLNodeType_DO() {
-        return (EReference)getLNodeType().getEStructuralFeatures().get(2);
+        return ( EReference ) getLNodeType().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3238,7 +3273,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLNodeType_ParentDataTypeTemplates() {
-        return (EReference)getLNodeType().getEStructuralFeatures().get(3);
+        return ( EReference ) getLNodeType().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3248,7 +3283,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLNodeType_ReferredByAnyLN() {
-        return (EReference)getLNodeType().getEStructuralFeatures().get(4);
+        return ( EReference ) getLNodeType().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -3258,7 +3293,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLNodeType_ReferredByLNode() {
-        return (EReference)getLNodeType().getEStructuralFeatures().get(5);
+        return ( EReference ) getLNodeType().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -3268,8 +3303,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getProtNs() {
-        if (protNsEClass == null) {
-            protNsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(33);
+        if( protNsEClass == null ) {
+            protNsEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 33 );
         }
         return protNsEClass;
     }
@@ -3281,7 +3317,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getProtNs_Type() {
-        return (EAttribute)getProtNs().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getProtNs().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3291,7 +3327,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getProtNs_ParentDA() {
-        return (EReference)getProtNs().getEStructuralFeatures().get(1);
+        return ( EReference ) getProtNs().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3301,7 +3337,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getProtNs_ParentDAType() {
-        return (EReference)getProtNs().getEStructuralFeatures().get(2);
+        return ( EReference ) getProtNs().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3311,7 +3347,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getProtNs_Value() {
-        return (EAttribute)getProtNs().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getProtNs().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3321,8 +3357,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSDO() {
-        if (sdoEClass == null) {
-            sdoEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(34);
+        if( sdoEClass == null ) {
+            sdoEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 34 );
         }
         return sdoEClass;
     }
@@ -3334,7 +3371,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSDO_Count() {
-        return (EAttribute)getSDO().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSDO().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3344,7 +3381,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSDO_ParentDOType() {
-        return (EReference)getSDO().getEStructuralFeatures().get(1);
+        return ( EReference ) getSDO().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3354,7 +3391,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSDO_ReferredBySDI() {
-        return (EReference)getSDO().getEStructuralFeatures().get(2);
+        return ( EReference ) getSDO().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3364,8 +3401,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getVal() {
-        if (valEClass == null) {
-            valEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(35);
+        if( valEClass == null ) {
+            valEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 35 );
         }
         return valEClass;
     }
@@ -3377,7 +3415,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getVal_SGroup() {
-        return (EAttribute)getVal().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getVal().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3387,7 +3425,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getVal_ParentAbstractDataAttribute() {
-        return (EReference)getVal().getEStructuralFeatures().get(1);
+        return ( EReference ) getVal().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3397,7 +3435,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getVal_ParentDAI() {
-        return (EReference)getVal().getEStructuralFeatures().get(2);
+        return ( EReference ) getVal().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3407,7 +3445,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getVal_Value() {
-        return (EAttribute)getVal().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getVal().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3417,8 +3455,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getBitRateInMbPerSec() {
-        if (bitRateInMbPerSecEClass == null) {
-            bitRateInMbPerSecEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(166);
+        if( bitRateInMbPerSecEClass == null ) {
+            bitRateInMbPerSecEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 166 );
         }
         return bitRateInMbPerSecEClass;
     }
@@ -3430,7 +3469,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getBitRateInMbPerSec_Value() {
-        return (EAttribute)getBitRateInMbPerSec().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getBitRateInMbPerSec().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3440,7 +3479,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getBitRateInMbPerSec_Multiplier() {
-        return (EAttribute)getBitRateInMbPerSec().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getBitRateInMbPerSec().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3450,7 +3489,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getBitRateInMbPerSec_Unit() {
-        return (EAttribute)getBitRateInMbPerSec().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getBitRateInMbPerSec().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3460,8 +3499,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getMinTime() {
-        if (minTimeEClass == null) {
-            minTimeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(167);
+        if( minTimeEClass == null ) {
+            minTimeEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 167 );
         }
         return minTimeEClass;
     }
@@ -3473,8 +3513,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getMaxTime() {
-        if (maxTimeEClass == null) {
-            maxTimeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(168);
+        if( maxTimeEClass == null ) {
+            maxTimeEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 168 );
         }
         return maxTimeEClass;
     }
@@ -3486,8 +3527,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getBitRate() {
-        if (bitRateEClass == null) {
-            bitRateEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(169);
+        if( bitRateEClass == null ) {
+            bitRateEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 169 );
         }
         return bitRateEClass;
     }
@@ -3499,7 +3541,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getBitRate_ParentSubNetwork() {
-        return (EReference)getBitRate().getEStructuralFeatures().get(0);
+        return ( EReference ) getBitRate().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3509,8 +3551,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSmpRate() {
-        if (smpRateEClass == null) {
-            smpRateEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(170);
+        if( smpRateEClass == null ) {
+            smpRateEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 170 );
         }
         return smpRateEClass;
     }
@@ -3522,7 +3565,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSmpRate_Value() {
-        return (EAttribute)getSmpRate().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSmpRate().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3532,7 +3575,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSmpRate_ParentSMVSettings() {
-        return (EReference)getSmpRate().getEStructuralFeatures().get(1);
+        return ( EReference ) getSmpRate().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3542,8 +3585,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSamplesPerSec() {
-        if (samplesPerSecEClass == null) {
-            samplesPerSecEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(171);
+        if( samplesPerSecEClass == null ) {
+            samplesPerSecEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 171 );
         }
         return samplesPerSecEClass;
     }
@@ -3555,7 +3599,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSamplesPerSec_Value() {
-        return (EAttribute)getSamplesPerSec().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSamplesPerSec().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3565,7 +3609,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSamplesPerSec_ParentSMVSettings() {
-        return (EReference)getSamplesPerSec().getEStructuralFeatures().get(1);
+        return ( EReference ) getSamplesPerSec().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3575,8 +3619,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSecPerSamples() {
-        if (secPerSamplesEClass == null) {
-            secPerSamplesEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(172);
+        if( secPerSamplesEClass == null ) {
+            secPerSamplesEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 172 );
         }
         return secPerSamplesEClass;
     }
@@ -3588,7 +3633,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSecPerSamples_Value() {
-        return (EAttribute)getSecPerSamples().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSecPerSamples().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3598,7 +3643,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSecPerSamples_ParentSMVSettings() {
-        return (EReference)getSecPerSamples().getEStructuralFeatures().get(1);
+        return ( EReference ) getSecPerSamples().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3608,8 +3653,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getMcSecurity() {
-        if (mcSecurityEClass == null) {
-            mcSecurityEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(173);
+        if( mcSecurityEClass == null ) {
+            mcSecurityEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 173 );
         }
         return mcSecurityEClass;
     }
@@ -3621,7 +3667,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getMcSecurity_ParentClientServices() {
-        return (EReference)getMcSecurity().getEStructuralFeatures().get(0);
+        return ( EReference ) getMcSecurity().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3631,7 +3677,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getMcSecurity_ParentGSESettings() {
-        return (EReference)getMcSecurity().getEStructuralFeatures().get(1);
+        return ( EReference ) getMcSecurity().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3641,7 +3687,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getMcSecurity_ParentSMVSettings() {
-        return (EReference)getMcSecurity().getEStructuralFeatures().get(2);
+        return ( EReference ) getMcSecurity().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3651,7 +3697,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getMcSecurity_Signature() {
-        return (EAttribute)getMcSecurity().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getMcSecurity().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3661,7 +3707,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getMcSecurity_Encryption() {
-        return (EAttribute)getMcSecurity().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getMcSecurity().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -3671,8 +3717,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAgAuthentication() {
-        if (agAuthenticationEClass == null) {
-            agAuthenticationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(174);
+        if( agAuthenticationEClass == null ) {
+            agAuthenticationEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 174 );
         }
         return agAuthenticationEClass;
     }
@@ -3684,7 +3731,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgAuthentication_Certificate() {
-        return (EAttribute)getAgAuthentication().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAgAuthentication().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3694,7 +3741,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgAuthentication_None() {
-        return (EAttribute)getAgAuthentication().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getAgAuthentication().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3704,7 +3751,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgAuthentication_Password() {
-        return (EAttribute)getAgAuthentication().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getAgAuthentication().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3714,7 +3761,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgAuthentication_Strong() {
-        return (EAttribute)getAgAuthentication().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getAgAuthentication().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3724,7 +3771,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgAuthentication_Weak() {
-        return (EAttribute)getAgAuthentication().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getAgAuthentication().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -3734,8 +3781,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAgSmvOpts() {
-        if (agSmvOptsEClass == null) {
-            agSmvOptsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(175);
+        if( agSmvOptsEClass == null ) {
+            agSmvOptsEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 175 );
         }
         return agSmvOptsEClass;
     }
@@ -3747,7 +3795,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgSmvOpts_DataSet() {
-        return (EAttribute)getAgSmvOpts().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAgSmvOpts().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3757,7 +3805,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgSmvOpts_RefreshTime() {
-        return (EAttribute)getAgSmvOpts().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getAgSmvOpts().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3767,7 +3815,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgSmvOpts_SampleRate() {
-        return (EAttribute)getAgSmvOpts().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getAgSmvOpts().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3777,7 +3825,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgSmvOpts_SampleSynchronized() {
-        return (EAttribute)getAgSmvOpts().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getAgSmvOpts().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3787,7 +3835,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgSmvOpts_Security() {
-        return (EAttribute)getAgSmvOpts().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getAgSmvOpts().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -3797,7 +3845,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgSmvOpts_Timestamp() {
-        return (EAttribute)getAgSmvOpts().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getAgSmvOpts().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -3807,7 +3855,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgSmvOpts_SynchSourceId() {
-        return (EAttribute)getAgSmvOpts().getEStructuralFeatures().get(6);
+        return ( EAttribute ) getAgSmvOpts().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -3817,7 +3865,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgSmvOpts_DataRef() {
-        return (EAttribute)getAgSmvOpts().getEStructuralFeatures().get(7);
+        return ( EAttribute ) getAgSmvOpts().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -3827,8 +3875,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAgOptFields() {
-        if (agOptFieldsEClass == null) {
-            agOptFieldsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(176);
+        if( agOptFieldsEClass == null ) {
+            agOptFieldsEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 176 );
         }
         return agOptFieldsEClass;
     }
@@ -3840,7 +3889,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgOptFields_BufOvfl() {
-        return (EAttribute)getAgOptFields().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAgOptFields().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3850,7 +3899,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgOptFields_ConfigRef() {
-        return (EAttribute)getAgOptFields().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getAgOptFields().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3860,7 +3909,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgOptFields_DataRef() {
-        return (EAttribute)getAgOptFields().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getAgOptFields().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -3870,7 +3919,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgOptFields_DataSet() {
-        return (EAttribute)getAgOptFields().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getAgOptFields().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -3880,7 +3929,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgOptFields_EntryID() {
-        return (EAttribute)getAgOptFields().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getAgOptFields().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -3890,7 +3939,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgOptFields_ReasonCode() {
-        return (EAttribute)getAgOptFields().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getAgOptFields().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -3900,7 +3949,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgOptFields_SeqNum() {
-        return (EAttribute)getAgOptFields().getEStructuralFeatures().get(6);
+        return ( EAttribute ) getAgOptFields().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -3910,7 +3959,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgOptFields_TimeStamp() {
-        return (EAttribute)getAgOptFields().getEStructuralFeatures().get(7);
+        return ( EAttribute ) getAgOptFields().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -3920,7 +3969,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgOptFields_Segmentation() {
-        return (EAttribute)getAgOptFields().getEStructuralFeatures().get(8);
+        return ( EAttribute ) getAgOptFields().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -3930,8 +3979,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAgDesc() {
-        if (agDescEClass == null) {
-            agDescEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(177);
+        if( agDescEClass == null ) {
+            agDescEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 177 );
         }
         return agDescEClass;
     }
@@ -3943,7 +3993,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgDesc_Desc() {
-        return (EAttribute)getAgDesc().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAgDesc().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3953,8 +4003,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAgLDRef() {
-        if (agLDRefEClass == null) {
-            agLDRefEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(178);
+        if( agLDRefEClass == null ) {
+            agLDRefEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 178 );
         }
         return agLDRefEClass;
     }
@@ -3966,7 +4017,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgLDRef_IedName() {
-        return (EAttribute)getAgLDRef().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAgLDRef().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -3976,7 +4027,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgLDRef_LdInst() {
-        return (EAttribute)getAgLDRef().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getAgLDRef().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -3986,8 +4037,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAgLNRef() {
-        if (agLNRefEClass == null) {
-            agLNRefEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(179);
+        if( agLNRefEClass == null ) {
+            agLNRefEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 179 );
         }
         return agLNRefEClass;
     }
@@ -3999,7 +4051,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgLNRef_LnClass() {
-        return (EAttribute)getAgLNRef().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAgLNRef().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4009,7 +4061,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgLNRef_LnInst() {
-        return (EAttribute)getAgLNRef().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getAgLNRef().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -4019,7 +4071,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgLNRef_Prefix() {
-        return (EAttribute)getAgLNRef().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getAgLNRef().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -4029,8 +4081,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAgDATrgOp() {
-        if (agDATrgOpEClass == null) {
-            agDATrgOpEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(180);
+        if( agDATrgOpEClass == null ) {
+            agDATrgOpEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 180 );
         }
         return agDATrgOpEClass;
     }
@@ -4042,7 +4095,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgDATrgOp_Dchg() {
-        return (EAttribute)getAgDATrgOp().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAgDATrgOp().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4052,7 +4105,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgDATrgOp_Dupd() {
-        return (EAttribute)getAgDATrgOp().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getAgDATrgOp().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -4062,7 +4115,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgDATrgOp_Qchg() {
-        return (EAttribute)getAgDATrgOp().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getAgDATrgOp().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -4072,8 +4125,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAgVirtual() {
-        if (agVirtualEClass == null) {
-            agVirtualEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(181);
+        if( agVirtualEClass == null ) {
+            agVirtualEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 181 );
         }
         return agVirtualEClass;
     }
@@ -4085,7 +4139,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAgVirtual_Virtual() {
-        return (EAttribute)getAgVirtual().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAgVirtual().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4095,8 +4149,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getIRiseClipseConsole() {
-        if (iRiseClipseConsoleEClass == null) {
-            iRiseClipseConsoleEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(182);
+        if( iRiseClipseConsoleEClass == null ) {
+            iRiseClipseConsoleEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 182 );
         }
         return iRiseClipseConsoleEClass;
     }
@@ -4108,8 +4163,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getDurationInMilliSec() {
-        if (durationInMilliSecEClass == null) {
-            durationInMilliSecEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(165);
+        if( durationInMilliSecEClass == null ) {
+            durationInMilliSecEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 165 );
         }
         return durationInMilliSecEClass;
     }
@@ -4121,7 +4177,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDurationInMilliSec_Value() {
-        return (EAttribute)getDurationInMilliSec().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getDurationInMilliSec().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4131,7 +4187,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDurationInMilliSec_Multiplier() {
-        return (EAttribute)getDurationInMilliSec().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getDurationInMilliSec().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -4141,7 +4197,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDurationInMilliSec_Unit() {
-        return (EAttribute)getDurationInMilliSec().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getDurationInMilliSec().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -4151,8 +4207,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAccessControl() {
-        if (accessControlEClass == null) {
-            accessControlEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(36);
+        if( accessControlEClass == null ) {
+            accessControlEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 36 );
         }
         return accessControlEClass;
     }
@@ -4164,7 +4221,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAccessControl_ParentLDevice() {
-        return (EReference)getAccessControl().getEStructuralFeatures().get(0);
+        return ( EReference ) getAccessControl().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4174,8 +4231,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAccessPoint() {
-        if (accessPointEClass == null) {
-            accessPointEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(37);
+        if( accessPointEClass == null ) {
+            accessPointEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 37 );
         }
         return accessPointEClass;
     }
@@ -4187,7 +4245,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAccessPoint_Clock() {
-        return (EAttribute)getAccessPoint().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAccessPoint().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4197,7 +4255,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAccessPoint_Kdc() {
-        return (EAttribute)getAccessPoint().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getAccessPoint().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -4207,7 +4265,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAccessPoint_Router() {
-        return (EAttribute)getAccessPoint().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getAccessPoint().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -4217,7 +4275,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAccessPoint_ParentIED() {
-        return (EReference)getAccessPoint().getEStructuralFeatures().get(3);
+        return ( EReference ) getAccessPoint().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -4227,7 +4285,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAccessPoint_LN() {
-        return (EReference)getAccessPoint().getEStructuralFeatures().get(4);
+        return ( EReference ) getAccessPoint().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -4237,7 +4295,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAccessPoint_SMVSecurity() {
-        return (EReference)getAccessPoint().getEStructuralFeatures().get(5);
+        return ( EReference ) getAccessPoint().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -4247,7 +4305,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAccessPoint_ServerAt() {
-        return (EReference)getAccessPoint().getEStructuralFeatures().get(6);
+        return ( EReference ) getAccessPoint().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -4257,7 +4315,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAccessPoint_Server() {
-        return (EReference)getAccessPoint().getEStructuralFeatures().get(7);
+        return ( EReference ) getAccessPoint().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -4267,7 +4325,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAccessPoint_Services() {
-        return (EReference)getAccessPoint().getEStructuralFeatures().get(8);
+        return ( EReference ) getAccessPoint().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -4277,7 +4335,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAccessPoint_GOOSESecurity() {
-        return (EReference)getAccessPoint().getEStructuralFeatures().get(9);
+        return ( EReference ) getAccessPoint().getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -4287,7 +4345,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAccessPoint_ReferredByServerAt() {
-        return (EReference)getAccessPoint().getEStructuralFeatures().get(10);
+        return ( EReference ) getAccessPoint().getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -4297,7 +4355,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAccessPoint_Name() {
-        return (EAttribute)getAccessPoint().getEStructuralFeatures().get(11);
+        return ( EAttribute ) getAccessPoint().getEStructuralFeatures().get( 11 );
     }
 
     /**
@@ -4307,7 +4365,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAccessPoint_ReferredByConnectedAP() {
-        return (EReference)getAccessPoint().getEStructuralFeatures().get(12);
+        return ( EReference ) getAccessPoint().getEStructuralFeatures().get( 12 );
     }
 
     /**
@@ -4317,7 +4375,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAccessPoint_ReferredByKDC() {
-        return (EReference)getAccessPoint().getEStructuralFeatures().get(13);
+        return ( EReference ) getAccessPoint().getEStructuralFeatures().get( 13 );
     }
 
     /**
@@ -4327,8 +4385,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAnyLN() {
-        if (anyLNEClass == null) {
-            anyLNEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(38);
+        if( anyLNEClass == null ) {
+            anyLNEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 38 );
         }
         return anyLNEClass;
     }
@@ -4340,7 +4399,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAnyLN_Inst() {
-        return (EAttribute)getAnyLN().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAnyLN().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4350,7 +4409,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAnyLN_LnClass() {
-        return (EAttribute)getAnyLN().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getAnyLN().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -4360,7 +4419,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAnyLN_LnType() {
-        return (EAttribute)getAnyLN().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getAnyLN().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -4370,7 +4429,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAnyLN_RefersToLNodeType() {
-        return (EReference)getAnyLN().getEStructuralFeatures().get(3);
+        return ( EReference ) getAnyLN().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -4380,7 +4439,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAnyLN_Inputs() {
-        return (EReference)getAnyLN().getEStructuralFeatures().get(4);
+        return ( EReference ) getAnyLN().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -4390,7 +4449,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAnyLN_Log() {
-        return (EReference)getAnyLN().getEStructuralFeatures().get(5);
+        return ( EReference ) getAnyLN().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -4400,7 +4459,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAnyLN_DOI() {
-        return (EReference)getAnyLN().getEStructuralFeatures().get(6);
+        return ( EReference ) getAnyLN().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -4410,7 +4469,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAnyLN_ReportControl() {
-        return (EReference)getAnyLN().getEStructuralFeatures().get(7);
+        return ( EReference ) getAnyLN().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -4420,7 +4479,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAnyLN_LogControl() {
-        return (EReference)getAnyLN().getEStructuralFeatures().get(8);
+        return ( EReference ) getAnyLN().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -4430,7 +4489,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAnyLN_DataSet() {
-        return (EReference)getAnyLN().getEStructuralFeatures().get(9);
+        return ( EReference ) getAnyLN().getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -4440,7 +4499,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAnyLN_ReferredByClientLN() {
-        return (EReference)getAnyLN().getEStructuralFeatures().get(10);
+        return ( EReference ) getAnyLN().getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -4450,7 +4509,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAnyLN_ReferredByLogControl() {
-        return (EReference)getAnyLN().getEStructuralFeatures().get(11);
+        return ( EReference ) getAnyLN().getEStructuralFeatures().get( 11 );
     }
 
     /**
@@ -4460,7 +4519,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAnyLN_ReferredByAssociation() {
-        return (EReference)getAnyLN().getEStructuralFeatures().get(12);
+        return ( EReference ) getAnyLN().getEStructuralFeatures().get( 12 );
     }
 
     /**
@@ -4470,7 +4529,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAnyLN_ReferredByIEDName() {
-        return (EReference)getAnyLN().getEStructuralFeatures().get(13);
+        return ( EReference ) getAnyLN().getEStructuralFeatures().get( 13 );
     }
 
     /**
@@ -4480,7 +4539,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAnyLN_ReferredByLNode() {
-        return (EReference)getAnyLN().getEStructuralFeatures().get(14);
+        return ( EReference ) getAnyLN().getEStructuralFeatures().get( 14 );
     }
 
     /**
@@ -4490,7 +4549,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAnyLN_ControlWithTriggerOpt() {
-        return (EAttribute)getAnyLN().getEStructuralFeatures().get(15);
+        return ( EAttribute ) getAnyLN().getEStructuralFeatures().get( 15 );
     }
 
     /**
@@ -4500,7 +4559,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAnyLN_Control() {
-        return (EAttribute)getAnyLN().getEStructuralFeatures().get(16);
+        return ( EAttribute ) getAnyLN().getEStructuralFeatures().get( 16 );
     }
 
     /**
@@ -4510,7 +4569,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EOperation getAnyLN__GetParentLDevice() {
-        return getAnyLN().getEOperations().get(0);
+        return getAnyLN().getEOperations().get( 0 );
     }
 
     /**
@@ -4520,7 +4579,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EOperation getAnyLN__GetNamespace() {
-        return getAnyLN().getEOperations().get(1);
+        return getAnyLN().getEOperations().get( 1 );
     }
 
     /**
@@ -4530,8 +4589,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAssociation() {
-        if (associationEClass == null) {
-            associationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(39);
+        if( associationEClass == null ) {
+            associationEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 39 );
         }
         return associationEClass;
     }
@@ -4543,7 +4603,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAssociation_AssociationID() {
-        return (EAttribute)getAssociation().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAssociation().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4553,7 +4613,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAssociation_Kind() {
-        return (EAttribute)getAssociation().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getAssociation().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -4563,7 +4623,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAssociation_ParentServer() {
-        return (EReference)getAssociation().getEStructuralFeatures().get(2);
+        return ( EReference ) getAssociation().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -4573,7 +4633,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAssociation_RefersToAnyLN() {
-        return (EReference)getAssociation().getEStructuralFeatures().get(3);
+        return ( EReference ) getAssociation().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -4583,8 +4643,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAuthentication() {
-        if (authenticationEClass == null) {
-            authenticationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(40);
+        if( authenticationEClass == null ) {
+            authenticationEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 40 );
         }
         return authenticationEClass;
     }
@@ -4596,7 +4657,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAuthentication_ParentServer() {
-        return (EReference)getAuthentication().getEStructuralFeatures().get(0);
+        return ( EReference ) getAuthentication().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4606,8 +4667,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getCertificate() {
-        if (certificateEClass == null) {
-            certificateEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(41);
+        if( certificateEClass == null ) {
+            certificateEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 41 );
         }
         return certificateEClass;
     }
@@ -4619,7 +4681,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getCertificate_SerialNumber() {
-        return (EAttribute)getCertificate().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getCertificate().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4629,7 +4691,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getCertificate_XferNumber() {
-        return (EAttribute)getCertificate().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getCertificate().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -4639,7 +4701,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getCertificate_Subject() {
-        return (EReference)getCertificate().getEStructuralFeatures().get(2);
+        return ( EReference ) getCertificate().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -4649,7 +4711,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getCertificate_IssuerName() {
-        return (EReference)getCertificate().getEStructuralFeatures().get(3);
+        return ( EReference ) getCertificate().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -4659,8 +4721,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getClientLN() {
-        if (clientLNEClass == null) {
-            clientLNEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(42);
+        if( clientLNEClass == null ) {
+            clientLNEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 42 );
         }
         return clientLNEClass;
     }
@@ -4672,7 +4735,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientLN_ApRef() {
-        return (EAttribute)getClientLN().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getClientLN().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4682,7 +4745,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getClientLN_ParentRptEnabled() {
-        return (EReference)getClientLN().getEStructuralFeatures().get(1);
+        return ( EReference ) getClientLN().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -4692,7 +4755,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getClientLN_RefersToAnyLN() {
-        return (EReference)getClientLN().getEStructuralFeatures().get(2);
+        return ( EReference ) getClientLN().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -4702,8 +4765,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getClientServices() {
-        if (clientServicesEClass == null) {
-            clientServicesEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(43);
+        if( clientServicesEClass == null ) {
+            clientServicesEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 43 );
         }
         return clientServicesEClass;
     }
@@ -4715,7 +4779,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientServices_BufReport() {
-        return (EAttribute)getClientServices().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getClientServices().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4725,7 +4789,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientServices_Goose() {
-        return (EAttribute)getClientServices().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getClientServices().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -4735,7 +4799,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientServices_Gsse() {
-        return (EAttribute)getClientServices().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getClientServices().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -4745,7 +4809,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientServices_MaxAttributes() {
-        return (EAttribute)getClientServices().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getClientServices().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -4755,7 +4819,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientServices_MaxGOOSE() {
-        return (EAttribute)getClientServices().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getClientServices().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -4765,7 +4829,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientServices_MaxReports() {
-        return (EAttribute)getClientServices().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getClientServices().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -4775,7 +4839,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientServices_MaxSMV() {
-        return (EAttribute)getClientServices().getEStructuralFeatures().get(6);
+        return ( EAttribute ) getClientServices().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -4785,7 +4849,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientServices_ReadLog() {
-        return (EAttribute)getClientServices().getEStructuralFeatures().get(7);
+        return ( EAttribute ) getClientServices().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -4795,7 +4859,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientServices_SupportsLdName() {
-        return (EAttribute)getClientServices().getEStructuralFeatures().get(8);
+        return ( EAttribute ) getClientServices().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -4805,7 +4869,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientServices_Sv() {
-        return (EAttribute)getClientServices().getEStructuralFeatures().get(9);
+        return ( EAttribute ) getClientServices().getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -4815,7 +4879,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientServices_UnbufReport() {
-        return (EAttribute)getClientServices().getEStructuralFeatures().get(10);
+        return ( EAttribute ) getClientServices().getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -4825,7 +4889,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getClientServices_ParentServices() {
-        return (EReference)getClientServices().getEStructuralFeatures().get(11);
+        return ( EReference ) getClientServices().getEStructuralFeatures().get( 11 );
     }
 
     /**
@@ -4835,7 +4899,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getClientServices_TimeSyncProt() {
-        return (EReference)getClientServices().getEStructuralFeatures().get(12);
+        return ( EReference ) getClientServices().getEStructuralFeatures().get( 12 );
     }
 
     /**
@@ -4845,7 +4909,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientServices_RGOOSE() {
-        return (EAttribute)getClientServices().getEStructuralFeatures().get(13);
+        return ( EAttribute ) getClientServices().getEStructuralFeatures().get( 13 );
     }
 
     /**
@@ -4855,7 +4919,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientServices_RSV() {
-        return (EAttribute)getClientServices().getEStructuralFeatures().get(14);
+        return ( EAttribute ) getClientServices().getEStructuralFeatures().get( 14 );
     }
 
     /**
@@ -4865,7 +4929,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getClientServices_NoIctBinding() {
-        return (EAttribute)getClientServices().getEStructuralFeatures().get(15);
+        return ( EAttribute ) getClientServices().getEStructuralFeatures().get( 15 );
     }
 
     /**
@@ -4875,7 +4939,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getClientServices_McSecurity() {
-        return (EReference)getClientServices().getEStructuralFeatures().get(16);
+        return ( EReference ) getClientServices().getEStructuralFeatures().get( 16 );
     }
 
     /**
@@ -4885,8 +4949,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getCommProt() {
-        if (commProtEClass == null) {
-            commProtEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(44);
+        if( commProtEClass == null ) {
+            commProtEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 44 );
         }
         return commProtEClass;
     }
@@ -4898,7 +4963,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getCommProt_Ipv6() {
-        return (EAttribute)getCommProt().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getCommProt().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4908,7 +4973,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getCommProt_ParentServices() {
-        return (EReference)getCommProt().getEStructuralFeatures().get(1);
+        return ( EReference ) getCommProt().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -4918,8 +4983,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getConfDataSet() {
-        if (confDataSetEClass == null) {
-            confDataSetEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(45);
+        if( confDataSetEClass == null ) {
+            confDataSetEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 45 );
         }
         return confDataSetEClass;
     }
@@ -4931,7 +4997,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConfDataSet_ParentServices() {
-        return (EReference)getConfDataSet().getEStructuralFeatures().get(0);
+        return ( EReference ) getConfDataSet().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4941,8 +5007,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getConfLNs() {
-        if (confLNsEClass == null) {
-            confLNsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(46);
+        if( confLNsEClass == null ) {
+            confLNsEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 46 );
         }
         return confLNsEClass;
     }
@@ -4954,7 +5021,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getConfLNs_FixLnInst() {
-        return (EAttribute)getConfLNs().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getConfLNs().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -4964,7 +5031,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getConfLNs_FixPrefix() {
-        return (EAttribute)getConfLNs().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getConfLNs().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -4974,7 +5041,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConfLNs_ParentServices() {
-        return (EReference)getConfLNs().getEStructuralFeatures().get(2);
+        return ( EReference ) getConfLNs().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -4984,8 +5051,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getConfLdName() {
-        if (confLdNameEClass == null) {
-            confLdNameEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(47);
+        if( confLdNameEClass == null ) {
+            confLdNameEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 47 );
         }
         return confLdNameEClass;
     }
@@ -4997,7 +5065,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConfLdName_ParentServices() {
-        return (EReference)getConfLdName().getEStructuralFeatures().get(0);
+        return ( EReference ) getConfLdName().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5007,8 +5075,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getConfLogControl() {
-        if (confLogControlEClass == null) {
-            confLogControlEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(48);
+        if( confLogControlEClass == null ) {
+            confLogControlEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 48 );
         }
         return confLogControlEClass;
     }
@@ -5020,7 +5089,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConfLogControl_ParentServices() {
-        return (EReference)getConfLogControl().getEStructuralFeatures().get(0);
+        return ( EReference ) getConfLogControl().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5030,8 +5099,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getConfReportControl() {
-        if (confReportControlEClass == null) {
-            confReportControlEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(49);
+        if( confReportControlEClass == null ) {
+            confReportControlEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 49 );
         }
         return confReportControlEClass;
     }
@@ -5043,7 +5113,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConfReportControl_ParentServices() {
-        return (EReference)getConfReportControl().getEStructuralFeatures().get(0);
+        return ( EReference ) getConfReportControl().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5053,8 +5123,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getConfSG() {
-        if (confSGEClass == null) {
-            confSGEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(50);
+        if( confSGEClass == null ) {
+            confSGEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 50 );
         }
         return confSGEClass;
     }
@@ -5066,7 +5137,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getConfSG_ResvTms() {
-        return (EAttribute)getConfSG().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getConfSG().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5076,7 +5147,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConfSG_ParentSettingGroups() {
-        return (EReference)getConfSG().getEStructuralFeatures().get(1);
+        return ( EReference ) getConfSG().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -5086,8 +5157,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getConfSigRef() {
-        if (confSigRefEClass == null) {
-            confSigRefEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(51);
+        if( confSigRefEClass == null ) {
+            confSigRefEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 51 );
         }
         return confSigRefEClass;
     }
@@ -5099,7 +5171,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConfSigRef_ParentServices() {
-        return (EReference)getConfSigRef().getEStructuralFeatures().get(0);
+        return ( EReference ) getConfSigRef().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5109,8 +5181,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getControl() {
-        if (controlEClass == null) {
-            controlEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(52);
+        if( controlEClass == null ) {
+            controlEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 52 );
         }
         return controlEClass;
     }
@@ -5122,7 +5195,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getControl_DatSet() {
-        return (EAttribute)getControl().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getControl().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5132,7 +5205,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getControl_RefersToDataSet() {
-        return (EReference)getControl().getEStructuralFeatures().get(1);
+        return ( EReference ) getControl().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -5142,7 +5215,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getControl_Name() {
-        return (EAttribute)getControl().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getControl().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -5152,7 +5225,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getControl_ReferredByExtRef() {
-        return (EReference)getControl().getEStructuralFeatures().get(3);
+        return ( EReference ) getControl().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -5162,7 +5235,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EOperation getControl__GetParentAnyLN() {
-        return getControl().getEOperations().get(0);
+        return getControl().getEOperations().get( 0 );
     }
 
     /**
@@ -5172,8 +5245,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getControlWithIEDName() {
-        if (controlWithIEDNameEClass == null) {
-            controlWithIEDNameEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(53);
+        if( controlWithIEDNameEClass == null ) {
+            controlWithIEDNameEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 53 );
         }
         return controlWithIEDNameEClass;
     }
@@ -5185,7 +5259,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getControlWithIEDName_ConfRev() {
-        return (EAttribute)getControlWithIEDName().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getControlWithIEDName().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5195,7 +5269,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getControlWithIEDName_IEDName() {
-        return (EReference)getControlWithIEDName().getEStructuralFeatures().get(1);
+        return ( EReference ) getControlWithIEDName().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -5205,7 +5279,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getControlWithIEDName_ReferredByControlBlock() {
-        return (EReference)getControlWithIEDName().getEStructuralFeatures().get(2);
+        return ( EReference ) getControlWithIEDName().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -5215,7 +5289,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getControlWithIEDName_Protocol() {
-        return (EReference)getControlWithIEDName().getEStructuralFeatures().get(3);
+        return ( EReference ) getControlWithIEDName().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -5225,8 +5299,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getControlWithTriggerOpt() {
-        if (controlWithTriggerOptEClass == null) {
-            controlWithTriggerOptEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(54);
+        if( controlWithTriggerOptEClass == null ) {
+            controlWithTriggerOptEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 54 );
         }
         return controlWithTriggerOptEClass;
     }
@@ -5238,7 +5313,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getControlWithTriggerOpt_IntgPd() {
-        return (EAttribute)getControlWithTriggerOpt().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getControlWithTriggerOpt().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5248,7 +5323,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getControlWithTriggerOpt_TrgOps() {
-        return (EReference)getControlWithTriggerOpt().getEStructuralFeatures().get(1);
+        return ( EReference ) getControlWithTriggerOpt().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -5258,8 +5333,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getDAI() {
-        if (daiEClass == null) {
-            daiEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(55);
+        if( daiEClass == null ) {
+            daiEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 55 );
         }
         return daiEClass;
     }
@@ -5271,7 +5347,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDAI_Ix() {
-        return (EAttribute)getDAI().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getDAI().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5281,7 +5357,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDAI_SAddr() {
-        return (EAttribute)getDAI().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getDAI().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -5291,7 +5367,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDAI_ValImport() {
-        return (EAttribute)getDAI().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getDAI().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -5301,7 +5377,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDAI_ValKind() {
-        return (EAttribute)getDAI().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getDAI().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -5311,7 +5387,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDAI_Val() {
-        return (EReference)getDAI().getEStructuralFeatures().get(4);
+        return ( EReference ) getDAI().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -5321,7 +5397,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDAI_ParentDOI() {
-        return (EReference)getDAI().getEStructuralFeatures().get(5);
+        return ( EReference ) getDAI().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -5331,7 +5407,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDAI_ParentSDI() {
-        return (EReference)getDAI().getEStructuralFeatures().get(6);
+        return ( EReference ) getDAI().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -5341,7 +5417,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDAI_Name() {
-        return (EAttribute)getDAI().getEStructuralFeatures().get(7);
+        return ( EAttribute ) getDAI().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -5351,7 +5427,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDAI_RefersToAbstractDataAttribute() {
-        return (EReference)getDAI().getEStructuralFeatures().get(8);
+        return ( EReference ) getDAI().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -5361,8 +5437,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getDOI() {
-        if (doiEClass == null) {
-            doiEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(56);
+        if( doiEClass == null ) {
+            doiEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 56 );
         }
         return doiEClass;
     }
@@ -5374,7 +5451,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDOI_Ix() {
-        return (EAttribute)getDOI().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getDOI().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5384,7 +5461,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDOI_ParentAnyLN() {
-        return (EReference)getDOI().getEStructuralFeatures().get(1);
+        return ( EReference ) getDOI().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -5394,7 +5471,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDOI_DAI() {
-        return (EReference)getDOI().getEStructuralFeatures().get(2);
+        return ( EReference ) getDOI().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -5404,7 +5481,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDOI_SDI() {
-        return (EReference)getDOI().getEStructuralFeatures().get(3);
+        return ( EReference ) getDOI().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -5414,7 +5491,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDOI_AccessControl() {
-        return (EAttribute)getDOI().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getDOI().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -5424,7 +5501,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDOI_Name() {
-        return (EAttribute)getDOI().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getDOI().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -5434,7 +5511,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDOI_RefersToDO() {
-        return (EReference)getDOI().getEStructuralFeatures().get(6);
+        return ( EReference ) getDOI().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -5444,7 +5521,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EOperation getDOI__GetNamespace() {
-        return getDOI().getEOperations().get(0);
+        return getDOI().getEOperations().get( 0 );
     }
 
     /**
@@ -5454,8 +5531,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getDataObjectDirectory() {
-        if (dataObjectDirectoryEClass == null) {
-            dataObjectDirectoryEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(57);
+        if( dataObjectDirectoryEClass == null ) {
+            dataObjectDirectoryEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 57 );
         }
         return dataObjectDirectoryEClass;
     }
@@ -5467,7 +5545,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDataObjectDirectory_ParentServices() {
-        return (EReference)getDataObjectDirectory().getEStructuralFeatures().get(0);
+        return ( EReference ) getDataObjectDirectory().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5477,8 +5555,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getDataSet() {
-        if (dataSetEClass == null) {
-            dataSetEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(58);
+        if( dataSetEClass == null ) {
+            dataSetEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 58 );
         }
         return dataSetEClass;
     }
@@ -5490,7 +5569,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDataSet_ParentAnyLN() {
-        return (EReference)getDataSet().getEStructuralFeatures().get(0);
+        return ( EReference ) getDataSet().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5500,7 +5579,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDataSet_ReferredByControl() {
-        return (EReference)getDataSet().getEStructuralFeatures().get(1);
+        return ( EReference ) getDataSet().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -5510,7 +5589,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDataSet_FCDA() {
-        return (EReference)getDataSet().getEStructuralFeatures().get(2);
+        return ( EReference ) getDataSet().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -5520,7 +5599,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getDataSet_Name() {
-        return (EAttribute)getDataSet().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getDataSet().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -5530,8 +5609,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getDataSetDirectory() {
-        if (dataSetDirectoryEClass == null) {
-            dataSetDirectoryEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(59);
+        if( dataSetDirectoryEClass == null ) {
+            dataSetDirectoryEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 59 );
         }
         return dataSetDirectoryEClass;
     }
@@ -5543,7 +5623,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDataSetDirectory_ParentServices() {
-        return (EReference)getDataSetDirectory().getEStructuralFeatures().get(0);
+        return ( EReference ) getDataSetDirectory().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5553,8 +5633,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getDynAssociation() {
-        if (dynAssociationEClass == null) {
-            dynAssociationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(60);
+        if( dynAssociationEClass == null ) {
+            dynAssociationEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 60 );
         }
         return dynAssociationEClass;
     }
@@ -5566,7 +5647,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDynAssociation_ParentServices() {
-        return (EReference)getDynAssociation().getEStructuralFeatures().get(0);
+        return ( EReference ) getDynAssociation().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5576,8 +5657,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getDynDataSet() {
-        if (dynDataSetEClass == null) {
-            dynDataSetEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(61);
+        if( dynDataSetEClass == null ) {
+            dynDataSetEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 61 );
         }
         return dynDataSetEClass;
     }
@@ -5589,7 +5671,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getDynDataSet_ParentServices() {
-        return (EReference)getDynDataSet().getEStructuralFeatures().get(0);
+        return ( EReference ) getDynDataSet().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5599,8 +5681,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getExtRef() {
-        if (extRefEClass == null) {
-            extRefEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(62);
+        if( extRefEClass == null ) {
+            extRefEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 62 );
         }
         return extRefEClass;
     }
@@ -5612,7 +5695,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_DaName() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5622,7 +5705,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_DoName() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -5632,7 +5715,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_IedName() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -5642,7 +5725,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_IntAddr() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -5652,7 +5735,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_LdInst() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -5662,7 +5745,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_LnClass() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -5672,7 +5755,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_LnInst() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(6);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -5682,7 +5765,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_Prefix() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(7);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -5692,7 +5775,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_ServiceType() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(8);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -5702,7 +5785,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_SrcCBName() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(9);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -5712,7 +5795,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_SrcLDInst() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(10);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -5722,7 +5805,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_SrcLNClass() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(11);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 11 );
     }
 
     /**
@@ -5732,7 +5815,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_SrcLNInst() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(12);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 12 );
     }
 
     /**
@@ -5742,7 +5825,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_SrcPrefix() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(13);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 13 );
     }
 
     /**
@@ -5752,7 +5835,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getExtRef_ParentInputs() {
-        return (EReference)getExtRef().getEStructuralFeatures().get(14);
+        return ( EReference ) getExtRef().getEStructuralFeatures().get( 14 );
     }
 
     /**
@@ -5762,7 +5845,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getExtRef_RefersToAbstractDataAttribute() {
-        return (EReference)getExtRef().getEStructuralFeatures().get(15);
+        return ( EReference ) getExtRef().getEStructuralFeatures().get( 15 );
     }
 
     /**
@@ -5772,7 +5855,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getExtRef_RefersToAbstractDataObject() {
-        return (EReference)getExtRef().getEStructuralFeatures().get(16);
+        return ( EReference ) getExtRef().getEStructuralFeatures().get( 16 );
     }
 
     /**
@@ -5782,7 +5865,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_PServT() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(17);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 17 );
     }
 
     /**
@@ -5792,7 +5875,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_PLN() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(18);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 18 );
     }
 
     /**
@@ -5802,7 +5885,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_PDO() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(19);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 19 );
     }
 
     /**
@@ -5812,7 +5895,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getExtRef_PDA() {
-        return (EAttribute)getExtRef().getEStructuralFeatures().get(20);
+        return ( EAttribute ) getExtRef().getEStructuralFeatures().get( 20 );
     }
 
     /**
@@ -5822,7 +5905,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getExtRef_RefersToControl() {
-        return (EReference)getExtRef().getEStructuralFeatures().get(21);
+        return ( EReference ) getExtRef().getEStructuralFeatures().get( 21 );
     }
 
     /**
@@ -5832,8 +5915,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getFCDA() {
-        if (fcdaEClass == null) {
-            fcdaEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(63);
+        if( fcdaEClass == null ) {
+            fcdaEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 63 );
         }
         return fcdaEClass;
     }
@@ -5845,7 +5929,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getFCDA_DaName() {
-        return (EAttribute)getFCDA().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getFCDA().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5855,7 +5939,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getFCDA_DoName() {
-        return (EAttribute)getFCDA().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getFCDA().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -5865,7 +5949,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getFCDA_Fc() {
-        return (EAttribute)getFCDA().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getFCDA().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -5875,7 +5959,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getFCDA_Ix() {
-        return (EAttribute)getFCDA().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getFCDA().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -5885,7 +5969,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getFCDA_LdInst() {
-        return (EAttribute)getFCDA().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getFCDA().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -5895,7 +5979,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getFCDA_LnClass() {
-        return (EAttribute)getFCDA().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getFCDA().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -5905,7 +5989,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getFCDA_LnInst() {
-        return (EAttribute)getFCDA().getEStructuralFeatures().get(6);
+        return ( EAttribute ) getFCDA().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -5915,7 +5999,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getFCDA_Prefix() {
-        return (EAttribute)getFCDA().getEStructuralFeatures().get(7);
+        return ( EAttribute ) getFCDA().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -5925,7 +6009,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getFCDA_ParentDataSet() {
-        return (EReference)getFCDA().getEStructuralFeatures().get(8);
+        return ( EReference ) getFCDA().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -5935,7 +6019,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getFCDA_RefersToAbstractDataAttribute() {
-        return (EReference)getFCDA().getEStructuralFeatures().get(9);
+        return ( EReference ) getFCDA().getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -5945,8 +6029,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getFileHandling() {
-        if (fileHandlingEClass == null) {
-            fileHandlingEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(64);
+        if( fileHandlingEClass == null ) {
+            fileHandlingEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 64 );
         }
         return fileHandlingEClass;
     }
@@ -5958,7 +6043,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getFileHandling_Ftp() {
-        return (EAttribute)getFileHandling().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getFileHandling().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -5968,7 +6053,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getFileHandling_Ftps() {
-        return (EAttribute)getFileHandling().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getFileHandling().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -5978,7 +6063,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getFileHandling_Mms() {
-        return (EAttribute)getFileHandling().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getFileHandling().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -5988,7 +6073,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getFileHandling_ParentServices() {
-        return (EReference)getFileHandling().getEStructuralFeatures().get(3);
+        return ( EReference ) getFileHandling().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -5998,8 +6083,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getGOOSE() {
-        if (gooseEClass == null) {
-            gooseEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(65);
+        if( gooseEClass == null ) {
+            gooseEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 65 );
         }
         return gooseEClass;
     }
@@ -6011,7 +6097,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getGOOSE_FixedOffs() {
-        return (EAttribute)getGOOSE().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getGOOSE().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6021,7 +6107,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGOOSE_ParentServices() {
-        return (EReference)getGOOSE().getEStructuralFeatures().get(1);
+        return ( EReference ) getGOOSE().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -6031,7 +6117,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getGOOSE_Goose() {
-        return (EAttribute)getGOOSE().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getGOOSE().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -6041,7 +6127,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getGOOSE_RGOOSE() {
-        return (EAttribute)getGOOSE().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getGOOSE().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -6051,8 +6137,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getGOOSESecurity() {
-        if (gooseSecurityEClass == null) {
-            gooseSecurityEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(66);
+        if( gooseSecurityEClass == null ) {
+            gooseSecurityEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 66 );
         }
         return gooseSecurityEClass;
     }
@@ -6064,7 +6151,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGOOSESecurity_ParentAccessPoint() {
-        return (EReference)getGOOSESecurity().getEStructuralFeatures().get(0);
+        return ( EReference ) getGOOSESecurity().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6074,8 +6161,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getGSEControl() {
-        if (gseControlEClass == null) {
-            gseControlEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(67);
+        if( gseControlEClass == null ) {
+            gseControlEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 67 );
         }
         return gseControlEClass;
     }
@@ -6087,7 +6175,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getGSEControl_AppID() {
-        return (EAttribute)getGSEControl().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getGSEControl().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6097,7 +6185,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getGSEControl_FixedOffs() {
-        return (EAttribute)getGSEControl().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getGSEControl().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -6107,7 +6195,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getGSEControl_SecurityEnable() {
-        return (EAttribute)getGSEControl().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getGSEControl().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -6117,7 +6205,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getGSEControl_Type() {
-        return (EAttribute)getGSEControl().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getGSEControl().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -6127,7 +6215,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGSEControl_ParentLN0() {
-        return (EReference)getGSEControl().getEStructuralFeatures().get(4);
+        return ( EReference ) getGSEControl().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -6137,8 +6225,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getGSEDir() {
-        if (gseDirEClass == null) {
-            gseDirEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(68);
+        if( gseDirEClass == null ) {
+            gseDirEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 68 );
         }
         return gseDirEClass;
     }
@@ -6150,7 +6239,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGSEDir_ParentServices() {
-        return (EReference)getGSEDir().getEStructuralFeatures().get(0);
+        return ( EReference ) getGSEDir().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6160,8 +6249,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getGSESettings() {
-        if (gseSettingsEClass == null) {
-            gseSettingsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(69);
+        if( gseSettingsEClass == null ) {
+            gseSettingsEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 69 );
         }
         return gseSettingsEClass;
     }
@@ -6173,7 +6263,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getGSESettings_AppID() {
-        return (EAttribute)getGSESettings().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getGSESettings().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6183,7 +6273,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getGSESettings_DataLabel() {
-        return (EAttribute)getGSESettings().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getGSESettings().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -6193,7 +6283,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGSESettings_ParentServices() {
-        return (EReference)getGSESettings().getEStructuralFeatures().get(2);
+        return ( EReference ) getGSESettings().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -6203,7 +6293,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGSESettings_McSecurity() {
-        return (EReference)getGSESettings().getEStructuralFeatures().get(3);
+        return ( EReference ) getGSESettings().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -6213,7 +6303,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getGSESettings_KdaParticipant() {
-        return (EAttribute)getGSESettings().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getGSESettings().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -6223,8 +6313,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getGSSE() {
-        if (gsseEClass == null) {
-            gsseEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(70);
+        if( gsseEClass == null ) {
+            gsseEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 70 );
         }
         return gsseEClass;
     }
@@ -6236,7 +6327,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGSSE_ParentServices() {
-        return (EReference)getGSSE().getEStructuralFeatures().get(0);
+        return ( EReference ) getGSSE().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6246,8 +6337,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getGetCBValues() {
-        if (getCBValuesEClass == null) {
-            getCBValuesEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(71);
+        if( getCBValuesEClass == null ) {
+            getCBValuesEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 71 );
         }
         return getCBValuesEClass;
     }
@@ -6259,7 +6351,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGetCBValues_ParentServices() {
-        return (EReference)getGetCBValues().getEStructuralFeatures().get(0);
+        return ( EReference ) getGetCBValues().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6269,8 +6361,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getGetDataObjectDefinition() {
-        if (getDataObjectDefinitionEClass == null) {
-            getDataObjectDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(72);
+        if( getDataObjectDefinitionEClass == null ) {
+            getDataObjectDefinitionEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 72 );
         }
         return getDataObjectDefinitionEClass;
     }
@@ -6282,7 +6375,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGetDataObjectDefinition_ParentServices() {
-        return (EReference)getGetDataObjectDefinition().getEStructuralFeatures().get(0);
+        return ( EReference ) getGetDataObjectDefinition().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6292,8 +6385,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getGetDataSetValue() {
-        if (getDataSetValueEClass == null) {
-            getDataSetValueEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(73);
+        if( getDataSetValueEClass == null ) {
+            getDataSetValueEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 73 );
         }
         return getDataSetValueEClass;
     }
@@ -6305,7 +6399,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGetDataSetValue_ParentServices() {
-        return (EReference)getGetDataSetValue().getEStructuralFeatures().get(0);
+        return ( EReference ) getGetDataSetValue().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6315,8 +6409,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getGetDirectory() {
-        if (getDirectoryEClass == null) {
-            getDirectoryEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(74);
+        if( getDirectoryEClass == null ) {
+            getDirectoryEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 74 );
         }
         return getDirectoryEClass;
     }
@@ -6328,7 +6423,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGetDirectory_ParentServices() {
-        return (EReference)getGetDirectory().getEStructuralFeatures().get(0);
+        return ( EReference ) getGetDirectory().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6338,8 +6433,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getIED() {
-        if (iedEClass == null) {
-            iedEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(75);
+        if( iedEClass == null ) {
+            iedEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 75 );
         }
         return iedEClass;
     }
@@ -6351,7 +6447,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIED_ConfigVersion() {
-        return (EAttribute)getIED().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getIED().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6361,7 +6457,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIED_EngRight() {
-        return (EAttribute)getIED().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getIED().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -6371,7 +6467,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIED_Manufacturer() {
-        return (EAttribute)getIED().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getIED().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -6381,7 +6477,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIED_OriginalSclRevision() {
-        return (EAttribute)getIED().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getIED().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -6391,7 +6487,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIED_OriginalSclVersion() {
-        return (EAttribute)getIED().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getIED().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -6401,7 +6497,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIED_Owner() {
-        return (EAttribute)getIED().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getIED().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -6411,7 +6507,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIED_Type() {
-        return (EAttribute)getIED().getEStructuralFeatures().get(6);
+        return ( EAttribute ) getIED().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -6421,7 +6517,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getIED_AccessPoint() {
-        return (EReference)getIED().getEStructuralFeatures().get(7);
+        return ( EReference ) getIED().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -6431,7 +6527,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getIED_KDC() {
-        return (EReference)getIED().getEStructuralFeatures().get(8);
+        return ( EReference ) getIED().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -6441,7 +6537,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getIED_Services() {
-        return (EReference)getIED().getEStructuralFeatures().get(9);
+        return ( EReference ) getIED().getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -6451,7 +6547,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getIED_ParentSCL() {
-        return (EReference)getIED().getEStructuralFeatures().get(10);
+        return ( EReference ) getIED().getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -6461,7 +6557,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIED_Name() {
-        return (EAttribute)getIED().getEStructuralFeatures().get(11);
+        return ( EAttribute ) getIED().getEStructuralFeatures().get( 11 );
     }
 
     /**
@@ -6471,7 +6567,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIED_OriginalSclRelease() {
-        return (EAttribute)getIED().getEStructuralFeatures().get(12);
+        return ( EAttribute ) getIED().getEStructuralFeatures().get( 12 );
     }
 
     /**
@@ -6481,7 +6577,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getIED_ReferredByIEDName() {
-        return (EReference)getIED().getEStructuralFeatures().get(13);
+        return ( EReference ) getIED().getEStructuralFeatures().get( 13 );
     }
 
     /**
@@ -6491,8 +6587,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getIEDName() {
-        if (iedNameEClass == null) {
-            iedNameEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(76);
+        if( iedNameEClass == null ) {
+            iedNameEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 76 );
         }
         return iedNameEClass;
     }
@@ -6504,7 +6601,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIEDName_ApRef() {
-        return (EAttribute)getIEDName().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getIEDName().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6514,7 +6611,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIEDName_LdInst() {
-        return (EAttribute)getIEDName().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getIEDName().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -6524,7 +6621,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIEDName_LnClass() {
-        return (EAttribute)getIEDName().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getIEDName().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -6534,7 +6631,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIEDName_LnInst() {
-        return (EAttribute)getIEDName().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getIEDName().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -6544,7 +6641,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIEDName_Prefix() {
-        return (EAttribute)getIEDName().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getIEDName().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -6554,7 +6651,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getIEDName_ParentControlWithIEDName() {
-        return (EReference)getIEDName().getEStructuralFeatures().get(5);
+        return ( EReference ) getIEDName().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -6564,7 +6661,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getIEDName_RefersToAnyLN() {
-        return (EReference)getIEDName().getEStructuralFeatures().get(6);
+        return ( EReference ) getIEDName().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -6574,7 +6671,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getIEDName_Value() {
-        return (EAttribute)getIEDName().getEStructuralFeatures().get(7);
+        return ( EAttribute ) getIEDName().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -6584,7 +6681,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getIEDName_RefersToIED() {
-        return (EReference)getIEDName().getEStructuralFeatures().get(8);
+        return ( EReference ) getIEDName().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -6594,7 +6691,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getIEDName_RefersToLDevice() {
-        return (EReference)getIEDName().getEStructuralFeatures().get(9);
+        return ( EReference ) getIEDName().getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -6604,8 +6701,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getInputs() {
-        if (inputsEClass == null) {
-            inputsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(77);
+        if( inputsEClass == null ) {
+            inputsEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 77 );
         }
         return inputsEClass;
     }
@@ -6617,7 +6715,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getInputs_ParentAnyLN() {
-        return (EReference)getInputs().getEStructuralFeatures().get(0);
+        return ( EReference ) getInputs().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6627,7 +6725,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getInputs_ExtRef() {
-        return (EReference)getInputs().getEStructuralFeatures().get(1);
+        return ( EReference ) getInputs().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -6637,8 +6735,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getIssuerName() {
-        if (issuerNameEClass == null) {
-            issuerNameEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(78);
+        if( issuerNameEClass == null ) {
+            issuerNameEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 78 );
         }
         return issuerNameEClass;
     }
@@ -6650,7 +6749,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getIssuerName_ParentCertificate() {
-        return (EReference)getIssuerName().getEStructuralFeatures().get(0);
+        return ( EReference ) getIssuerName().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6660,8 +6759,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getKDC() {
-        if (kdcEClass == null) {
-            kdcEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(79);
+        if( kdcEClass == null ) {
+            kdcEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 79 );
         }
         return kdcEClass;
     }
@@ -6673,7 +6773,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getKDC_ApName() {
-        return (EAttribute)getKDC().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getKDC().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6683,7 +6783,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getKDC_IedName() {
-        return (EAttribute)getKDC().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getKDC().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -6693,7 +6793,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getKDC_ParentIED() {
-        return (EReference)getKDC().getEStructuralFeatures().get(2);
+        return ( EReference ) getKDC().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -6703,7 +6803,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getKDC_RefersToAccessPoint() {
-        return (EReference)getKDC().getEStructuralFeatures().get(3);
+        return ( EReference ) getKDC().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -6713,8 +6813,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getLDevice() {
-        if (lDeviceEClass == null) {
-            lDeviceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(80);
+        if( lDeviceEClass == null ) {
+            lDeviceEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 80 );
         }
         return lDeviceEClass;
     }
@@ -6726,7 +6827,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLDevice_Inst() {
-        return (EAttribute)getLDevice().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getLDevice().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6736,7 +6837,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLDevice_LdName() {
-        return (EAttribute)getLDevice().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getLDevice().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -6746,7 +6847,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLDevice_AccessControl() {
-        return (EReference)getLDevice().getEStructuralFeatures().get(2);
+        return ( EReference ) getLDevice().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -6756,7 +6857,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLDevice_ParentServer() {
-        return (EReference)getLDevice().getEStructuralFeatures().get(3);
+        return ( EReference ) getLDevice().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -6766,7 +6867,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLDevice_AnyLN() {
-        return (EAttribute)getLDevice().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getLDevice().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -6776,7 +6877,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLDevice_LN() {
-        return (EReference)getLDevice().getEStructuralFeatures().get(6);
+        return ( EReference ) getLDevice().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -6786,7 +6887,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLDevice_ReferredByIEDName() {
-        return (EReference)getLDevice().getEStructuralFeatures().get(7);
+        return ( EReference ) getLDevice().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -6796,7 +6897,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EOperation getLDevice__GetNamespace() {
-        return getLDevice().getEOperations().get(0);
+        return getLDevice().getEOperations().get( 0 );
     }
 
     /**
@@ -6806,7 +6907,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLDevice_LN0() {
-        return (EReference)getLDevice().getEStructuralFeatures().get(5);
+        return ( EReference ) getLDevice().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -6816,8 +6917,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getLN() {
-        if (lnEClass == null) {
-            lnEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(81);
+        if( lnEClass == null ) {
+            lnEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 81 );
         }
         return lnEClass;
     }
@@ -6829,7 +6931,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLN_Prefix() {
-        return (EAttribute)getLN().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getLN().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6839,7 +6941,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLN_ParentAccessPoint() {
-        return (EReference)getLN().getEStructuralFeatures().get(1);
+        return ( EReference ) getLN().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -6849,7 +6951,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLN_ParentLDevice() {
-        return (EReference)getLN().getEStructuralFeatures().get(2);
+        return ( EReference ) getLN().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -6859,8 +6961,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getLN0() {
-        if (ln0EClass == null) {
-            ln0EClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(82);
+        if( ln0EClass == null ) {
+            ln0EClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 82 );
         }
         return ln0EClass;
     }
@@ -6872,7 +6975,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLN0_GSEControl() {
-        return (EReference)getLN0().getEStructuralFeatures().get(0);
+        return ( EReference ) getLN0().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6882,7 +6985,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLN0_ParentLDevice() {
-        return (EReference)getLN0().getEStructuralFeatures().get(1);
+        return ( EReference ) getLN0().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -6892,7 +6995,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLN0_SampledValueControl() {
-        return (EReference)getLN0().getEStructuralFeatures().get(2);
+        return ( EReference ) getLN0().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -6902,7 +7005,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLN0_SettingControl() {
-        return (EReference)getLN0().getEStructuralFeatures().get(3);
+        return ( EReference ) getLN0().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -6912,7 +7015,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLN0_ControlWithIEDName() {
-        return (EAttribute)getLN0().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getLN0().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -6922,8 +7025,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getLog() {
-        if (logEClass == null) {
-            logEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(83);
+        if( logEClass == null ) {
+            logEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 83 );
         }
         return logEClass;
     }
@@ -6935,7 +7039,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLog_ParentAnyLN() {
-        return (EReference)getLog().getEStructuralFeatures().get(0);
+        return ( EReference ) getLog().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6945,7 +7049,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLog_Name() {
-        return (EAttribute)getLog().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getLog().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -6955,7 +7059,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLog_ReferredByLogControl() {
-        return (EReference)getLog().getEStructuralFeatures().get(2);
+        return ( EReference ) getLog().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -6965,8 +7069,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getLogControl() {
-        if (logControlEClass == null) {
-            logControlEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(84);
+        if( logControlEClass == null ) {
+            logControlEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 84 );
         }
         return logControlEClass;
     }
@@ -6978,7 +7083,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLogControl_BufTime() {
-        return (EAttribute)getLogControl().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getLogControl().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -6988,7 +7093,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLogControl_LdInst() {
-        return (EAttribute)getLogControl().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getLogControl().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -6998,7 +7103,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLogControl_LnClass() {
-        return (EAttribute)getLogControl().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getLogControl().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -7008,7 +7113,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLogControl_LnInst() {
-        return (EAttribute)getLogControl().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getLogControl().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -7018,7 +7123,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLogControl_LogEna() {
-        return (EAttribute)getLogControl().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getLogControl().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -7028,7 +7133,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLogControl_LogName() {
-        return (EAttribute)getLogControl().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getLogControl().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -7038,7 +7143,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLogControl_Prefix() {
-        return (EAttribute)getLogControl().getEStructuralFeatures().get(6);
+        return ( EAttribute ) getLogControl().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -7048,7 +7153,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLogControl_ReasonCode() {
-        return (EAttribute)getLogControl().getEStructuralFeatures().get(7);
+        return ( EAttribute ) getLogControl().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -7058,7 +7163,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLogControl_ParentAnyLN() {
-        return (EReference)getLogControl().getEStructuralFeatures().get(8);
+        return ( EReference ) getLogControl().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -7068,7 +7173,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLogControl_RefersToAnyLN() {
-        return (EReference)getLogControl().getEStructuralFeatures().get(9);
+        return ( EReference ) getLogControl().getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -7078,7 +7183,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLogControl_RefersToLog() {
-        return (EReference)getLogControl().getEStructuralFeatures().get(10);
+        return ( EReference ) getLogControl().getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -7088,8 +7193,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getLogSettings() {
-        if (logSettingsEClass == null) {
-            logSettingsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(85);
+        if( logSettingsEClass == null ) {
+            logSettingsEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 85 );
         }
         return logSettingsEClass;
     }
@@ -7101,7 +7207,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLogSettings_IntgPd() {
-        return (EAttribute)getLogSettings().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getLogSettings().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7111,7 +7217,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLogSettings_LogEna() {
-        return (EAttribute)getLogSettings().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getLogSettings().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -7121,7 +7227,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLogSettings_TrgOps() {
-        return (EAttribute)getLogSettings().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getLogSettings().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -7131,7 +7237,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLogSettings_ParentServices() {
-        return (EReference)getLogSettings().getEStructuralFeatures().get(3);
+        return ( EReference ) getLogSettings().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -7141,8 +7247,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getOptFields() {
-        if (optFieldsEClass == null) {
-            optFieldsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(86);
+        if( optFieldsEClass == null ) {
+            optFieldsEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 86 );
         }
         return optFieldsEClass;
     }
@@ -7154,7 +7261,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getOptFields_ParentReportControl() {
-        return (EReference)getOptFields().getEStructuralFeatures().get(0);
+        return ( EReference ) getOptFields().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7164,8 +7271,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getProtocol() {
-        if (protocolEClass == null) {
-            protocolEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(87);
+        if( protocolEClass == null ) {
+            protocolEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 87 );
         }
         return protocolEClass;
     }
@@ -7177,7 +7285,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getProtocol_MustUnderstand() {
-        return (EAttribute)getProtocol().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getProtocol().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7187,7 +7295,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getProtocol_ParentControlWithIEDName() {
-        return (EReference)getProtocol().getEStructuralFeatures().get(1);
+        return ( EReference ) getProtocol().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -7197,8 +7305,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getReadWrite() {
-        if (readWriteEClass == null) {
-            readWriteEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(88);
+        if( readWriteEClass == null ) {
+            readWriteEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 88 );
         }
         return readWriteEClass;
     }
@@ -7210,7 +7319,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getReadWrite_ParentServices() {
-        return (EReference)getReadWrite().getEStructuralFeatures().get(0);
+        return ( EReference ) getReadWrite().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7220,8 +7329,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getRedProt() {
-        if (redProtEClass == null) {
-            redProtEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(89);
+        if( redProtEClass == null ) {
+            redProtEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 89 );
         }
         return redProtEClass;
     }
@@ -7233,7 +7343,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getRedProt_Hsr() {
-        return (EAttribute)getRedProt().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getRedProt().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7243,7 +7353,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getRedProt_Prp() {
-        return (EAttribute)getRedProt().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getRedProt().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -7253,7 +7363,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getRedProt_Rstp() {
-        return (EAttribute)getRedProt().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getRedProt().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -7263,7 +7373,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getRedProt_ParentServices() {
-        return (EReference)getRedProt().getEStructuralFeatures().get(3);
+        return ( EReference ) getRedProt().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -7273,8 +7383,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getReportControl() {
-        if (reportControlEClass == null) {
-            reportControlEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(90);
+        if( reportControlEClass == null ) {
+            reportControlEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 90 );
         }
         return reportControlEClass;
     }
@@ -7286,7 +7397,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getReportControl_Buffered() {
-        return (EAttribute)getReportControl().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getReportControl().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7296,7 +7407,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getReportControl_BufTime() {
-        return (EAttribute)getReportControl().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getReportControl().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -7306,7 +7417,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getReportControl_ConfRev() {
-        return (EAttribute)getReportControl().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getReportControl().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -7316,7 +7427,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getReportControl_Indexed() {
-        return (EAttribute)getReportControl().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getReportControl().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -7326,7 +7437,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getReportControl_RptID() {
-        return (EAttribute)getReportControl().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getReportControl().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -7336,7 +7447,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getReportControl_ParentAnyLN() {
-        return (EReference)getReportControl().getEStructuralFeatures().get(5);
+        return ( EReference ) getReportControl().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -7346,7 +7457,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getReportControl_OptFields() {
-        return (EReference)getReportControl().getEStructuralFeatures().get(6);
+        return ( EReference ) getReportControl().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -7356,7 +7467,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getReportControl_RptEnabled() {
-        return (EReference)getReportControl().getEStructuralFeatures().get(7);
+        return ( EReference ) getReportControl().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -7366,8 +7477,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getReportSettings() {
-        if (reportSettingsEClass == null) {
-            reportSettingsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(91);
+        if( reportSettingsEClass == null ) {
+            reportSettingsEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 91 );
         }
         return reportSettingsEClass;
     }
@@ -7379,7 +7491,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getReportSettings_BufTime() {
-        return (EAttribute)getReportSettings().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getReportSettings().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7389,7 +7501,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getReportSettings_IntgPd() {
-        return (EAttribute)getReportSettings().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getReportSettings().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -7399,7 +7511,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getReportSettings_OptFields() {
-        return (EAttribute)getReportSettings().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getReportSettings().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -7409,7 +7521,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getReportSettings_Owner() {
-        return (EAttribute)getReportSettings().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getReportSettings().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -7419,7 +7531,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getReportSettings_ResvTms() {
-        return (EAttribute)getReportSettings().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getReportSettings().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -7429,7 +7541,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getReportSettings_RptID() {
-        return (EAttribute)getReportSettings().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getReportSettings().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -7439,7 +7551,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getReportSettings_TrgOps() {
-        return (EAttribute)getReportSettings().getEStructuralFeatures().get(6);
+        return ( EAttribute ) getReportSettings().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -7449,7 +7561,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getReportSettings_ParentServices() {
-        return (EReference)getReportSettings().getEStructuralFeatures().get(7);
+        return ( EReference ) getReportSettings().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -7459,8 +7571,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getRptEnabled() {
-        if (rptEnabledEClass == null) {
-            rptEnabledEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(92);
+        if( rptEnabledEClass == null ) {
+            rptEnabledEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 92 );
         }
         return rptEnabledEClass;
     }
@@ -7472,7 +7585,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getRptEnabled_Max() {
-        return (EAttribute)getRptEnabled().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getRptEnabled().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7482,7 +7595,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getRptEnabled_ClientLN() {
-        return (EReference)getRptEnabled().getEStructuralFeatures().get(1);
+        return ( EReference ) getRptEnabled().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -7492,7 +7605,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getRptEnabled_ParentReportControl() {
-        return (EReference)getRptEnabled().getEStructuralFeatures().get(2);
+        return ( EReference ) getRptEnabled().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -7502,8 +7615,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSDI() {
-        if (sdiEClass == null) {
-            sdiEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(93);
+        if( sdiEClass == null ) {
+            sdiEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 93 );
         }
         return sdiEClass;
     }
@@ -7515,7 +7629,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSDI_Ix() {
-        return (EAttribute)getSDI().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSDI().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7525,7 +7639,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSDI_SAddr() {
-        return (EAttribute)getSDI().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getSDI().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -7535,7 +7649,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSDI_DAI() {
-        return (EReference)getSDI().getEStructuralFeatures().get(2);
+        return ( EReference ) getSDI().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -7545,7 +7659,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSDI_ParentDOI() {
-        return (EReference)getSDI().getEStructuralFeatures().get(3);
+        return ( EReference ) getSDI().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -7555,7 +7669,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSDI_SubSDI() {
-        return (EReference)getSDI().getEStructuralFeatures().get(4);
+        return ( EReference ) getSDI().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -7565,7 +7679,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSDI_ParentSDI() {
-        return (EReference)getSDI().getEStructuralFeatures().get(5);
+        return ( EReference ) getSDI().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -7575,7 +7689,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSDI_Name() {
-        return (EAttribute)getSDI().getEStructuralFeatures().get(6);
+        return ( EAttribute ) getSDI().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -7585,7 +7699,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSDI_RefersToSDO() {
-        return (EReference)getSDI().getEStructuralFeatures().get(7);
+        return ( EReference ) getSDI().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -7595,7 +7709,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSDI_RefersToAbstractDataAttribute() {
-        return (EReference)getSDI().getEStructuralFeatures().get(8);
+        return ( EReference ) getSDI().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -7605,8 +7719,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSGEdit() {
-        if (sgEditEClass == null) {
-            sgEditEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(94);
+        if( sgEditEClass == null ) {
+            sgEditEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 94 );
         }
         return sgEditEClass;
     }
@@ -7618,7 +7733,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSGEdit_ResvTms() {
-        return (EAttribute)getSGEdit().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSGEdit().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7628,7 +7743,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSGEdit_ParentSettingGroups() {
-        return (EReference)getSGEdit().getEStructuralFeatures().get(1);
+        return ( EReference ) getSGEdit().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -7638,8 +7753,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSMVSecurity() {
-        if (smvSecurityEClass == null) {
-            smvSecurityEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(95);
+        if( smvSecurityEClass == null ) {
+            smvSecurityEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 95 );
         }
         return smvSecurityEClass;
     }
@@ -7651,7 +7767,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSMVSecurity_ParentAccessPoint() {
-        return (EReference)getSMVSecurity().getEStructuralFeatures().get(0);
+        return ( EReference ) getSMVSecurity().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7661,8 +7777,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSMVSettings() {
-        if (smvSettingsEClass == null) {
-            smvSettingsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(96);
+        if( smvSettingsEClass == null ) {
+            smvSettingsEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 96 );
         }
         return smvSettingsEClass;
     }
@@ -7674,7 +7791,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSMVSettings_SvID() {
-        return (EAttribute)getSMVSettings().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSMVSettings().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7684,7 +7801,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSMVSettings_OptFields() {
-        return (EAttribute)getSMVSettings().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getSMVSettings().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -7694,7 +7811,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSMVSettings_SmpRateAttribute() {
-        return (EAttribute)getSMVSettings().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getSMVSettings().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -7704,7 +7821,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSMVSettings_SamplesPerSecAttribute() {
-        return (EAttribute)getSMVSettings().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getSMVSettings().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -7714,7 +7831,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSMVSettings_PdcTimeStamp() {
-        return (EAttribute)getSMVSettings().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getSMVSettings().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -7724,7 +7841,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSMVSettings_SmpRate() {
-        return (EReference)getSMVSettings().getEStructuralFeatures().get(5);
+        return ( EReference ) getSMVSettings().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -7734,7 +7851,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSMVSettings_SamplesPerSec() {
-        return (EReference)getSMVSettings().getEStructuralFeatures().get(6);
+        return ( EReference ) getSMVSettings().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -7744,7 +7861,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSMVSettings_SecPerSamples() {
-        return (EReference)getSMVSettings().getEStructuralFeatures().get(7);
+        return ( EReference ) getSMVSettings().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -7754,7 +7871,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSMVSettings_ParentServices() {
-        return (EReference)getSMVSettings().getEStructuralFeatures().get(8);
+        return ( EReference ) getSMVSettings().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -7764,7 +7881,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSMVSettings_SynchSrcId() {
-        return (EAttribute)getSMVSettings().getEStructuralFeatures().get(9);
+        return ( EAttribute ) getSMVSettings().getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -7774,7 +7891,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSMVSettings_NofASDU() {
-        return (EAttribute)getSMVSettings().getEStructuralFeatures().get(10);
+        return ( EAttribute ) getSMVSettings().getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -7784,7 +7901,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSMVSettings_KdaParticipant() {
-        return (EAttribute)getSMVSettings().getEStructuralFeatures().get(11);
+        return ( EAttribute ) getSMVSettings().getEStructuralFeatures().get( 11 );
     }
 
     /**
@@ -7794,7 +7911,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSMVSettings_McSecurity() {
-        return (EReference)getSMVSettings().getEStructuralFeatures().get(12);
+        return ( EReference ) getSMVSettings().getEStructuralFeatures().get( 12 );
     }
 
     /**
@@ -7804,8 +7921,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSMVsc() {
-        if (smVscEClass == null) {
-            smVscEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(97);
+        if( smVscEClass == null ) {
+            smVscEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 97 );
         }
         return smVscEClass;
     }
@@ -7817,7 +7935,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSMVsc_Delivery() {
-        return (EAttribute)getSMVsc().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSMVsc().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7827,7 +7945,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSMVsc_DeliveryConf() {
-        return (EAttribute)getSMVsc().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getSMVsc().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -7837,7 +7955,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSMVsc_ParentServices() {
-        return (EReference)getSMVsc().getEStructuralFeatures().get(2);
+        return ( EReference ) getSMVsc().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -7847,7 +7965,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSMVsc_Sv() {
-        return (EAttribute)getSMVsc().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getSMVsc().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -7857,7 +7975,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSMVsc_RSV() {
-        return (EAttribute)getSMVsc().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getSMVsc().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -7867,8 +7985,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSampledValueControl() {
-        if (sampledValueControlEClass == null) {
-            sampledValueControlEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(98);
+        if( sampledValueControlEClass == null ) {
+            sampledValueControlEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 98 );
         }
         return sampledValueControlEClass;
     }
@@ -7880,7 +7999,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSampledValueControl_Multicast() {
-        return (EAttribute)getSampledValueControl().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSampledValueControl().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7890,7 +8009,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSampledValueControl_NofASDU() {
-        return (EAttribute)getSampledValueControl().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getSampledValueControl().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -7900,7 +8019,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSampledValueControl_SecurityEnable() {
-        return (EAttribute)getSampledValueControl().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getSampledValueControl().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -7910,7 +8029,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSampledValueControl_SmpMod() {
-        return (EAttribute)getSampledValueControl().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getSampledValueControl().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -7920,7 +8039,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSampledValueControl_SmpRate() {
-        return (EAttribute)getSampledValueControl().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getSampledValueControl().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -7930,7 +8049,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSampledValueControl_SmvID() {
-        return (EAttribute)getSampledValueControl().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getSampledValueControl().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -7940,7 +8059,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSampledValueControl_ParentLN0() {
-        return (EReference)getSampledValueControl().getEStructuralFeatures().get(6);
+        return ( EReference ) getSampledValueControl().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -7950,7 +8069,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSampledValueControl_SmvOpts() {
-        return (EReference)getSampledValueControl().getEStructuralFeatures().get(7);
+        return ( EReference ) getSampledValueControl().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -7960,8 +8079,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getServer() {
-        if (serverEClass == null) {
-            serverEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(99);
+        if( serverEClass == null ) {
+            serverEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 99 );
         }
         return serverEClass;
     }
@@ -7973,7 +8093,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getServer_Timeout() {
-        return (EAttribute)getServer().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getServer().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -7983,7 +8103,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServer_ParentAccessPoint() {
-        return (EReference)getServer().getEStructuralFeatures().get(1);
+        return ( EReference ) getServer().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -7993,7 +8113,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServer_Association() {
-        return (EReference)getServer().getEStructuralFeatures().get(2);
+        return ( EReference ) getServer().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -8003,7 +8123,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServer_Authentication() {
-        return (EReference)getServer().getEStructuralFeatures().get(3);
+        return ( EReference ) getServer().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -8013,7 +8133,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServer_LDevice() {
-        return (EReference)getServer().getEStructuralFeatures().get(4);
+        return ( EReference ) getServer().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -8023,8 +8143,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getServerAt() {
-        if (serverAtEClass == null) {
-            serverAtEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(100);
+        if( serverAtEClass == null ) {
+            serverAtEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 100 );
         }
         return serverAtEClass;
     }
@@ -8036,7 +8157,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getServerAt_ApName() {
-        return (EAttribute)getServerAt().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getServerAt().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8046,7 +8167,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServerAt_ParentAccessPoint() {
-        return (EReference)getServerAt().getEStructuralFeatures().get(1);
+        return ( EReference ) getServerAt().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -8056,7 +8177,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServerAt_RefersToAccessPoint() {
-        return (EReference)getServerAt().getEStructuralFeatures().get(2);
+        return ( EReference ) getServerAt().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -8066,8 +8187,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getServiceSettings() {
-        if (serviceSettingsEClass == null) {
-            serviceSettingsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(101);
+        if( serviceSettingsEClass == null ) {
+            serviceSettingsEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 101 );
         }
         return serviceSettingsEClass;
     }
@@ -8079,7 +8201,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getServiceSettings_CbName() {
-        return (EAttribute)getServiceSettings().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getServiceSettings().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8089,7 +8211,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getServiceSettings_DatSet() {
-        return (EAttribute)getServiceSettings().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getServiceSettings().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -8099,8 +8221,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getServiceWithMax() {
-        if (serviceWithMaxEClass == null) {
-            serviceWithMaxEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(102);
+        if( serviceWithMaxEClass == null ) {
+            serviceWithMaxEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 102 );
         }
         return serviceWithMaxEClass;
     }
@@ -8112,7 +8235,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getServiceWithMax_Max() {
-        return (EAttribute)getServiceWithMax().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getServiceWithMax().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8122,8 +8245,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getServices() {
-        if (servicesEClass == null) {
-            servicesEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(103);
+        if( servicesEClass == null ) {
+            servicesEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 103 );
         }
         return servicesEClass;
     }
@@ -8135,7 +8259,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getServices_NameLength() {
-        return (EAttribute)getServices().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getServices().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8145,7 +8269,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_ParentAccessPoint() {
-        return (EReference)getServices().getEStructuralFeatures().get(1);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -8155,7 +8279,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_ClientServices() {
-        return (EReference)getServices().getEStructuralFeatures().get(2);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -8165,7 +8289,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_CommProt() {
-        return (EReference)getServices().getEStructuralFeatures().get(3);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -8175,7 +8299,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_ConfDataSet() {
-        return (EReference)getServices().getEStructuralFeatures().get(4);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -8185,7 +8309,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_ConfLNs() {
-        return (EReference)getServices().getEStructuralFeatures().get(5);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -8195,7 +8319,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_ConfLdName() {
-        return (EReference)getServices().getEStructuralFeatures().get(6);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -8205,7 +8329,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_ConfLogControl() {
-        return (EReference)getServices().getEStructuralFeatures().get(7);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -8215,7 +8339,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_ConfReportControl() {
-        return (EReference)getServices().getEStructuralFeatures().get(8);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -8225,7 +8349,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_ConfSigRef() {
-        return (EReference)getServices().getEStructuralFeatures().get(9);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -8235,7 +8359,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_DataObjectDirectory() {
-        return (EReference)getServices().getEStructuralFeatures().get(10);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 10 );
     }
 
     /**
@@ -8245,7 +8369,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_DataSetDirectory() {
-        return (EReference)getServices().getEStructuralFeatures().get(11);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 11 );
     }
 
     /**
@@ -8255,7 +8379,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_DynAssociation() {
-        return (EReference)getServices().getEStructuralFeatures().get(12);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 12 );
     }
 
     /**
@@ -8265,7 +8389,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_DynDataSet() {
-        return (EReference)getServices().getEStructuralFeatures().get(13);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 13 );
     }
 
     /**
@@ -8275,7 +8399,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_FileHandling() {
-        return (EReference)getServices().getEStructuralFeatures().get(14);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 14 );
     }
 
     /**
@@ -8285,7 +8409,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_GOOSE() {
-        return (EReference)getServices().getEStructuralFeatures().get(15);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 15 );
     }
 
     /**
@@ -8295,7 +8419,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_GSEDir() {
-        return (EReference)getServices().getEStructuralFeatures().get(16);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 16 );
     }
 
     /**
@@ -8305,7 +8429,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_GSESettings() {
-        return (EReference)getServices().getEStructuralFeatures().get(17);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 17 );
     }
 
     /**
@@ -8315,7 +8439,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_GSSE() {
-        return (EReference)getServices().getEStructuralFeatures().get(18);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 18 );
     }
 
     /**
@@ -8325,7 +8449,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_GetCBValues() {
-        return (EReference)getServices().getEStructuralFeatures().get(19);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 19 );
     }
 
     /**
@@ -8335,7 +8459,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_GetDataObjectDefinition() {
-        return (EReference)getServices().getEStructuralFeatures().get(20);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 20 );
     }
 
     /**
@@ -8345,7 +8469,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_GetDataSetValue() {
-        return (EReference)getServices().getEStructuralFeatures().get(21);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 21 );
     }
 
     /**
@@ -8355,7 +8479,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_GetDirectory() {
-        return (EReference)getServices().getEStructuralFeatures().get(22);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 22 );
     }
 
     /**
@@ -8365,7 +8489,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_ParentIED() {
-        return (EReference)getServices().getEStructuralFeatures().get(23);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 23 );
     }
 
     /**
@@ -8375,7 +8499,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_LogSettings() {
-        return (EReference)getServices().getEStructuralFeatures().get(24);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 24 );
     }
 
     /**
@@ -8385,7 +8509,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_ReadWrite() {
-        return (EReference)getServices().getEStructuralFeatures().get(25);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 25 );
     }
 
     /**
@@ -8395,7 +8519,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_RedProt() {
-        return (EReference)getServices().getEStructuralFeatures().get(26);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 26 );
     }
 
     /**
@@ -8405,7 +8529,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_ReportSettings() {
-        return (EReference)getServices().getEStructuralFeatures().get(27);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 27 );
     }
 
     /**
@@ -8415,7 +8539,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_SMVsc() {
-        return (EReference)getServices().getEStructuralFeatures().get(28);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 28 );
     }
 
     /**
@@ -8425,7 +8549,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_SupSubscription() {
-        return (EReference)getServices().getEStructuralFeatures().get(29);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 29 );
     }
 
     /**
@@ -8435,7 +8559,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_ValueHandling() {
-        return (EReference)getServices().getEStructuralFeatures().get(30);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 30 );
     }
 
     /**
@@ -8445,7 +8569,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_SetDataSetValue() {
-        return (EReference)getServices().getEStructuralFeatures().get(31);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 31 );
     }
 
     /**
@@ -8455,7 +8579,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_SettingGroups() {
-        return (EReference)getServices().getEStructuralFeatures().get(32);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 32 );
     }
 
     /**
@@ -8465,7 +8589,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_TimeSyncProt() {
-        return (EReference)getServices().getEStructuralFeatures().get(33);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 33 );
     }
 
     /**
@@ -8475,7 +8599,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_TimerActivatedControl() {
-        return (EReference)getServices().getEStructuralFeatures().get(34);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 34 );
     }
 
     /**
@@ -8485,7 +8609,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getServices_SMVSettings() {
-        return (EReference)getServices().getEStructuralFeatures().get(35);
+        return ( EReference ) getServices().getEStructuralFeatures().get( 35 );
     }
 
     /**
@@ -8495,8 +8619,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSetDataSetValue() {
-        if (setDataSetValueEClass == null) {
-            setDataSetValueEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(104);
+        if( setDataSetValueEClass == null ) {
+            setDataSetValueEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 104 );
         }
         return setDataSetValueEClass;
     }
@@ -8508,7 +8633,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSetDataSetValue_ParentServices() {
-        return (EReference)getSetDataSetValue().getEStructuralFeatures().get(0);
+        return ( EReference ) getSetDataSetValue().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8518,8 +8643,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSettingControl() {
-        if (settingControlEClass == null) {
-            settingControlEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(105);
+        if( settingControlEClass == null ) {
+            settingControlEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 105 );
         }
         return settingControlEClass;
     }
@@ -8531,7 +8657,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSettingControl_ActSG() {
-        return (EAttribute)getSettingControl().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSettingControl().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8541,7 +8667,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSettingControl_NumOfSGs() {
-        return (EAttribute)getSettingControl().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getSettingControl().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -8551,7 +8677,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSettingControl_ResvTms() {
-        return (EAttribute)getSettingControl().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getSettingControl().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -8561,7 +8687,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSettingControl_ParentLN0() {
-        return (EReference)getSettingControl().getEStructuralFeatures().get(3);
+        return ( EReference ) getSettingControl().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -8571,8 +8697,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSettingGroups() {
-        if (settingGroupsEClass == null) {
-            settingGroupsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(106);
+        if( settingGroupsEClass == null ) {
+            settingGroupsEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 106 );
         }
         return settingGroupsEClass;
     }
@@ -8584,7 +8711,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSettingGroups_ConfSG() {
-        return (EReference)getSettingGroups().getEStructuralFeatures().get(0);
+        return ( EReference ) getSettingGroups().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8594,7 +8721,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSettingGroups_SGEdit() {
-        return (EReference)getSettingGroups().getEStructuralFeatures().get(1);
+        return ( EReference ) getSettingGroups().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -8604,7 +8731,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSettingGroups_ParentServices() {
-        return (EReference)getSettingGroups().getEStructuralFeatures().get(2);
+        return ( EReference ) getSettingGroups().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -8614,8 +8741,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSmvOpts() {
-        if (smvOptsEClass == null) {
-            smvOptsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(107);
+        if( smvOptsEClass == null ) {
+            smvOptsEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 107 );
         }
         return smvOptsEClass;
     }
@@ -8627,7 +8755,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSmvOpts_ParentSampledValueControl() {
-        return (EReference)getSmvOpts().getEStructuralFeatures().get(0);
+        return ( EReference ) getSmvOpts().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8637,8 +8765,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSubject() {
-        if (subjectEClass == null) {
-            subjectEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(108);
+        if( subjectEClass == null ) {
+            subjectEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 108 );
         }
         return subjectEClass;
     }
@@ -8650,7 +8779,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubject_ParentCertificate() {
-        return (EReference)getSubject().getEStructuralFeatures().get(0);
+        return ( EReference ) getSubject().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8660,8 +8789,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSupSubscription() {
-        if (supSubscriptionEClass == null) {
-            supSubscriptionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(109);
+        if( supSubscriptionEClass == null ) {
+            supSubscriptionEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 109 );
         }
         return supSubscriptionEClass;
     }
@@ -8673,7 +8803,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSupSubscription_MaxGo() {
-        return (EAttribute)getSupSubscription().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSupSubscription().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8683,7 +8813,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSupSubscription_MaxSv() {
-        return (EAttribute)getSupSubscription().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getSupSubscription().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -8693,7 +8823,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSupSubscription_ParentServices() {
-        return (EReference)getSupSubscription().getEStructuralFeatures().get(2);
+        return ( EReference ) getSupSubscription().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -8703,8 +8833,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getTimeSyncProt() {
-        if (timeSyncProtEClass == null) {
-            timeSyncProtEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(110);
+        if( timeSyncProtEClass == null ) {
+            timeSyncProtEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 110 );
         }
         return timeSyncProtEClass;
     }
@@ -8716,7 +8847,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTimeSyncProt_C37_238() {
-        return (EAttribute)getTimeSyncProt().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getTimeSyncProt().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8726,7 +8857,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTimeSyncProt_Other() {
-        return (EAttribute)getTimeSyncProt().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getTimeSyncProt().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -8736,7 +8867,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTimeSyncProt_Sntp() {
-        return (EAttribute)getTimeSyncProt().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getTimeSyncProt().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -8746,7 +8877,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getTimeSyncProt_ParentClientServices() {
-        return (EReference)getTimeSyncProt().getEStructuralFeatures().get(3);
+        return ( EReference ) getTimeSyncProt().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -8756,7 +8887,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getTimeSyncProt_ParentServices() {
-        return (EReference)getTimeSyncProt().getEStructuralFeatures().get(4);
+        return ( EReference ) getTimeSyncProt().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -8766,7 +8897,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTimeSyncProt_Iec61850_9_3() {
-        return (EAttribute)getTimeSyncProt().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getTimeSyncProt().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -8776,8 +8907,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getTimerActivatedControl() {
-        if (timerActivatedControlEClass == null) {
-            timerActivatedControlEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(111);
+        if( timerActivatedControlEClass == null ) {
+            timerActivatedControlEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 111 );
         }
         return timerActivatedControlEClass;
     }
@@ -8789,7 +8921,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getTimerActivatedControl_ParentServices() {
-        return (EReference)getTimerActivatedControl().getEStructuralFeatures().get(0);
+        return ( EReference ) getTimerActivatedControl().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8799,8 +8931,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getTrgOps() {
-        if (trgOpsEClass == null) {
-            trgOpsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(112);
+        if( trgOpsEClass == null ) {
+            trgOpsEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 112 );
         }
         return trgOpsEClass;
     }
@@ -8812,7 +8945,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTrgOps_Dchg() {
-        return (EAttribute)getTrgOps().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getTrgOps().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8822,7 +8955,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTrgOps_Dupd() {
-        return (EAttribute)getTrgOps().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getTrgOps().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -8832,7 +8965,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTrgOps_Gi() {
-        return (EAttribute)getTrgOps().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getTrgOps().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -8842,7 +8975,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTrgOps_Period() {
-        return (EAttribute)getTrgOps().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getTrgOps().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -8852,7 +8985,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTrgOps_Qchg() {
-        return (EAttribute)getTrgOps().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getTrgOps().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -8862,7 +8995,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getTrgOps_ParentControlWithTriggerOpt() {
-        return (EReference)getTrgOps().getEStructuralFeatures().get(5);
+        return ( EReference ) getTrgOps().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -8872,8 +9005,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getValueHandling() {
-        if (valueHandlingEClass == null) {
-            valueHandlingEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(113);
+        if( valueHandlingEClass == null ) {
+            valueHandlingEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 113 );
         }
         return valueHandlingEClass;
     }
@@ -8885,7 +9019,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getValueHandling_SetToRO() {
-        return (EAttribute)getValueHandling().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getValueHandling().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8895,7 +9029,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getValueHandling_ParentServices() {
-        return (EReference)getValueHandling().getEStructuralFeatures().get(1);
+        return ( EReference ) getValueHandling().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -8905,8 +9039,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAbstractConductingEquipment() {
-        if (abstractConductingEquipmentEClass == null) {
-            abstractConductingEquipmentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(114);
+        if( abstractConductingEquipmentEClass == null ) {
+            abstractConductingEquipmentEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 114 );
         }
         return abstractConductingEquipmentEClass;
     }
@@ -8918,7 +9053,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAbstractConductingEquipment_SubEquipment() {
-        return (EReference)getAbstractConductingEquipment().getEStructuralFeatures().get(0);
+        return ( EReference ) getAbstractConductingEquipment().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8928,7 +9063,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAbstractConductingEquipment_Terminal() {
-        return (EReference)getAbstractConductingEquipment().getEStructuralFeatures().get(1);
+        return ( EReference ) getAbstractConductingEquipment().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -8938,8 +9073,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAbstractEqFuncSubFunc() {
-        if (abstractEqFuncSubFuncEClass == null) {
-            abstractEqFuncSubFuncEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(115);
+        if( abstractEqFuncSubFuncEClass == null ) {
+            abstractEqFuncSubFuncEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 115 );
         }
         return abstractEqFuncSubFuncEClass;
     }
@@ -8951,7 +9087,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAbstractEqFuncSubFunc_Type() {
-        return (EAttribute)getAbstractEqFuncSubFunc().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAbstractEqFuncSubFunc().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -8961,7 +9097,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAbstractEqFuncSubFunc_EqSubFunction() {
-        return (EReference)getAbstractEqFuncSubFunc().getEStructuralFeatures().get(1);
+        return ( EReference ) getAbstractEqFuncSubFunc().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -8971,7 +9107,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAbstractEqFuncSubFunc_SubGeneralEquipment() {
-        return (EReference)getAbstractEqFuncSubFunc().getEStructuralFeatures().get(2);
+        return ( EReference ) getAbstractEqFuncSubFunc().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -8981,8 +9117,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getBay() {
-        if (bayEClass == null) {
-            bayEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(116);
+        if( bayEClass == null ) {
+            bayEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 116 );
         }
         return bayEClass;
     }
@@ -8994,7 +9131,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getBay_ParentVoltageLevel() {
-        return (EReference)getBay().getEStructuralFeatures().get(0);
+        return ( EReference ) getBay().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9004,7 +9141,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getBay_Function() {
-        return (EReference)getBay().getEStructuralFeatures().get(1);
+        return ( EReference ) getBay().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -9014,7 +9151,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getBay_ConnectivityNode() {
-        return (EReference)getBay().getEStructuralFeatures().get(2);
+        return ( EReference ) getBay().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -9024,7 +9161,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getBay_ConductingEquipment() {
-        return (EReference)getBay().getEStructuralFeatures().get(3);
+        return ( EReference ) getBay().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -9034,8 +9171,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getConductingEquipment() {
-        if (conductingEquipmentEClass == null) {
-            conductingEquipmentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(117);
+        if( conductingEquipmentEClass == null ) {
+            conductingEquipmentEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 117 );
         }
         return conductingEquipmentEClass;
     }
@@ -9047,7 +9185,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getConductingEquipment_Type() {
-        return (EAttribute)getConductingEquipment().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getConductingEquipment().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9057,7 +9195,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConductingEquipment_ParentBay() {
-        return (EReference)getConductingEquipment().getEStructuralFeatures().get(1);
+        return ( EReference ) getConductingEquipment().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -9067,7 +9205,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConductingEquipment_ParentFunction() {
-        return (EReference)getConductingEquipment().getEStructuralFeatures().get(2);
+        return ( EReference ) getConductingEquipment().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -9077,7 +9215,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConductingEquipment_ParentSubFunction() {
-        return (EReference)getConductingEquipment().getEStructuralFeatures().get(3);
+        return ( EReference ) getConductingEquipment().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -9087,7 +9225,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConductingEquipment_EqFunction() {
-        return (EReference)getConductingEquipment().getEStructuralFeatures().get(4);
+        return ( EReference ) getConductingEquipment().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -9097,7 +9235,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConductingEquipment_ParentLine() {
-        return (EReference)getConductingEquipment().getEStructuralFeatures().get(5);
+        return ( EReference ) getConductingEquipment().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -9107,7 +9245,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConductingEquipment_ParentProcess() {
-        return (EReference)getConductingEquipment().getEStructuralFeatures().get(6);
+        return ( EReference ) getConductingEquipment().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -9117,8 +9255,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getConnectivityNode() {
-        if (connectivityNodeEClass == null) {
-            connectivityNodeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(118);
+        if( connectivityNodeEClass == null ) {
+            connectivityNodeEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 118 );
         }
         return connectivityNodeEClass;
     }
@@ -9130,7 +9269,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getConnectivityNode_PathName() {
-        return (EAttribute)getConnectivityNode().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getConnectivityNode().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9140,7 +9279,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConnectivityNode_ParentBay() {
-        return (EReference)getConnectivityNode().getEStructuralFeatures().get(1);
+        return ( EReference ) getConnectivityNode().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -9150,7 +9289,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConnectivityNode_ReferredByTerminal() {
-        return (EReference)getConnectivityNode().getEStructuralFeatures().get(2);
+        return ( EReference ) getConnectivityNode().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -9160,7 +9299,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getConnectivityNode_ParentLine() {
-        return (EReference)getConnectivityNode().getEStructuralFeatures().get(3);
+        return ( EReference ) getConnectivityNode().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -9170,8 +9309,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getEqFunction() {
-        if (eqFunctionEClass == null) {
-            eqFunctionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(119);
+        if( eqFunctionEClass == null ) {
+            eqFunctionEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 119 );
         }
         return eqFunctionEClass;
     }
@@ -9183,7 +9323,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getEqFunction_ParentConductingEquipment() {
-        return (EReference)getEqFunction().getEStructuralFeatures().get(0);
+        return ( EReference ) getEqFunction().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9193,7 +9333,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getEqFunction_ParentGeneralEquipment() {
-        return (EReference)getEqFunction().getEStructuralFeatures().get(1);
+        return ( EReference ) getEqFunction().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -9203,7 +9343,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getEqFunction_ParentPowerTransformer() {
-        return (EReference)getEqFunction().getEStructuralFeatures().get(2);
+        return ( EReference ) getEqFunction().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -9213,7 +9353,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getEqFunction_ParentSubEquipment() {
-        return (EReference)getEqFunction().getEStructuralFeatures().get(3);
+        return ( EReference ) getEqFunction().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -9223,7 +9363,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getEqFunction_ParentTransformerWinding() {
-        return (EReference)getEqFunction().getEStructuralFeatures().get(4);
+        return ( EReference ) getEqFunction().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -9233,7 +9373,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getEqFunction_ParentTapChanger() {
-        return (EReference)getEqFunction().getEStructuralFeatures().get(5);
+        return ( EReference ) getEqFunction().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -9243,8 +9383,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getEqSubFunction() {
-        if (eqSubFunctionEClass == null) {
-            eqSubFunctionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(120);
+        if( eqSubFunctionEClass == null ) {
+            eqSubFunctionEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 120 );
         }
         return eqSubFunctionEClass;
     }
@@ -9256,7 +9397,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getEqSubFunction_ParentAbstractEqFuncSubFunc() {
-        return (EReference)getEqSubFunction().getEStructuralFeatures().get(0);
+        return ( EReference ) getEqSubFunction().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9266,8 +9407,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getEquipment() {
-        if (equipmentEClass == null) {
-            equipmentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(121);
+        if( equipmentEClass == null ) {
+            equipmentEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 121 );
         }
         return equipmentEClass;
     }
@@ -9279,8 +9421,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getEquipmentContainer() {
-        if (equipmentContainerEClass == null) {
-            equipmentContainerEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(122);
+        if( equipmentContainerEClass == null ) {
+            equipmentContainerEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 122 );
         }
         return equipmentContainerEClass;
     }
@@ -9292,7 +9435,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getEquipmentContainer_PowerTransformer() {
-        return (EReference)getEquipmentContainer().getEStructuralFeatures().get(0);
+        return ( EReference ) getEquipmentContainer().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9302,7 +9445,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getEquipmentContainer_GeneralEquipment() {
-        return (EReference)getEquipmentContainer().getEStructuralFeatures().get(1);
+        return ( EReference ) getEquipmentContainer().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -9312,8 +9455,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getFunction() {
-        if (functionEClass == null) {
-            functionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(123);
+        if( functionEClass == null ) {
+            functionEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 123 );
         }
         return functionEClass;
     }
@@ -9325,7 +9469,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getFunction_Type() {
-        return (EAttribute)getFunction().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getFunction().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9335,7 +9479,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getFunction_ParentBay() {
-        return (EReference)getFunction().getEStructuralFeatures().get(1);
+        return ( EReference ) getFunction().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -9345,7 +9489,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getFunction_ConductingEquipment() {
-        return (EReference)getFunction().getEStructuralFeatures().get(2);
+        return ( EReference ) getFunction().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -9355,7 +9499,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getFunction_ParentGeneralEquipmentContainer() {
-        return (EReference)getFunction().getEStructuralFeatures().get(3);
+        return ( EReference ) getFunction().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -9365,7 +9509,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getFunction_ParentSubstation() {
-        return (EReference)getFunction().getEStructuralFeatures().get(4);
+        return ( EReference ) getFunction().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -9375,7 +9519,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getFunction_ParentVoltageLevel() {
-        return (EReference)getFunction().getEStructuralFeatures().get(5);
+        return ( EReference ) getFunction().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -9385,7 +9529,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getFunction_SubFunction() {
-        return (EReference)getFunction().getEStructuralFeatures().get(6);
+        return ( EReference ) getFunction().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -9395,7 +9539,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getFunction_GeneralEquipment() {
-        return (EReference)getFunction().getEStructuralFeatures().get(7);
+        return ( EReference ) getFunction().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -9405,8 +9549,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getGeneralEquipment() {
-        if (generalEquipmentEClass == null) {
-            generalEquipmentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(124);
+        if( generalEquipmentEClass == null ) {
+            generalEquipmentEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 124 );
         }
         return generalEquipmentEClass;
     }
@@ -9418,7 +9563,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getGeneralEquipment_Type() {
-        return (EAttribute)getGeneralEquipment().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getGeneralEquipment().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9428,7 +9573,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGeneralEquipment_ParentAbstractEqFuncSubFunc() {
-        return (EReference)getGeneralEquipment().getEStructuralFeatures().get(1);
+        return ( EReference ) getGeneralEquipment().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -9438,7 +9583,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGeneralEquipment_EqFunction() {
-        return (EReference)getGeneralEquipment().getEStructuralFeatures().get(2);
+        return ( EReference ) getGeneralEquipment().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -9448,7 +9593,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGeneralEquipment_ParentEquipmentContainer() {
-        return (EReference)getGeneralEquipment().getEStructuralFeatures().get(3);
+        return ( EReference ) getGeneralEquipment().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -9458,7 +9603,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGeneralEquipment_ParentFunction() {
-        return (EReference)getGeneralEquipment().getEStructuralFeatures().get(4);
+        return ( EReference ) getGeneralEquipment().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -9468,7 +9613,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGeneralEquipment_ParentGeneralEquipmentContainer() {
-        return (EReference)getGeneralEquipment().getEStructuralFeatures().get(5);
+        return ( EReference ) getGeneralEquipment().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -9478,7 +9623,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGeneralEquipment_ParentSubFunction() {
-        return (EReference)getGeneralEquipment().getEStructuralFeatures().get(6);
+        return ( EReference ) getGeneralEquipment().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -9488,8 +9633,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getGeneralEquipmentContainer() {
-        if (generalEquipmentContainerEClass == null) {
-            generalEquipmentContainerEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(125);
+        if( generalEquipmentContainerEClass == null ) {
+            generalEquipmentContainerEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 125 );
         }
         return generalEquipmentContainerEClass;
     }
@@ -9501,7 +9647,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGeneralEquipmentContainer_Function() {
-        return (EReference)getGeneralEquipmentContainer().getEStructuralFeatures().get(0);
+        return ( EReference ) getGeneralEquipmentContainer().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9511,7 +9657,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getGeneralEquipmentContainer_GeneralEquipment() {
-        return (EReference)getGeneralEquipmentContainer().getEStructuralFeatures().get(1);
+        return ( EReference ) getGeneralEquipmentContainer().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -9521,8 +9667,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getLNode() {
-        if (lNodeEClass == null) {
-            lNodeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(126);
+        if( lNodeEClass == null ) {
+            lNodeEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 126 );
         }
         return lNodeEClass;
     }
@@ -9534,7 +9681,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLNode_IedName() {
-        return (EAttribute)getLNode().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getLNode().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9544,7 +9691,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLNode_LdInst() {
-        return (EAttribute)getLNode().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getLNode().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -9554,7 +9701,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLNode_LnClass() {
-        return (EAttribute)getLNode().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getLNode().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -9564,7 +9711,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLNode_LnInst() {
-        return (EAttribute)getLNode().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getLNode().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -9574,7 +9721,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLNode_LnType() {
-        return (EAttribute)getLNode().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getLNode().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -9584,7 +9731,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getLNode_Prefix() {
-        return (EAttribute)getLNode().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getLNode().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -9594,7 +9741,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLNode_RefersToAnyLN() {
-        return (EReference)getLNode().getEStructuralFeatures().get(6);
+        return ( EReference ) getLNode().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -9604,7 +9751,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLNode_ParentLNodeContainer() {
-        return (EReference)getLNode().getEStructuralFeatures().get(7);
+        return ( EReference ) getLNode().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -9614,7 +9761,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLNode_RefersToLNodeType() {
-        return (EReference)getLNode().getEStructuralFeatures().get(8);
+        return ( EReference ) getLNode().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -9624,8 +9771,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getLNodeContainer() {
-        if (lNodeContainerEClass == null) {
-            lNodeContainerEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(127);
+        if( lNodeContainerEClass == null ) {
+            lNodeContainerEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 127 );
         }
         return lNodeContainerEClass;
     }
@@ -9637,7 +9785,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getLNodeContainer_LNode() {
-        return (EReference)getLNodeContainer().getEStructuralFeatures().get(0);
+        return ( EReference ) getLNodeContainer().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9647,8 +9795,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getNeutralPoint() {
-        if (neutralPointEClass == null) {
-            neutralPointEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(128);
+        if( neutralPointEClass == null ) {
+            neutralPointEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 128 );
         }
         return neutralPointEClass;
     }
@@ -9660,7 +9809,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getNeutralPoint_ParentTransformerWinding() {
-        return (EReference)getNeutralPoint().getEStructuralFeatures().get(0);
+        return ( EReference ) getNeutralPoint().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9670,8 +9819,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getPowerSystemResource() {
-        if (powerSystemResourceEClass == null) {
-            powerSystemResourceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(129);
+        if( powerSystemResourceEClass == null ) {
+            powerSystemResourceEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 129 );
         }
         return powerSystemResourceEClass;
     }
@@ -9683,8 +9833,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getPowerTransformer() {
-        if (powerTransformerEClass == null) {
-            powerTransformerEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(130);
+        if( powerTransformerEClass == null ) {
+            powerTransformerEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 130 );
         }
         return powerTransformerEClass;
     }
@@ -9696,7 +9847,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getPowerTransformer_Type() {
-        return (EAttribute)getPowerTransformer().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getPowerTransformer().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9706,7 +9857,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getPowerTransformer_EqFunction() {
-        return (EReference)getPowerTransformer().getEStructuralFeatures().get(1);
+        return ( EReference ) getPowerTransformer().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -9716,7 +9867,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getPowerTransformer_ParentEquipmentContainer() {
-        return (EReference)getPowerTransformer().getEStructuralFeatures().get(2);
+        return ( EReference ) getPowerTransformer().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -9726,7 +9877,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getPowerTransformer_SubEquipment() {
-        return (EReference)getPowerTransformer().getEStructuralFeatures().get(3);
+        return ( EReference ) getPowerTransformer().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -9736,7 +9887,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getPowerTransformer_TransformerWinding() {
-        return (EReference)getPowerTransformer().getEStructuralFeatures().get(4);
+        return ( EReference ) getPowerTransformer().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -9746,8 +9897,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSubEquipment() {
-        if (subEquipmentEClass == null) {
-            subEquipmentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(131);
+        if( subEquipmentEClass == null ) {
+            subEquipmentEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 131 );
         }
         return subEquipmentEClass;
     }
@@ -9759,7 +9911,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSubEquipment_Phase() {
-        return (EAttribute)getSubEquipment().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSubEquipment().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9769,7 +9921,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubEquipment_ParentAbstractConductingEquipment() {
-        return (EReference)getSubEquipment().getEStructuralFeatures().get(1);
+        return ( EReference ) getSubEquipment().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -9779,7 +9931,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubEquipment_EqFunction() {
-        return (EReference)getSubEquipment().getEStructuralFeatures().get(2);
+        return ( EReference ) getSubEquipment().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -9789,7 +9941,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubEquipment_ParentPowerTransformer() {
-        return (EReference)getSubEquipment().getEStructuralFeatures().get(3);
+        return ( EReference ) getSubEquipment().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -9799,7 +9951,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubEquipment_ParentTapChanger() {
-        return (EReference)getSubEquipment().getEStructuralFeatures().get(4);
+        return ( EReference ) getSubEquipment().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -9809,8 +9961,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSubFunction() {
-        if (subFunctionEClass == null) {
-            subFunctionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(132);
+        if( subFunctionEClass == null ) {
+            subFunctionEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 132 );
         }
         return subFunctionEClass;
     }
@@ -9822,7 +9975,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSubFunction_Type() {
-        return (EAttribute)getSubFunction().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSubFunction().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9832,7 +9985,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubFunction_ConductingEquipment() {
-        return (EReference)getSubFunction().getEStructuralFeatures().get(1);
+        return ( EReference ) getSubFunction().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -9842,7 +9995,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubFunction_ParentFunction() {
-        return (EReference)getSubFunction().getEStructuralFeatures().get(2);
+        return ( EReference ) getSubFunction().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -9852,7 +10005,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubFunction_GeneralEquipment() {
-        return (EReference)getSubFunction().getEStructuralFeatures().get(3);
+        return ( EReference ) getSubFunction().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -9862,7 +10015,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubFunction_SubSubFunctions() {
-        return (EReference)getSubFunction().getEStructuralFeatures().get(4);
+        return ( EReference ) getSubFunction().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -9872,7 +10025,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubFunction_ParentSubFunction() {
-        return (EReference)getSubFunction().getEStructuralFeatures().get(5);
+        return ( EReference ) getSubFunction().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -9882,8 +10035,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSubstation() {
-        if (substationEClass == null) {
-            substationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(133);
+        if( substationEClass == null ) {
+            substationEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 133 );
         }
         return substationEClass;
     }
@@ -9895,7 +10049,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubstation_Function() {
-        return (EReference)getSubstation().getEStructuralFeatures().get(0);
+        return ( EReference ) getSubstation().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9905,7 +10059,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubstation_VoltageLevel() {
-        return (EReference)getSubstation().getEStructuralFeatures().get(1);
+        return ( EReference ) getSubstation().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -9915,7 +10069,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubstation_ParentProcess() {
-        return (EReference)getSubstation().getEStructuralFeatures().get(2);
+        return ( EReference ) getSubstation().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -9925,7 +10079,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getSubstation_ParentSCL() {
-        return (EReference)getSubstation().getEStructuralFeatures().get(3);
+        return ( EReference ) getSubstation().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -9935,8 +10089,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getTapChanger() {
-        if (tapChangerEClass == null) {
-            tapChangerEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(134);
+        if( tapChangerEClass == null ) {
+            tapChangerEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 134 );
         }
         return tapChangerEClass;
     }
@@ -9948,7 +10103,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTapChanger_Type() {
-        return (EAttribute)getTapChanger().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getTapChanger().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -9958,7 +10113,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getTapChanger_EqFunction() {
-        return (EReference)getTapChanger().getEStructuralFeatures().get(1);
+        return ( EReference ) getTapChanger().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -9968,7 +10123,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getTapChanger_SubEquipment() {
-        return (EReference)getTapChanger().getEStructuralFeatures().get(2);
+        return ( EReference ) getTapChanger().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -9978,7 +10133,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getTapChanger_ParentTransformerWinding() {
-        return (EReference)getTapChanger().getEStructuralFeatures().get(3);
+        return ( EReference ) getTapChanger().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -9988,8 +10143,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getTerminal() {
-        if (terminalEClass == null) {
-            terminalEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(135);
+        if( terminalEClass == null ) {
+            terminalEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 135 );
         }
         return terminalEClass;
     }
@@ -10001,7 +10157,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTerminal_BayName() {
-        return (EAttribute)getTerminal().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getTerminal().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -10011,7 +10167,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTerminal_CNodeName() {
-        return (EAttribute)getTerminal().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getTerminal().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -10021,7 +10177,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTerminal_ConnectivityNode() {
-        return (EAttribute)getTerminal().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getTerminal().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -10031,7 +10187,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTerminal_ProcessName() {
-        return (EAttribute)getTerminal().getEStructuralFeatures().get(3);
+        return ( EAttribute ) getTerminal().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -10041,7 +10197,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTerminal_SubstationName() {
-        return (EAttribute)getTerminal().getEStructuralFeatures().get(4);
+        return ( EAttribute ) getTerminal().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -10051,7 +10207,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTerminal_VoltageLevelName() {
-        return (EAttribute)getTerminal().getEStructuralFeatures().get(5);
+        return ( EAttribute ) getTerminal().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -10061,7 +10217,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getTerminal_ParentAbstractConductingEquipment() {
-        return (EReference)getTerminal().getEStructuralFeatures().get(6);
+        return ( EReference ) getTerminal().getEStructuralFeatures().get( 6 );
     }
 
     /**
@@ -10071,7 +10227,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getTerminal_RefersToConnectivityNode() {
-        return (EReference)getTerminal().getEStructuralFeatures().get(7);
+        return ( EReference ) getTerminal().getEStructuralFeatures().get( 7 );
     }
 
     /**
@@ -10081,7 +10237,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTerminal_Name() {
-        return (EAttribute)getTerminal().getEStructuralFeatures().get(8);
+        return ( EAttribute ) getTerminal().getEStructuralFeatures().get( 8 );
     }
 
     /**
@@ -10091,7 +10247,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTerminal_LineName() {
-        return (EAttribute)getTerminal().getEStructuralFeatures().get(9);
+        return ( EAttribute ) getTerminal().getEStructuralFeatures().get( 9 );
     }
 
     /**
@@ -10101,8 +10257,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getTransformerWinding() {
-        if (transformerWindingEClass == null) {
-            transformerWindingEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(136);
+        if( transformerWindingEClass == null ) {
+            transformerWindingEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 136 );
         }
         return transformerWindingEClass;
     }
@@ -10114,7 +10271,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getTransformerWinding_Type() {
-        return (EAttribute)getTransformerWinding().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getTransformerWinding().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -10124,7 +10281,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getTransformerWinding_EqFunction() {
-        return (EReference)getTransformerWinding().getEStructuralFeatures().get(1);
+        return ( EReference ) getTransformerWinding().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -10134,7 +10291,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getTransformerWinding_NeutralPoint() {
-        return (EReference)getTransformerWinding().getEStructuralFeatures().get(2);
+        return ( EReference ) getTransformerWinding().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -10144,7 +10301,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getTransformerWinding_ParentPowerTransformer() {
-        return (EReference)getTransformerWinding().getEStructuralFeatures().get(3);
+        return ( EReference ) getTransformerWinding().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -10154,7 +10311,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getTransformerWinding_TapChanger() {
-        return (EReference)getTransformerWinding().getEStructuralFeatures().get(4);
+        return ( EReference ) getTransformerWinding().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -10164,8 +10321,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getVoltage() {
-        if (voltageEClass == null) {
-            voltageEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(137);
+        if( voltageEClass == null ) {
+            voltageEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 137 );
         }
         return voltageEClass;
     }
@@ -10177,7 +10335,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getVoltage_ParentLine() {
-        return (EReference)getVoltage().getEStructuralFeatures().get(0);
+        return ( EReference ) getVoltage().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -10187,7 +10345,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getVoltage_ParentVoltageLevel() {
-        return (EReference)getVoltage().getEStructuralFeatures().get(1);
+        return ( EReference ) getVoltage().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -10197,8 +10355,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getVoltageLevel() {
-        if (voltageLevelEClass == null) {
-            voltageLevelEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(138);
+        if( voltageLevelEClass == null ) {
+            voltageLevelEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 138 );
         }
         return voltageLevelEClass;
     }
@@ -10210,7 +10369,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getVoltageLevel_NomFreq() {
-        return (EAttribute)getVoltageLevel().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getVoltageLevel().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -10220,7 +10379,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getVoltageLevel_NumPhases() {
-        return (EAttribute)getVoltageLevel().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getVoltageLevel().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -10230,7 +10389,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getVoltageLevel_Bay() {
-        return (EReference)getVoltageLevel().getEStructuralFeatures().get(2);
+        return ( EReference ) getVoltageLevel().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -10240,7 +10399,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getVoltageLevel_Function() {
-        return (EReference)getVoltageLevel().getEStructuralFeatures().get(3);
+        return ( EReference ) getVoltageLevel().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -10250,7 +10409,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getVoltageLevel_ParentSubstation() {
-        return (EReference)getVoltageLevel().getEStructuralFeatures().get(4);
+        return ( EReference ) getVoltageLevel().getEStructuralFeatures().get( 4 );
     }
 
     /**
@@ -10260,7 +10419,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getVoltageLevel_Voltage() {
-        return (EReference)getVoltageLevel().getEStructuralFeatures().get(5);
+        return ( EReference ) getVoltageLevel().getEStructuralFeatures().get( 5 );
     }
 
     /**
@@ -10270,8 +10429,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getAbstractDataObject() {
-        if (abstractDataObjectEClass == null) {
-            abstractDataObjectEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(152);
+        if( abstractDataObjectEClass == null ) {
+            abstractDataObjectEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 152 );
         }
         return abstractDataObjectEClass;
     }
@@ -10283,7 +10443,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAbstractDataObject_Name() {
-        return (EAttribute)getAbstractDataObject().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getAbstractDataObject().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -10293,7 +10453,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getAbstractDataObject_Type() {
-        return (EAttribute)getAbstractDataObject().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getAbstractDataObject().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -10303,7 +10463,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAbstractDataObject_RefersToDOType() {
-        return (EReference)getAbstractDataObject().getEStructuralFeatures().get(2);
+        return ( EReference ) getAbstractDataObject().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -10313,7 +10473,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EReference getAbstractDataObject_ReferredByExtRef() {
-        return (EReference)getAbstractDataObject().getEStructuralFeatures().get(3);
+        return ( EReference ) getAbstractDataObject().getEStructuralFeatures().get( 3 );
     }
 
     /**
@@ -10323,8 +10483,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getSclObject() {
-        if (sclObjectEClass == null) {
-            sclObjectEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(153);
+        if( sclObjectEClass == null ) {
+            sclObjectEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 153 );
         }
         return sclObjectEClass;
     }
@@ -10336,7 +10497,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSclObject_LineNumber() {
-        return (EAttribute)getSclObject().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getSclObject().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -10346,7 +10507,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getSclObject_ExplicitLinksBuilt() {
-        return (EAttribute)getSclObject().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getSclObject().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -10356,7 +10517,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EOperation getSclObject__BuildExplicitLinks__IRiseClipseConsole_Boolean() {
-        return getSclObject().getEOperations().get(0);
+        return getSclObject().getEOperations().get( 0 );
     }
 
     /**
@@ -10366,8 +10527,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getUnNaming() {
-        if (unNamingEClass == null) {
-            unNamingEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(154);
+        if( unNamingEClass == null ) {
+            unNamingEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 154 );
         }
         return unNamingEClass;
     }
@@ -10379,8 +10541,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getServiceYesNo() {
-        if (serviceYesNoEClass == null) {
-            serviceYesNoEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(155);
+        if( serviceYesNoEClass == null ) {
+            serviceYesNoEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 155 );
         }
         return serviceYesNoEClass;
     }
@@ -10392,8 +10555,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getServiceWithOptionalMax() {
-        if (serviceWithOptionalMaxEClass == null) {
-            serviceWithOptionalMaxEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(156);
+        if( serviceWithOptionalMaxEClass == null ) {
+            serviceWithOptionalMaxEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 156 );
         }
         return serviceWithOptionalMaxEClass;
     }
@@ -10405,7 +10569,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getServiceWithOptionalMax_Max() {
-        return (EAttribute)getServiceWithOptionalMax().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getServiceWithOptionalMax().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -10415,8 +10579,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getServiceWithMaxNonZero() {
-        if (serviceWithMaxNonZeroEClass == null) {
-            serviceWithMaxNonZeroEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(157);
+        if( serviceWithMaxNonZeroEClass == null ) {
+            serviceWithMaxNonZeroEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 157 );
         }
         return serviceWithMaxNonZeroEClass;
     }
@@ -10428,7 +10593,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getServiceWithMaxNonZero_Max() {
-        return (EAttribute)getServiceWithMaxNonZero().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getServiceWithMaxNonZero().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -10438,8 +10603,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getServiceConfReportControl() {
-        if (serviceConfReportControlEClass == null) {
-            serviceConfReportControlEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(158);
+        if( serviceConfReportControlEClass == null ) {
+            serviceConfReportControlEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 158 );
         }
         return serviceConfReportControlEClass;
     }
@@ -10451,7 +10617,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getServiceConfReportControl_BufMode() {
-        return (EAttribute)getServiceConfReportControl().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getServiceConfReportControl().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -10461,7 +10627,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getServiceConfReportControl_BufConf() {
-        return (EAttribute)getServiceConfReportControl().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getServiceConfReportControl().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -10471,7 +10637,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getServiceConfReportControl_MaxBuf() {
-        return (EAttribute)getServiceConfReportControl().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getServiceConfReportControl().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -10481,8 +10647,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getServiceWithMaxAndMaxAttributes() {
-        if (serviceWithMaxAndMaxAttributesEClass == null) {
-            serviceWithMaxAndMaxAttributesEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(159);
+        if( serviceWithMaxAndMaxAttributesEClass == null ) {
+            serviceWithMaxAndMaxAttributesEClass = ( EClass ) EPackage.Registry.INSTANCE
+                    .getEPackage( SclPackage.eNS_URI ).getEClassifiers().get( 159 );
         }
         return serviceWithMaxAndMaxAttributesEClass;
     }
@@ -10494,7 +10661,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getServiceWithMaxAndMaxAttributes_MaxAttributes() {
-        return (EAttribute)getServiceWithMaxAndMaxAttributes().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getServiceWithMaxAndMaxAttributes().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -10504,8 +10671,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getServiceWithMaxAndModify() {
-        if (serviceWithMaxAndModifyEClass == null) {
-            serviceWithMaxAndModifyEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(160);
+        if( serviceWithMaxAndModifyEClass == null ) {
+            serviceWithMaxAndModifyEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 160 );
         }
         return serviceWithMaxAndModifyEClass;
     }
@@ -10517,7 +10685,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getServiceWithMaxAndModify_Modify() {
-        return (EAttribute)getServiceWithMaxAndModify().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getServiceWithMaxAndModify().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -10527,8 +10695,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getServiceForConfDataSet() {
-        if (serviceForConfDataSetEClass == null) {
-            serviceForConfDataSetEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(161);
+        if( serviceForConfDataSetEClass == null ) {
+            serviceForConfDataSetEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 161 );
         }
         return serviceForConfDataSetEClass;
     }
@@ -10540,7 +10709,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getServiceForConfDataSet_Modify() {
-        return (EAttribute)getServiceForConfDataSet().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getServiceForConfDataSet().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -10550,8 +10719,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getCert() {
-        if (certEClass == null) {
-            certEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(162);
+        if( certEClass == null ) {
+            certEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 162 );
         }
         return certEClass;
     }
@@ -10563,7 +10733,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getCert_CommonName() {
-        return (EAttribute)getCert().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getCert().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -10573,7 +10743,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getCert_IdHierarchy() {
-        return (EAttribute)getCert().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getCert().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -10583,8 +10753,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getValueWithUnit() {
-        if (valueWithUnitEClass == null) {
-            valueWithUnitEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(163);
+        if( valueWithUnitEClass == null ) {
+            valueWithUnitEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 163 );
         }
         return valueWithUnitEClass;
     }
@@ -10596,7 +10767,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getValueWithUnit_Value() {
-        return (EAttribute)getValueWithUnit().getEStructuralFeatures().get(0);
+        return ( EAttribute ) getValueWithUnit().getEStructuralFeatures().get( 0 );
     }
 
     /**
@@ -10606,7 +10777,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getValueWithUnit_Multiplier() {
-        return (EAttribute)getValueWithUnit().getEStructuralFeatures().get(1);
+        return ( EAttribute ) getValueWithUnit().getEStructuralFeatures().get( 1 );
     }
 
     /**
@@ -10616,7 +10787,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EAttribute getValueWithUnit_Unit() {
-        return (EAttribute)getValueWithUnit().getEStructuralFeatures().get(2);
+        return ( EAttribute ) getValueWithUnit().getEStructuralFeatures().get( 2 );
     }
 
     /**
@@ -10626,8 +10797,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EClass getDurationInSec() {
-        if (durationInSecEClass == null) {
-            durationInSecEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(164);
+        if( durationInSecEClass == null ) {
+            durationInSecEClass = ( EClass ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 164 );
         }
         return durationInSecEClass;
     }
@@ -10639,8 +10811,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EEnum getAssociationKindEnum() {
-        if (associationKindEnumEEnum == null) {
-            associationKindEnumEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(139);
+        if( associationKindEnumEEnum == null ) {
+            associationKindEnumEEnum = ( EEnum ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 139 );
         }
         return associationKindEnumEEnum;
     }
@@ -10652,8 +10825,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EEnum getFCEnum() {
-        if (fcEnumEEnum == null) {
-            fcEnumEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(140);
+        if( fcEnumEEnum == null ) {
+            fcEnumEEnum = ( EEnum ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 140 );
         }
         return fcEnumEEnum;
     }
@@ -10665,8 +10839,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EEnum getGSEControlTypeEnum() {
-        if (gseControlTypeEnumEEnum == null) {
-            gseControlTypeEnumEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(141);
+        if( gseControlTypeEnumEEnum == null ) {
+            gseControlTypeEnumEEnum = ( EEnum ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 141 );
         }
         return gseControlTypeEnumEEnum;
     }
@@ -10678,8 +10853,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EEnum getPhaseEnum() {
-        if (phaseEnumEEnum == null) {
-            phaseEnumEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(142);
+        if( phaseEnumEEnum == null ) {
+            phaseEnumEEnum = ( EEnum ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 142 );
         }
         return phaseEnumEEnum;
     }
@@ -10691,8 +10867,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EEnum getPredefinedTypeOfSecurityEnum() {
-        if (predefinedTypeOfSecurityEnumEEnum == null) {
-            predefinedTypeOfSecurityEnumEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(143);
+        if( predefinedTypeOfSecurityEnumEEnum == null ) {
+            predefinedTypeOfSecurityEnumEEnum = ( EEnum ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 143 );
         }
         return predefinedTypeOfSecurityEnumEEnum;
     }
@@ -10704,8 +10881,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EEnum getSMVDeliveryEnum() {
-        if (smvDeliveryEnumEEnum == null) {
-            smvDeliveryEnumEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(144);
+        if( smvDeliveryEnumEEnum == null ) {
+            smvDeliveryEnumEEnum = ( EEnum ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 144 );
         }
         return smvDeliveryEnumEEnum;
     }
@@ -10717,8 +10895,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EEnum getServiceSettingsEnum() {
-        if (serviceSettingsEnumEEnum == null) {
-            serviceSettingsEnumEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(145);
+        if( serviceSettingsEnumEEnum == null ) {
+            serviceSettingsEnumEEnum = ( EEnum ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 145 );
         }
         return serviceSettingsEnumEEnum;
     }
@@ -10730,8 +10909,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EEnum getServiceSettingsNoDynEnum() {
-        if (serviceSettingsNoDynEnumEEnum == null) {
-            serviceSettingsNoDynEnumEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(146);
+        if( serviceSettingsNoDynEnumEEnum == null ) {
+            serviceSettingsNoDynEnumEEnum = ( EEnum ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 146 );
         }
         return serviceSettingsNoDynEnumEEnum;
     }
@@ -10743,8 +10923,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EEnum getServiceType() {
-        if (serviceTypeEEnum == null) {
-            serviceTypeEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(147);
+        if( serviceTypeEEnum == null ) {
+            serviceTypeEEnum = ( EEnum ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 147 );
         }
         return serviceTypeEEnum;
     }
@@ -10756,8 +10937,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EEnum getSmpMod() {
-        if (smpModEEnum == null) {
-            smpModEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(148);
+        if( smpModEEnum == null ) {
+            smpModEEnum = ( EEnum ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 148 );
         }
         return smpModEEnum;
     }
@@ -10769,8 +10951,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EEnum getUnitMultiplierEnum() {
-        if (unitMultiplierEnumEEnum == null) {
-            unitMultiplierEnumEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(149);
+        if( unitMultiplierEnumEEnum == null ) {
+            unitMultiplierEnumEEnum = ( EEnum ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI )
+                    .getEClassifiers().get( 149 );
         }
         return unitMultiplierEnumEEnum;
     }
@@ -10782,8 +10965,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EEnum getValKindEnum() {
-        if (valKindEnumEEnum == null) {
-            valKindEnumEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(150);
+        if( valKindEnumEEnum == null ) {
+            valKindEnumEEnum = ( EEnum ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 150 );
         }
         return valKindEnumEEnum;
     }
@@ -10795,8 +10979,9 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public EEnum getbufModeEnum() {
-        if (bufModeEnumEEnum == null) {
-            bufModeEnumEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(SclPackage.eNS_URI).getEClassifiers().get(151);
+        if( bufModeEnumEEnum == null ) {
+            bufModeEnumEEnum = ( EEnum ) EPackage.Registry.INSTANCE.getEPackage( SclPackage.eNS_URI ).getEClassifiers()
+                    .get( 151 );
         }
         return bufModeEnumEEnum;
     }
@@ -10808,7 +10993,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     public SclFactory getSclFactory() {
-        return (SclFactory)getEFactoryInstance();
+        return ( SclFactory ) getEFactoryInstance();
     }
 
     /**
@@ -10825,23 +11010,23 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      * @generated
      */
     public void loadPackage() {
-        if (isLoaded) return;
+        if( isLoaded ) return;
         isLoaded = true;
 
-        URL url = getClass().getResource(packageFilename);
-        if (url == null) {
-            throw new RuntimeException("Missing serialized package: " + packageFilename);
+        URL url = getClass().getResource( packageFilename );
+        if( url == null ) {
+            throw new RuntimeException( "Missing serialized package: " + packageFilename );
         }
-        URI uri = URI.createURI(url.toString());
-        Resource resource = new EcoreResourceFactoryImpl().createResource(uri);
+        URI uri = URI.createURI( url.toString() );
+        Resource resource = new EcoreResourceFactoryImpl().createResource( uri );
         try {
-            resource.load(null);
+            resource.load( null );
         }
-        catch (IOException exception) {
-            throw new WrappedException(exception);
+        catch( IOException exception ) {
+            throw new WrappedException( exception );
         }
-        initializeFromLoadedEPackage(this, (EPackage)resource.getContents().get(0));
-        createResource(eNS_URI);
+        initializeFromLoadedEPackage( this, ( EPackage ) resource.getContents().get( 0 ) );
+        createResource( eNS_URI );
     }
 
     /**
@@ -10858,7 +11043,7 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      * @generated
      */
     public void fixPackageContents() {
-        if (isFixed) return;
+        if( isFixed ) return;
         isFixed = true;
         fixEClassifiers();
     }
@@ -10871,9 +11056,10 @@ public class SclPackageImpl extends EPackageImpl implements SclPackage {
      */
     @Override
     protected void fixInstanceClass( EClassifier eClassifier ) {
-        if (eClassifier.getInstanceClassName() == null) {
-            eClassifier.setInstanceClassName("fr.centralesupelec.edf.riseclipse.iec61850.scl." + eClassifier.getName());
-            setGeneratedClassName(eClassifier);
+        if( eClassifier.getInstanceClassName() == null ) {
+            eClassifier
+                    .setInstanceClassName( "fr.centralesupelec.edf.riseclipse.iec61850.scl." + eClassifier.getName() );
+            setGeneratedClassName( eClassifier );
         }
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SecPerSamplesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SecPerSamplesImpl.java
index 856ac67..f0b8e8a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SecPerSamplesImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SecPerSamplesImpl.java
@@ -103,11 +103,12 @@ public class SecPerSamplesImpl extends SclObjectImpl implements SecPerSamples {
      * @generated
      */
     @Override
-    public void setValue(Integer newValue) {
+    public void setValue( Integer newValue ) {
         Integer oldValue = value;
         value = newValue;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SEC_PER_SAMPLES__VALUE, oldValue, value));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SEC_PER_SAMPLES__VALUE, oldValue,
+                    value ) );
     }
 
     /**
@@ -117,8 +118,8 @@ public class SecPerSamplesImpl extends SclObjectImpl implements SecPerSamples {
      */
     @Override
     public SMVSettings getParentSMVSettings() {
-        if (eContainerFeatureID() != SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS) return null;
-        return (SMVSettings)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS ) return null;
+        return ( SMVSettings ) eInternalContainer();
     }
 
     /**
@@ -126,8 +127,9 @@ public class SecPerSamplesImpl extends SclObjectImpl implements SecPerSamples {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSMVSettings(SMVSettings newParentSMVSettings, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSMVSettings, SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS, msgs);
+    public NotificationChain basicSetParentSMVSettings( SMVSettings newParentSMVSettings, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSMVSettings,
+                SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS, msgs );
         return msgs;
     }
 
@@ -137,20 +139,24 @@ public class SecPerSamplesImpl extends SclObjectImpl implements SecPerSamples {
      * @generated
      */
     @Override
-    public void setParentSMVSettings(SMVSettings newParentSMVSettings) {
-        if (newParentSMVSettings != eInternalContainer() || (eContainerFeatureID() != SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS && newParentSMVSettings != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSMVSettings))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSMVSettings( SMVSettings newParentSMVSettings ) {
+        if( newParentSMVSettings != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS
+                        && newParentSMVSettings != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSMVSettings ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSMVSettings != null)
-                msgs = ((InternalEObject)newParentSMVSettings).eInverseAdd(this, SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES, SMVSettings.class, msgs);
-            msgs = basicSetParentSMVSettings(newParentSMVSettings, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSMVSettings != null )
+                msgs = ( ( InternalEObject ) newParentSMVSettings ).eInverseAdd( this,
+                        SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES, SMVSettings.class, msgs );
+            msgs = basicSetParentSMVSettings( newParentSMVSettings, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS, newParentSMVSettings, newParentSMVSettings));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS,
+                    newParentSMVSettings, newParentSMVSettings ) );
     }
 
     /**
@@ -159,14 +165,14 @@ public class SecPerSamplesImpl extends SclObjectImpl implements SecPerSamples {
      * @generated
      */
     @Override
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSMVSettings((SMVSettings)otherEnd, msgs);
+    public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSMVSettings( ( SMVSettings ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -175,12 +181,12 @@ public class SecPerSamplesImpl extends SclObjectImpl implements SecPerSamples {
      * @generated
      */
     @Override
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS:
-                return basicSetParentSMVSettings(null, msgs);
+    public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS:
+            return basicSetParentSMVSettings( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -189,12 +195,13 @@ public class SecPerSamplesImpl extends SclObjectImpl implements SecPerSamples {
      * @generated
      */
     @Override
-    public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES, SMVSettings.class, msgs);
+    public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SMV_SETTINGS__SEC_PER_SAMPLES,
+                    SMVSettings.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -203,14 +210,14 @@ public class SecPerSamplesImpl extends SclObjectImpl implements SecPerSamples {
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.SEC_PER_SAMPLES__VALUE:
-                return getValue();
-            case SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS:
-                return getParentSMVSettings();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.SEC_PER_SAMPLES__VALUE:
+            return getValue();
+        case SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS:
+            return getParentSMVSettings();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -219,16 +226,16 @@ public class SecPerSamplesImpl extends SclObjectImpl implements SecPerSamples {
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.SEC_PER_SAMPLES__VALUE:
-                setValue((Integer)newValue);
-                return;
-            case SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS:
-                setParentSMVSettings((SMVSettings)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.SEC_PER_SAMPLES__VALUE:
+            setValue( ( Integer ) newValue );
+            return;
+        case SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS:
+            setParentSMVSettings( ( SMVSettings ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -237,16 +244,16 @@ public class SecPerSamplesImpl extends SclObjectImpl implements SecPerSamples {
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.SEC_PER_SAMPLES__VALUE:
-                setValue(VALUE_EDEFAULT);
-                return;
-            case SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS:
-                setParentSMVSettings((SMVSettings)null);
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SEC_PER_SAMPLES__VALUE:
+            setValue( VALUE_EDEFAULT );
+            return;
+        case SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS:
+            setParentSMVSettings( ( SMVSettings ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -255,14 +262,14 @@ public class SecPerSamplesImpl extends SclObjectImpl implements SecPerSamples {
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.SEC_PER_SAMPLES__VALUE:
-                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-            case SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS:
-                return getParentSMVSettings() != null;
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SEC_PER_SAMPLES__VALUE:
+            return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals( value );
+        case SclPackage.SEC_PER_SAMPLES__PARENT_SMV_SETTINGS:
+            return getParentSMVSettings() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -272,12 +279,12 @@ public class SecPerSamplesImpl extends SclObjectImpl implements SecPerSamples {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (value: ");
-        result.append(value);
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (value: " );
+        result.append( value );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java
index ef02a30..91e799d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java
@@ -139,8 +139,9 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
         apName = newApName;
         boolean oldApNameESet = apNameESet;
         apNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVER_AT__AP_NAME, oldApName, apName, !oldApNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVER_AT__AP_NAME, oldApName, apName,
+                    !oldApNameESet ) );
     }
 
     /**
@@ -154,8 +155,9 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
         boolean oldApNameESet = apNameESet;
         apName = AP_NAME_EDEFAULT;
         apNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVER_AT__AP_NAME, oldApName, AP_NAME_EDEFAULT, oldApNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVER_AT__AP_NAME, oldApName,
+                    AP_NAME_EDEFAULT, oldApNameESet ) );
     }
 
     /**
@@ -175,8 +177,8 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      */
     @Override
     public AccessPoint getParentAccessPoint() {
-        if (eContainerFeatureID() != SclPackage.SERVER_AT__PARENT_ACCESS_POINT) return null;
-        return (AccessPoint)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SERVER_AT__PARENT_ACCESS_POINT ) return null;
+        return ( AccessPoint ) eInternalContainer();
     }
 
     /**
@@ -184,8 +186,9 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAccessPoint(AccessPoint newParentAccessPoint, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAccessPoint, SclPackage.SERVER_AT__PARENT_ACCESS_POINT, msgs);
+    public NotificationChain basicSetParentAccessPoint( AccessPoint newParentAccessPoint, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAccessPoint, SclPackage.SERVER_AT__PARENT_ACCESS_POINT,
+                msgs );
         return msgs;
     }
 
@@ -195,20 +198,24 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      * @generated
      */
     @Override
-    public void setParentAccessPoint(AccessPoint newParentAccessPoint) {
-        if (newParentAccessPoint != eInternalContainer() || (eContainerFeatureID() != SclPackage.SERVER_AT__PARENT_ACCESS_POINT && newParentAccessPoint != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAccessPoint))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAccessPoint( AccessPoint newParentAccessPoint ) {
+        if( newParentAccessPoint != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SERVER_AT__PARENT_ACCESS_POINT
+                        && newParentAccessPoint != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAccessPoint ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAccessPoint != null)
-                msgs = ((InternalEObject)newParentAccessPoint).eInverseAdd(this, SclPackage.ACCESS_POINT__SERVER_AT, AccessPoint.class, msgs);
-            msgs = basicSetParentAccessPoint(newParentAccessPoint, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAccessPoint != null )
+                msgs = ( ( InternalEObject ) newParentAccessPoint ).eInverseAdd( this,
+                        SclPackage.ACCESS_POINT__SERVER_AT, AccessPoint.class, msgs );
+            msgs = basicSetParentAccessPoint( newParentAccessPoint, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVER_AT__PARENT_ACCESS_POINT, newParentAccessPoint, newParentAccessPoint));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVER_AT__PARENT_ACCESS_POINT,
+                    newParentAccessPoint, newParentAccessPoint ) );
     }
 
     /**
@@ -226,14 +233,19 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToAccessPoint(AccessPoint newRefersToAccessPoint, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToAccessPoint( AccessPoint newRefersToAccessPoint, NotificationChain msgs ) {
         AccessPoint oldRefersToAccessPoint = refersToAccessPoint;
         refersToAccessPoint = newRefersToAccessPoint;
         boolean oldRefersToAccessPointESet = refersToAccessPointESet;
         refersToAccessPointESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT, oldRefersToAccessPoint, newRefersToAccessPoint, !oldRefersToAccessPointESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT, oldRefersToAccessPoint, newRefersToAccessPoint,
+                    !oldRefersToAccessPointESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -244,21 +256,24 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      * @generated
      */
     @Override
-    public void setRefersToAccessPoint(AccessPoint newRefersToAccessPoint) {
-        if (newRefersToAccessPoint != refersToAccessPoint) {
+    public void setRefersToAccessPoint( AccessPoint newRefersToAccessPoint ) {
+        if( newRefersToAccessPoint != refersToAccessPoint ) {
             NotificationChain msgs = null;
-            if (refersToAccessPoint != null)
-                msgs = ((InternalEObject)refersToAccessPoint).eInverseRemove(this, SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT, AccessPoint.class, msgs);
-            if (newRefersToAccessPoint != null)
-                msgs = ((InternalEObject)newRefersToAccessPoint).eInverseAdd(this, SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT, AccessPoint.class, msgs);
-            msgs = basicSetRefersToAccessPoint(newRefersToAccessPoint, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToAccessPoint != null )
+                msgs = ( ( InternalEObject ) refersToAccessPoint ).eInverseRemove( this,
+                        SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT, AccessPoint.class, msgs );
+            if( newRefersToAccessPoint != null )
+                msgs = ( ( InternalEObject ) newRefersToAccessPoint ).eInverseAdd( this,
+                        SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT, AccessPoint.class, msgs );
+            msgs = basicSetRefersToAccessPoint( newRefersToAccessPoint, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAccessPointESet = refersToAccessPointESet;
             refersToAccessPointESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT, newRefersToAccessPoint, newRefersToAccessPoint, !oldRefersToAccessPointESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT,
+                        newRefersToAccessPoint, newRefersToAccessPoint, !oldRefersToAccessPointESet ) );
         }
     }
 
@@ -267,14 +282,19 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToAccessPoint(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToAccessPoint( NotificationChain msgs ) {
         AccessPoint oldRefersToAccessPoint = refersToAccessPoint;
         refersToAccessPoint = null;
         boolean oldRefersToAccessPointESet = refersToAccessPointESet;
         refersToAccessPointESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT, oldRefersToAccessPoint, null, oldRefersToAccessPointESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT, oldRefersToAccessPoint, null,
+                    oldRefersToAccessPointESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -286,17 +306,19 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      */
     @Override
     public void unsetRefersToAccessPoint() {
-        if (refersToAccessPoint != null) {
+        if( refersToAccessPoint != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToAccessPoint).eInverseRemove(this, SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT, AccessPoint.class, msgs);
-            msgs = basicUnsetRefersToAccessPoint(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToAccessPoint ).eInverseRemove( this,
+                    SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT, AccessPoint.class, msgs );
+            msgs = basicUnsetRefersToAccessPoint( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToAccessPointESet = refersToAccessPointESet;
             refersToAccessPointESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT, null, null, oldRefersToAccessPointESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT,
+                        null, null, oldRefersToAccessPointESet ) );
         }
     }
 
@@ -317,17 +339,18 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SERVER_AT__PARENT_ACCESS_POINT:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAccessPoint((AccessPoint)otherEnd, msgs);
-            case SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT:
-                if (refersToAccessPoint != null)
-                    msgs = ((InternalEObject)refersToAccessPoint).eInverseRemove(this, SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT, AccessPoint.class, msgs);
-                return basicSetRefersToAccessPoint((AccessPoint)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SERVER_AT__PARENT_ACCESS_POINT:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAccessPoint( ( AccessPoint ) otherEnd, msgs );
+        case SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT:
+            if( refersToAccessPoint != null )
+                msgs = ( ( InternalEObject ) refersToAccessPoint ).eInverseRemove( this,
+                        SclPackage.ACCESS_POINT__REFERRED_BY_SERVER_AT, AccessPoint.class, msgs );
+            return basicSetRefersToAccessPoint( ( AccessPoint ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -337,13 +360,13 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SERVER_AT__PARENT_ACCESS_POINT:
-                return basicSetParentAccessPoint(null, msgs);
-            case SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT:
-                return basicUnsetRefersToAccessPoint(msgs);
+        switch( featureID ) {
+        case SclPackage.SERVER_AT__PARENT_ACCESS_POINT:
+            return basicSetParentAccessPoint( null, msgs );
+        case SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT:
+            return basicUnsetRefersToAccessPoint( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -353,11 +376,12 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SERVER_AT__PARENT_ACCESS_POINT:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ACCESS_POINT__SERVER_AT, AccessPoint.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SERVER_AT__PARENT_ACCESS_POINT:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ACCESS_POINT__SERVER_AT, AccessPoint.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -367,15 +391,15 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SERVER_AT__AP_NAME:
-                return getApName();
-            case SclPackage.SERVER_AT__PARENT_ACCESS_POINT:
-                return getParentAccessPoint();
-            case SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT:
-                return getRefersToAccessPoint();
+        switch( featureID ) {
+        case SclPackage.SERVER_AT__AP_NAME:
+            return getApName();
+        case SclPackage.SERVER_AT__PARENT_ACCESS_POINT:
+            return getParentAccessPoint();
+        case SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT:
+            return getRefersToAccessPoint();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -385,18 +409,18 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SERVER_AT__AP_NAME:
-                setApName((String)newValue);
-                return;
-            case SclPackage.SERVER_AT__PARENT_ACCESS_POINT:
-                setParentAccessPoint((AccessPoint)newValue);
-                return;
-            case SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT:
-                setRefersToAccessPoint((AccessPoint)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SERVER_AT__AP_NAME:
+            setApName( ( String ) newValue );
+            return;
+        case SclPackage.SERVER_AT__PARENT_ACCESS_POINT:
+            setParentAccessPoint( ( AccessPoint ) newValue );
+            return;
+        case SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT:
+            setRefersToAccessPoint( ( AccessPoint ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -406,18 +430,18 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SERVER_AT__AP_NAME:
-                unsetApName();
-                return;
-            case SclPackage.SERVER_AT__PARENT_ACCESS_POINT:
-                setParentAccessPoint((AccessPoint)null);
-                return;
-            case SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT:
-                unsetRefersToAccessPoint();
-                return;
+        switch( featureID ) {
+        case SclPackage.SERVER_AT__AP_NAME:
+            unsetApName();
+            return;
+        case SclPackage.SERVER_AT__PARENT_ACCESS_POINT:
+            setParentAccessPoint( ( AccessPoint ) null );
+            return;
+        case SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT:
+            unsetRefersToAccessPoint();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -427,15 +451,15 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SERVER_AT__AP_NAME:
-                return isSetApName();
-            case SclPackage.SERVER_AT__PARENT_ACCESS_POINT:
-                return getParentAccessPoint() != null;
-            case SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT:
-                return isSetRefersToAccessPoint();
+        switch( featureID ) {
+        case SclPackage.SERVER_AT__AP_NAME:
+            return isSetApName();
+        case SclPackage.SERVER_AT__PARENT_ACCESS_POINT:
+            return getParentAccessPoint() != null;
+        case SclPackage.SERVER_AT__REFERS_TO_ACCESS_POINT:
+            return isSetRefersToAccessPoint();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -445,12 +469,15 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (apName: ");
-        if (apNameESet) result.append(apName); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (apName: " );
+        if( apNameESet )
+            result.append( apName );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -458,10 +485,10 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
     protected void doBuildExplicitLinks( IRiseClipseConsole console ) {
         // see Issue #13
         super.doBuildExplicitLinks( console );
-        
+
         String messagePrefix = "[SCL links] while resolving link from ServerAt on line " + getLineNumber() + ": ";
-        
-        if(( getApName() == null ) || getApName().isEmpty() ) {
+
+        if( ( getApName() == null ) || getApName().isEmpty() ) {
             console.warning( messagePrefix, "apName is missing" );
             return;
         }
@@ -477,7 +504,8 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt {
             return;
         }
         setRefersToAccessPoint( ap.getLeft() );
-        console.info( "[SCL links] ServerAt on line ", getLineNumber(), " refers to ", mess, " on line ", getRefersToAccessPoint().getLineNumber() );
+        console.info( "[SCL links] ServerAt on line ", getLineNumber(), " refers to ", mess, " on line ",
+                getRefersToAccessPoint().getLineNumber() );
     }
 
 } //ServerAtImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerImpl.java
index 5860baa..b90b70e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerImpl.java
@@ -93,7 +93,7 @@ public class ServerImpl extends UnNamingImpl implements Server {
      * @generated
      * @ordered
      */
-    protected EList<Association> association;
+    protected EList< Association > association;
 
     /**
      * The cached value of the '{@link #getAuthentication() <em>Authentication</em>}' containment reference.
@@ -122,7 +122,7 @@ public class ServerImpl extends UnNamingImpl implements Server {
      * @generated
      * @ordered
      */
-    protected EList<LDevice> lDevice;
+    protected EList< LDevice > lDevice;
 
     /**
      * <!-- begin-user-doc -->
@@ -164,8 +164,9 @@ public class ServerImpl extends UnNamingImpl implements Server {
         timeout = newTimeout;
         boolean oldTimeoutESet = timeoutESet;
         timeoutESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVER__TIMEOUT, oldTimeout, timeout, !oldTimeoutESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVER__TIMEOUT, oldTimeout, timeout,
+                    !oldTimeoutESet ) );
     }
 
     /**
@@ -179,8 +180,9 @@ public class ServerImpl extends UnNamingImpl implements Server {
         boolean oldTimeoutESet = timeoutESet;
         timeout = TIMEOUT_EDEFAULT;
         timeoutESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVER__TIMEOUT, oldTimeout, TIMEOUT_EDEFAULT, oldTimeoutESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVER__TIMEOUT, oldTimeout,
+                    TIMEOUT_EDEFAULT, oldTimeoutESet ) );
     }
 
     /**
@@ -200,8 +202,8 @@ public class ServerImpl extends UnNamingImpl implements Server {
      */
     @Override
     public AccessPoint getParentAccessPoint() {
-        if (eContainerFeatureID() != SclPackage.SERVER__PARENT_ACCESS_POINT) return null;
-        return (AccessPoint)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SERVER__PARENT_ACCESS_POINT ) return null;
+        return ( AccessPoint ) eInternalContainer();
     }
 
     /**
@@ -209,8 +211,9 @@ public class ServerImpl extends UnNamingImpl implements Server {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAccessPoint(AccessPoint newParentAccessPoint, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAccessPoint, SclPackage.SERVER__PARENT_ACCESS_POINT, msgs);
+    public NotificationChain basicSetParentAccessPoint( AccessPoint newParentAccessPoint, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAccessPoint, SclPackage.SERVER__PARENT_ACCESS_POINT,
+                msgs );
         return msgs;
     }
 
@@ -220,20 +223,24 @@ public class ServerImpl extends UnNamingImpl implements Server {
      * @generated
      */
     @Override
-    public void setParentAccessPoint(AccessPoint newParentAccessPoint) {
-        if (newParentAccessPoint != eInternalContainer() || (eContainerFeatureID() != SclPackage.SERVER__PARENT_ACCESS_POINT && newParentAccessPoint != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAccessPoint))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAccessPoint( AccessPoint newParentAccessPoint ) {
+        if( newParentAccessPoint != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SERVER__PARENT_ACCESS_POINT
+                        && newParentAccessPoint != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAccessPoint ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAccessPoint != null)
-                msgs = ((InternalEObject)newParentAccessPoint).eInverseAdd(this, SclPackage.ACCESS_POINT__SERVER, AccessPoint.class, msgs);
-            msgs = basicSetParentAccessPoint(newParentAccessPoint, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAccessPoint != null )
+                msgs = ( ( InternalEObject ) newParentAccessPoint ).eInverseAdd( this, SclPackage.ACCESS_POINT__SERVER,
+                        AccessPoint.class, msgs );
+            msgs = basicSetParentAccessPoint( newParentAccessPoint, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVER__PARENT_ACCESS_POINT, newParentAccessPoint, newParentAccessPoint));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVER__PARENT_ACCESS_POINT,
+                    newParentAccessPoint, newParentAccessPoint ) );
     }
 
     /**
@@ -242,9 +249,10 @@ public class ServerImpl extends UnNamingImpl implements Server {
      * @generated
      */
     @Override
-    public EList<Association> getAssociation() {
-        if (association == null) {
-            association = new EObjectContainmentWithInverseEList.Unsettable<Association>(Association.class, this, SclPackage.SERVER__ASSOCIATION, SclPackage.ASSOCIATION__PARENT_SERVER);
+    public EList< Association > getAssociation() {
+        if( association == null ) {
+            association = new EObjectContainmentWithInverseEList.Unsettable< Association >( Association.class, this,
+                    SclPackage.SERVER__ASSOCIATION, SclPackage.ASSOCIATION__PARENT_SERVER );
         }
         return association;
     }
@@ -256,7 +264,7 @@ public class ServerImpl extends UnNamingImpl implements Server {
      */
     @Override
     public void unsetAssociation() {
-        if (association != null) ((InternalEList.Unsettable<?>)association).unset();
+        if( association != null ) ( ( InternalEList.Unsettable< ? > ) association ).unset();
     }
 
     /**
@@ -266,7 +274,7 @@ public class ServerImpl extends UnNamingImpl implements Server {
      */
     @Override
     public boolean isSetAssociation() {
-        return association != null && ((InternalEList.Unsettable<?>)association).isSet();
+        return association != null && ( ( InternalEList.Unsettable< ? > ) association ).isSet();
     }
 
     /**
@@ -289,9 +297,13 @@ public class ServerImpl extends UnNamingImpl implements Server {
         authentication = newAuthentication;
         boolean oldAuthenticationESet = authenticationESet;
         authenticationESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVER__AUTHENTICATION, oldAuthentication, newAuthentication, !oldAuthenticationESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVER__AUTHENTICATION, oldAuthentication, newAuthentication, !oldAuthenticationESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -303,20 +315,23 @@ public class ServerImpl extends UnNamingImpl implements Server {
      */
     @Override
     public void setAuthentication( Authentication newAuthentication ) {
-        if (newAuthentication != authentication) {
+        if( newAuthentication != authentication ) {
             NotificationChain msgs = null;
-            if (authentication != null)
-                msgs = ((InternalEObject)authentication).eInverseRemove(this, SclPackage.AUTHENTICATION__PARENT_SERVER, Authentication.class, msgs);
-            if (newAuthentication != null)
-                msgs = ((InternalEObject)newAuthentication).eInverseAdd(this, SclPackage.AUTHENTICATION__PARENT_SERVER, Authentication.class, msgs);
-            msgs = basicSetAuthentication(newAuthentication, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( authentication != null )
+                msgs = ( ( InternalEObject ) authentication ).eInverseRemove( this,
+                        SclPackage.AUTHENTICATION__PARENT_SERVER, Authentication.class, msgs );
+            if( newAuthentication != null )
+                msgs = ( ( InternalEObject ) newAuthentication ).eInverseAdd( this,
+                        SclPackage.AUTHENTICATION__PARENT_SERVER, Authentication.class, msgs );
+            msgs = basicSetAuthentication( newAuthentication, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldAuthenticationESet = authenticationESet;
             authenticationESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVER__AUTHENTICATION, newAuthentication, newAuthentication, !oldAuthenticationESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVER__AUTHENTICATION,
+                        newAuthentication, newAuthentication, !oldAuthenticationESet ) );
         }
     }
 
@@ -330,9 +345,13 @@ public class ServerImpl extends UnNamingImpl implements Server {
         authentication = null;
         boolean oldAuthenticationESet = authenticationESet;
         authenticationESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVER__AUTHENTICATION, oldAuthentication, null, oldAuthenticationESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVER__AUTHENTICATION, oldAuthentication, null, oldAuthenticationESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -344,17 +363,19 @@ public class ServerImpl extends UnNamingImpl implements Server {
      */
     @Override
     public void unsetAuthentication() {
-        if (authentication != null) {
+        if( authentication != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)authentication).eInverseRemove(this, SclPackage.AUTHENTICATION__PARENT_SERVER, Authentication.class, msgs);
-            msgs = basicUnsetAuthentication(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) authentication ).eInverseRemove( this,
+                    SclPackage.AUTHENTICATION__PARENT_SERVER, Authentication.class, msgs );
+            msgs = basicUnsetAuthentication( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldAuthenticationESet = authenticationESet;
             authenticationESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVER__AUTHENTICATION, null, null, oldAuthenticationESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVER__AUTHENTICATION, null, null,
+                        oldAuthenticationESet ) );
         }
     }
 
@@ -374,9 +395,10 @@ public class ServerImpl extends UnNamingImpl implements Server {
      * @generated
      */
     @Override
-    public EList<LDevice> getLDevice() {
-        if (lDevice == null) {
-            lDevice = new EObjectContainmentWithInverseEList.Unsettable<LDevice>(LDevice.class, this, SclPackage.SERVER__LDEVICE, SclPackage.LDEVICE__PARENT_SERVER);
+    public EList< LDevice > getLDevice() {
+        if( lDevice == null ) {
+            lDevice = new EObjectContainmentWithInverseEList.Unsettable< LDevice >( LDevice.class, this,
+                    SclPackage.SERVER__LDEVICE, SclPackage.LDEVICE__PARENT_SERVER );
         }
         return lDevice;
     }
@@ -388,7 +410,7 @@ public class ServerImpl extends UnNamingImpl implements Server {
      */
     @Override
     public void unsetLDevice() {
-        if (lDevice != null) ((InternalEList.Unsettable<?>)lDevice).unset();
+        if( lDevice != null ) ( ( InternalEList.Unsettable< ? > ) lDevice ).unset();
     }
 
     /**
@@ -398,7 +420,7 @@ public class ServerImpl extends UnNamingImpl implements Server {
      */
     @Override
     public boolean isSetLDevice() {
-        return lDevice != null && ((InternalEList.Unsettable<?>)lDevice).isSet();
+        return lDevice != null && ( ( InternalEList.Unsettable< ? > ) lDevice ).isSet();
     }
 
     /**
@@ -409,21 +431,24 @@ public class ServerImpl extends UnNamingImpl implements Server {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SERVER__PARENT_ACCESS_POINT:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAccessPoint((AccessPoint)otherEnd, msgs);
-            case SclPackage.SERVER__ASSOCIATION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getAssociation()).basicAdd(otherEnd, msgs);
-            case SclPackage.SERVER__AUTHENTICATION:
-                if (authentication != null)
-                    msgs = ((InternalEObject)authentication).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVER__AUTHENTICATION, null, msgs);
-                return basicSetAuthentication((Authentication)otherEnd, msgs);
-            case SclPackage.SERVER__LDEVICE:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getLDevice()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SERVER__PARENT_ACCESS_POINT:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAccessPoint( ( AccessPoint ) otherEnd, msgs );
+        case SclPackage.SERVER__ASSOCIATION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getAssociation() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.SERVER__AUTHENTICATION:
+            if( authentication != null )
+                msgs = ( ( InternalEObject ) authentication ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVER__AUTHENTICATION, null, msgs );
+            return basicSetAuthentication( ( Authentication ) otherEnd, msgs );
+        case SclPackage.SERVER__LDEVICE:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getLDevice() ).basicAdd( otherEnd,
+                    msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -433,17 +458,17 @@ public class ServerImpl extends UnNamingImpl implements Server {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SERVER__PARENT_ACCESS_POINT:
-                return basicSetParentAccessPoint(null, msgs);
-            case SclPackage.SERVER__ASSOCIATION:
-                return ((InternalEList<?>)getAssociation()).basicRemove(otherEnd, msgs);
-            case SclPackage.SERVER__AUTHENTICATION:
-                return basicUnsetAuthentication(msgs);
-            case SclPackage.SERVER__LDEVICE:
-                return ((InternalEList<?>)getLDevice()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SERVER__PARENT_ACCESS_POINT:
+            return basicSetParentAccessPoint( null, msgs );
+        case SclPackage.SERVER__ASSOCIATION:
+            return ( ( InternalEList< ? > ) getAssociation() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SERVER__AUTHENTICATION:
+            return basicUnsetAuthentication( msgs );
+        case SclPackage.SERVER__LDEVICE:
+            return ( ( InternalEList< ? > ) getLDevice() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -453,11 +478,12 @@ public class ServerImpl extends UnNamingImpl implements Server {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SERVER__PARENT_ACCESS_POINT:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ACCESS_POINT__SERVER, AccessPoint.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SERVER__PARENT_ACCESS_POINT:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ACCESS_POINT__SERVER, AccessPoint.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -467,19 +493,19 @@ public class ServerImpl extends UnNamingImpl implements Server {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SERVER__TIMEOUT:
-                return getTimeout();
-            case SclPackage.SERVER__PARENT_ACCESS_POINT:
-                return getParentAccessPoint();
-            case SclPackage.SERVER__ASSOCIATION:
-                return getAssociation();
-            case SclPackage.SERVER__AUTHENTICATION:
-                return getAuthentication();
-            case SclPackage.SERVER__LDEVICE:
-                return getLDevice();
+        switch( featureID ) {
+        case SclPackage.SERVER__TIMEOUT:
+            return getTimeout();
+        case SclPackage.SERVER__PARENT_ACCESS_POINT:
+            return getParentAccessPoint();
+        case SclPackage.SERVER__ASSOCIATION:
+            return getAssociation();
+        case SclPackage.SERVER__AUTHENTICATION:
+            return getAuthentication();
+        case SclPackage.SERVER__LDEVICE:
+            return getLDevice();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -490,26 +516,26 @@ public class ServerImpl extends UnNamingImpl implements Server {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SERVER__TIMEOUT:
-                setTimeout((Integer)newValue);
-                return;
-            case SclPackage.SERVER__PARENT_ACCESS_POINT:
-                setParentAccessPoint((AccessPoint)newValue);
-                return;
-            case SclPackage.SERVER__ASSOCIATION:
-                getAssociation().clear();
-                getAssociation().addAll((Collection<? extends Association>)newValue);
-                return;
-            case SclPackage.SERVER__AUTHENTICATION:
-                setAuthentication((Authentication)newValue);
-                return;
-            case SclPackage.SERVER__LDEVICE:
-                getLDevice().clear();
-                getLDevice().addAll((Collection<? extends LDevice>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SERVER__TIMEOUT:
+            setTimeout( ( Integer ) newValue );
+            return;
+        case SclPackage.SERVER__PARENT_ACCESS_POINT:
+            setParentAccessPoint( ( AccessPoint ) newValue );
+            return;
+        case SclPackage.SERVER__ASSOCIATION:
+            getAssociation().clear();
+            getAssociation().addAll( ( Collection< ? extends Association > ) newValue );
+            return;
+        case SclPackage.SERVER__AUTHENTICATION:
+            setAuthentication( ( Authentication ) newValue );
+            return;
+        case SclPackage.SERVER__LDEVICE:
+            getLDevice().clear();
+            getLDevice().addAll( ( Collection< ? extends LDevice > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -519,24 +545,24 @@ public class ServerImpl extends UnNamingImpl implements Server {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SERVER__TIMEOUT:
-                unsetTimeout();
-                return;
-            case SclPackage.SERVER__PARENT_ACCESS_POINT:
-                setParentAccessPoint((AccessPoint)null);
-                return;
-            case SclPackage.SERVER__ASSOCIATION:
-                unsetAssociation();
-                return;
-            case SclPackage.SERVER__AUTHENTICATION:
-                unsetAuthentication();
-                return;
-            case SclPackage.SERVER__LDEVICE:
-                unsetLDevice();
-                return;
+        switch( featureID ) {
+        case SclPackage.SERVER__TIMEOUT:
+            unsetTimeout();
+            return;
+        case SclPackage.SERVER__PARENT_ACCESS_POINT:
+            setParentAccessPoint( ( AccessPoint ) null );
+            return;
+        case SclPackage.SERVER__ASSOCIATION:
+            unsetAssociation();
+            return;
+        case SclPackage.SERVER__AUTHENTICATION:
+            unsetAuthentication();
+            return;
+        case SclPackage.SERVER__LDEVICE:
+            unsetLDevice();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -546,19 +572,19 @@ public class ServerImpl extends UnNamingImpl implements Server {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SERVER__TIMEOUT:
-                return isSetTimeout();
-            case SclPackage.SERVER__PARENT_ACCESS_POINT:
-                return getParentAccessPoint() != null;
-            case SclPackage.SERVER__ASSOCIATION:
-                return isSetAssociation();
-            case SclPackage.SERVER__AUTHENTICATION:
-                return isSetAuthentication();
-            case SclPackage.SERVER__LDEVICE:
-                return isSetLDevice();
+        switch( featureID ) {
+        case SclPackage.SERVER__TIMEOUT:
+            return isSetTimeout();
+        case SclPackage.SERVER__PARENT_ACCESS_POINT:
+            return getParentAccessPoint() != null;
+        case SclPackage.SERVER__ASSOCIATION:
+            return isSetAssociation();
+        case SclPackage.SERVER__AUTHENTICATION:
+            return isSetAuthentication();
+        case SclPackage.SERVER__LDEVICE:
+            return isSetLDevice();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -568,12 +594,15 @@ public class ServerImpl extends UnNamingImpl implements Server {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (timeout: ");
-        if (timeoutESet) result.append(timeout); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (timeout: " );
+        if( timeoutESet )
+            result.append( timeout );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceConfReportControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceConfReportControlImpl.java
index df1d59c..eec23d3 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceConfReportControlImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceConfReportControlImpl.java
@@ -168,13 +168,14 @@ public class ServiceConfReportControlImpl extends ServiceWithMaxImpl implements
      * @generated
      */
     @Override
-    public void setBufMode(bufModeEnum newBufMode) {
+    public void setBufMode( bufModeEnum newBufMode ) {
         bufModeEnum oldBufMode = bufMode;
         bufMode = newBufMode == null ? BUF_MODE_EDEFAULT : newBufMode;
         boolean oldBufModeESet = bufModeESet;
         bufModeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_MODE, oldBufMode, bufMode, !oldBufModeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_MODE,
+                    oldBufMode, bufMode, !oldBufModeESet ) );
     }
 
     /**
@@ -188,8 +189,9 @@ public class ServiceConfReportControlImpl extends ServiceWithMaxImpl implements
         boolean oldBufModeESet = bufModeESet;
         bufMode = BUF_MODE_EDEFAULT;
         bufModeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_MODE, oldBufMode, BUF_MODE_EDEFAULT, oldBufModeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_MODE,
+                    oldBufMode, BUF_MODE_EDEFAULT, oldBufModeESet ) );
     }
 
     /**
@@ -218,13 +220,14 @@ public class ServiceConfReportControlImpl extends ServiceWithMaxImpl implements
      * @generated
      */
     @Override
-    public void setBufConf(Boolean newBufConf) {
+    public void setBufConf( Boolean newBufConf ) {
         Boolean oldBufConf = bufConf;
         bufConf = newBufConf;
         boolean oldBufConfESet = bufConfESet;
         bufConfESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_CONF, oldBufConf, bufConf, !oldBufConfESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_CONF,
+                    oldBufConf, bufConf, !oldBufConfESet ) );
     }
 
     /**
@@ -238,8 +241,9 @@ public class ServiceConfReportControlImpl extends ServiceWithMaxImpl implements
         boolean oldBufConfESet = bufConfESet;
         bufConf = BUF_CONF_EDEFAULT;
         bufConfESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_CONF, oldBufConf, BUF_CONF_EDEFAULT, oldBufConfESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_CONF,
+                    oldBufConf, BUF_CONF_EDEFAULT, oldBufConfESet ) );
     }
 
     /**
@@ -268,13 +272,14 @@ public class ServiceConfReportControlImpl extends ServiceWithMaxImpl implements
      * @generated
      */
     @Override
-    public void setMaxBuf(Integer newMaxBuf) {
+    public void setMaxBuf( Integer newMaxBuf ) {
         Integer oldMaxBuf = maxBuf;
         maxBuf = newMaxBuf;
         boolean oldMaxBufESet = maxBufESet;
         maxBufESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICE_CONF_REPORT_CONTROL__MAX_BUF, oldMaxBuf, maxBuf, !oldMaxBufESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICE_CONF_REPORT_CONTROL__MAX_BUF,
+                    oldMaxBuf, maxBuf, !oldMaxBufESet ) );
     }
 
     /**
@@ -288,8 +293,9 @@ public class ServiceConfReportControlImpl extends ServiceWithMaxImpl implements
         boolean oldMaxBufESet = maxBufESet;
         maxBuf = MAX_BUF_EDEFAULT;
         maxBufESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICE_CONF_REPORT_CONTROL__MAX_BUF, oldMaxBuf, MAX_BUF_EDEFAULT, oldMaxBufESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICE_CONF_REPORT_CONTROL__MAX_BUF,
+                    oldMaxBuf, MAX_BUF_EDEFAULT, oldMaxBufESet ) );
     }
 
     /**
@@ -308,16 +314,16 @@ public class ServiceConfReportControlImpl extends ServiceWithMaxImpl implements
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_MODE:
-                return getBufMode();
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_CONF:
-                return getBufConf();
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__MAX_BUF:
-                return getMaxBuf();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_MODE:
+            return getBufMode();
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_CONF:
+            return getBufConf();
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__MAX_BUF:
+            return getMaxBuf();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -326,19 +332,19 @@ public class ServiceConfReportControlImpl extends ServiceWithMaxImpl implements
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_MODE:
-                setBufMode((bufModeEnum)newValue);
-                return;
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_CONF:
-                setBufConf((Boolean)newValue);
-                return;
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__MAX_BUF:
-                setMaxBuf((Integer)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_MODE:
+            setBufMode( ( bufModeEnum ) newValue );
+            return;
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_CONF:
+            setBufConf( ( Boolean ) newValue );
+            return;
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__MAX_BUF:
+            setMaxBuf( ( Integer ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -347,19 +353,19 @@ public class ServiceConfReportControlImpl extends ServiceWithMaxImpl implements
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_MODE:
-                unsetBufMode();
-                return;
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_CONF:
-                unsetBufConf();
-                return;
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__MAX_BUF:
-                unsetMaxBuf();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_MODE:
+            unsetBufMode();
+            return;
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_CONF:
+            unsetBufConf();
+            return;
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__MAX_BUF:
+            unsetMaxBuf();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -368,16 +374,16 @@ public class ServiceConfReportControlImpl extends ServiceWithMaxImpl implements
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_MODE:
-                return isSetBufMode();
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_CONF:
-                return isSetBufConf();
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL__MAX_BUF:
-                return isSetMaxBuf();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_MODE:
+            return isSetBufMode();
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__BUF_CONF:
+            return isSetBufConf();
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL__MAX_BUF:
+            return isSetMaxBuf();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -387,16 +393,25 @@ public class ServiceConfReportControlImpl extends ServiceWithMaxImpl implements
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (bufMode: ");
-        if (bufModeESet) result.append(bufMode); else result.append("<unset>");
-        result.append(", bufConf: ");
-        if (bufConfESet) result.append(bufConf); else result.append("<unset>");
-        result.append(", maxBuf: ");
-        if (maxBufESet) result.append(maxBuf); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (bufMode: " );
+        if( bufModeESet )
+            result.append( bufMode );
+        else
+            result.append( "<unset>" );
+        result.append( ", bufConf: " );
+        if( bufConfESet )
+            result.append( bufConf );
+        else
+            result.append( "<unset>" );
+        result.append( ", maxBuf: " );
+        if( maxBufESet )
+            result.append( maxBuf );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceForConfDataSetImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceForConfDataSetImpl.java
index 62f5520..db50786 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceForConfDataSetImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceForConfDataSetImpl.java
@@ -107,13 +107,14 @@ public class ServiceForConfDataSetImpl extends ServiceWithMaxAndMaxAttributesImp
      * @generated
      */
     @Override
-    public void setModify(Boolean newModify) {
+    public void setModify( Boolean newModify ) {
         Boolean oldModify = modify;
         modify = newModify;
         boolean oldModifyESet = modifyESet;
         modifyESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICE_FOR_CONF_DATA_SET__MODIFY, oldModify, modify, !oldModifyESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICE_FOR_CONF_DATA_SET__MODIFY,
+                    oldModify, modify, !oldModifyESet ) );
     }
 
     /**
@@ -127,8 +128,9 @@ public class ServiceForConfDataSetImpl extends ServiceWithMaxAndMaxAttributesImp
         boolean oldModifyESet = modifyESet;
         modify = MODIFY_EDEFAULT;
         modifyESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICE_FOR_CONF_DATA_SET__MODIFY, oldModify, MODIFY_EDEFAULT, oldModifyESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICE_FOR_CONF_DATA_SET__MODIFY,
+                    oldModify, MODIFY_EDEFAULT, oldModifyESet ) );
     }
 
     /**
@@ -147,12 +149,12 @@ public class ServiceForConfDataSetImpl extends ServiceWithMaxAndMaxAttributesImp
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.SERVICE_FOR_CONF_DATA_SET__MODIFY:
-                return getModify();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_FOR_CONF_DATA_SET__MODIFY:
+            return getModify();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -161,13 +163,13 @@ public class ServiceForConfDataSetImpl extends ServiceWithMaxAndMaxAttributesImp
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.SERVICE_FOR_CONF_DATA_SET__MODIFY:
-                setModify((Boolean)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_FOR_CONF_DATA_SET__MODIFY:
+            setModify( ( Boolean ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -176,13 +178,13 @@ public class ServiceForConfDataSetImpl extends ServiceWithMaxAndMaxAttributesImp
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.SERVICE_FOR_CONF_DATA_SET__MODIFY:
-                unsetModify();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_FOR_CONF_DATA_SET__MODIFY:
+            unsetModify();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -191,12 +193,12 @@ public class ServiceForConfDataSetImpl extends ServiceWithMaxAndMaxAttributesImp
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.SERVICE_FOR_CONF_DATA_SET__MODIFY:
-                return isSetModify();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_FOR_CONF_DATA_SET__MODIFY:
+            return isSetModify();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -206,12 +208,15 @@ public class ServiceForConfDataSetImpl extends ServiceWithMaxAndMaxAttributesImp
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (modify: ");
-        if (modifyESet) result.append(modify); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (modify: " );
+        if( modifyESet )
+            result.append( modify );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceSettingsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceSettingsImpl.java
index 4fbb509..3036667 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceSettingsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceSettingsImpl.java
@@ -142,8 +142,9 @@ public class ServiceSettingsImpl extends SclObjectImpl implements ServiceSetting
         cbName = newCbName == null ? CB_NAME_EDEFAULT : newCbName;
         boolean oldCbNameESet = cbNameESet;
         cbNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICE_SETTINGS__CB_NAME, oldCbName, cbName, !oldCbNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICE_SETTINGS__CB_NAME, oldCbName,
+                    cbName, !oldCbNameESet ) );
     }
 
     /**
@@ -157,8 +158,9 @@ public class ServiceSettingsImpl extends SclObjectImpl implements ServiceSetting
         boolean oldCbNameESet = cbNameESet;
         cbName = CB_NAME_EDEFAULT;
         cbNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICE_SETTINGS__CB_NAME, oldCbName, CB_NAME_EDEFAULT, oldCbNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICE_SETTINGS__CB_NAME, oldCbName,
+                    CB_NAME_EDEFAULT, oldCbNameESet ) );
     }
 
     /**
@@ -192,8 +194,9 @@ public class ServiceSettingsImpl extends SclObjectImpl implements ServiceSetting
         datSet = newDatSet == null ? DAT_SET_EDEFAULT : newDatSet;
         boolean oldDatSetESet = datSetESet;
         datSetESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICE_SETTINGS__DAT_SET, oldDatSet, datSet, !oldDatSetESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICE_SETTINGS__DAT_SET, oldDatSet,
+                    datSet, !oldDatSetESet ) );
     }
 
     /**
@@ -207,8 +210,9 @@ public class ServiceSettingsImpl extends SclObjectImpl implements ServiceSetting
         boolean oldDatSetESet = datSetESet;
         datSet = DAT_SET_EDEFAULT;
         datSetESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICE_SETTINGS__DAT_SET, oldDatSet, DAT_SET_EDEFAULT, oldDatSetESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICE_SETTINGS__DAT_SET, oldDatSet,
+                    DAT_SET_EDEFAULT, oldDatSetESet ) );
     }
 
     /**
@@ -228,13 +232,13 @@ public class ServiceSettingsImpl extends SclObjectImpl implements ServiceSetting
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SERVICE_SETTINGS__CB_NAME:
-                return getCbName();
-            case SclPackage.SERVICE_SETTINGS__DAT_SET:
-                return getDatSet();
+        switch( featureID ) {
+        case SclPackage.SERVICE_SETTINGS__CB_NAME:
+            return getCbName();
+        case SclPackage.SERVICE_SETTINGS__DAT_SET:
+            return getDatSet();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -244,15 +248,15 @@ public class ServiceSettingsImpl extends SclObjectImpl implements ServiceSetting
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SERVICE_SETTINGS__CB_NAME:
-                setCbName((ServiceSettingsNoDynEnum)newValue);
-                return;
-            case SclPackage.SERVICE_SETTINGS__DAT_SET:
-                setDatSet((ServiceSettingsEnum)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SERVICE_SETTINGS__CB_NAME:
+            setCbName( ( ServiceSettingsNoDynEnum ) newValue );
+            return;
+        case SclPackage.SERVICE_SETTINGS__DAT_SET:
+            setDatSet( ( ServiceSettingsEnum ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -262,15 +266,15 @@ public class ServiceSettingsImpl extends SclObjectImpl implements ServiceSetting
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SERVICE_SETTINGS__CB_NAME:
-                unsetCbName();
-                return;
-            case SclPackage.SERVICE_SETTINGS__DAT_SET:
-                unsetDatSet();
-                return;
+        switch( featureID ) {
+        case SclPackage.SERVICE_SETTINGS__CB_NAME:
+            unsetCbName();
+            return;
+        case SclPackage.SERVICE_SETTINGS__DAT_SET:
+            unsetDatSet();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -280,13 +284,13 @@ public class ServiceSettingsImpl extends SclObjectImpl implements ServiceSetting
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SERVICE_SETTINGS__CB_NAME:
-                return isSetCbName();
-            case SclPackage.SERVICE_SETTINGS__DAT_SET:
-                return isSetDatSet();
+        switch( featureID ) {
+        case SclPackage.SERVICE_SETTINGS__CB_NAME:
+            return isSetCbName();
+        case SclPackage.SERVICE_SETTINGS__DAT_SET:
+            return isSetDatSet();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -296,14 +300,20 @@ public class ServiceSettingsImpl extends SclObjectImpl implements ServiceSetting
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (cbName: ");
-        if (cbNameESet) result.append(cbName); else result.append("<unset>");
-        result.append(", datSet: ");
-        if (datSetESet) result.append(datSet); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (cbName: " );
+        if( cbNameESet )
+            result.append( cbName );
+        else
+            result.append( "<unset>" );
+        result.append( ", datSet: " );
+        if( datSetESet )
+            result.append( datSet );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxAndMaxAttributesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxAndMaxAttributesImpl.java
index d6d0601..861fd0d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxAndMaxAttributesImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxAndMaxAttributesImpl.java
@@ -107,13 +107,15 @@ public class ServiceWithMaxAndMaxAttributesImpl extends ServiceWithMaxImpl imple
      * @generated
      */
     @Override
-    public void setMaxAttributes(Integer newMaxAttributes) {
+    public void setMaxAttributes( Integer newMaxAttributes ) {
         Integer oldMaxAttributes = maxAttributes;
         maxAttributes = newMaxAttributes;
         boolean oldMaxAttributesESet = maxAttributesESet;
         maxAttributesESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__MAX_ATTRIBUTES, oldMaxAttributes, maxAttributes, !oldMaxAttributesESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__MAX_ATTRIBUTES, oldMaxAttributes, maxAttributes,
+                    !oldMaxAttributesESet ) );
     }
 
     /**
@@ -127,8 +129,10 @@ public class ServiceWithMaxAndMaxAttributesImpl extends ServiceWithMaxImpl imple
         boolean oldMaxAttributesESet = maxAttributesESet;
         maxAttributes = MAX_ATTRIBUTES_EDEFAULT;
         maxAttributesESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__MAX_ATTRIBUTES, oldMaxAttributes, MAX_ATTRIBUTES_EDEFAULT, oldMaxAttributesESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__MAX_ATTRIBUTES, oldMaxAttributes,
+                    MAX_ATTRIBUTES_EDEFAULT, oldMaxAttributesESet ) );
     }
 
     /**
@@ -147,12 +151,12 @@ public class ServiceWithMaxAndMaxAttributesImpl extends ServiceWithMaxImpl imple
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__MAX_ATTRIBUTES:
-                return getMaxAttributes();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__MAX_ATTRIBUTES:
+            return getMaxAttributes();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -161,13 +165,13 @@ public class ServiceWithMaxAndMaxAttributesImpl extends ServiceWithMaxImpl imple
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__MAX_ATTRIBUTES:
-                setMaxAttributes((Integer)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__MAX_ATTRIBUTES:
+            setMaxAttributes( ( Integer ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -176,13 +180,13 @@ public class ServiceWithMaxAndMaxAttributesImpl extends ServiceWithMaxImpl imple
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__MAX_ATTRIBUTES:
-                unsetMaxAttributes();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__MAX_ATTRIBUTES:
+            unsetMaxAttributes();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -191,12 +195,12 @@ public class ServiceWithMaxAndMaxAttributesImpl extends ServiceWithMaxImpl imple
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__MAX_ATTRIBUTES:
-                return isSetMaxAttributes();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__MAX_ATTRIBUTES:
+            return isSetMaxAttributes();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -206,12 +210,15 @@ public class ServiceWithMaxAndMaxAttributesImpl extends ServiceWithMaxImpl imple
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (maxAttributes: ");
-        if (maxAttributesESet) result.append(maxAttributes); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (maxAttributes: " );
+        if( maxAttributesESet )
+            result.append( maxAttributes );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxAndModifyImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxAndModifyImpl.java
index 1bbc380..c864b67 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxAndModifyImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxAndModifyImpl.java
@@ -107,13 +107,14 @@ public class ServiceWithMaxAndModifyImpl extends ServiceWithMaxImpl implements S
      * @generated
      */
     @Override
-    public void setModify(Boolean newModify) {
+    public void setModify( Boolean newModify ) {
         Boolean oldModify = modify;
         modify = newModify;
         boolean oldModifyESet = modifyESet;
         modifyESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICE_WITH_MAX_AND_MODIFY__MODIFY, oldModify, modify, !oldModifyESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICE_WITH_MAX_AND_MODIFY__MODIFY,
+                    oldModify, modify, !oldModifyESet ) );
     }
 
     /**
@@ -127,8 +128,9 @@ public class ServiceWithMaxAndModifyImpl extends ServiceWithMaxImpl implements S
         boolean oldModifyESet = modifyESet;
         modify = MODIFY_EDEFAULT;
         modifyESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICE_WITH_MAX_AND_MODIFY__MODIFY, oldModify, MODIFY_EDEFAULT, oldModifyESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICE_WITH_MAX_AND_MODIFY__MODIFY,
+                    oldModify, MODIFY_EDEFAULT, oldModifyESet ) );
     }
 
     /**
@@ -147,12 +149,12 @@ public class ServiceWithMaxAndModifyImpl extends ServiceWithMaxImpl implements S
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX_AND_MODIFY__MODIFY:
-                return getModify();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX_AND_MODIFY__MODIFY:
+            return getModify();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -161,13 +163,13 @@ public class ServiceWithMaxAndModifyImpl extends ServiceWithMaxImpl implements S
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX_AND_MODIFY__MODIFY:
-                setModify((Boolean)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX_AND_MODIFY__MODIFY:
+            setModify( ( Boolean ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -176,13 +178,13 @@ public class ServiceWithMaxAndModifyImpl extends ServiceWithMaxImpl implements S
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX_AND_MODIFY__MODIFY:
-                unsetModify();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX_AND_MODIFY__MODIFY:
+            unsetModify();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -191,12 +193,12 @@ public class ServiceWithMaxAndModifyImpl extends ServiceWithMaxImpl implements S
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX_AND_MODIFY__MODIFY:
-                return isSetModify();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX_AND_MODIFY__MODIFY:
+            return isSetModify();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -206,12 +208,15 @@ public class ServiceWithMaxAndModifyImpl extends ServiceWithMaxImpl implements S
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (modify: ");
-        if (modifyESet) result.append(modify); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (modify: " );
+        if( modifyESet )
+            result.append( modify );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxImpl.java
index 87312ea..56bd799 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxImpl.java
@@ -110,8 +110,9 @@ public class ServiceWithMaxImpl extends SclObjectImpl implements ServiceWithMax
         max = newMax;
         boolean oldMaxESet = maxESet;
         maxESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICE_WITH_MAX__MAX, oldMax, max, !oldMaxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICE_WITH_MAX__MAX, oldMax, max,
+                    !oldMaxESet ) );
     }
 
     /**
@@ -125,8 +126,9 @@ public class ServiceWithMaxImpl extends SclObjectImpl implements ServiceWithMax
         boolean oldMaxESet = maxESet;
         max = MAX_EDEFAULT;
         maxESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICE_WITH_MAX__MAX, oldMax, MAX_EDEFAULT, oldMaxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICE_WITH_MAX__MAX, oldMax,
+                    MAX_EDEFAULT, oldMaxESet ) );
     }
 
     /**
@@ -146,11 +148,11 @@ public class ServiceWithMaxImpl extends SclObjectImpl implements ServiceWithMax
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX__MAX:
-                return getMax();
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX__MAX:
+            return getMax();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -160,12 +162,12 @@ public class ServiceWithMaxImpl extends SclObjectImpl implements ServiceWithMax
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX__MAX:
-                setMax((Integer)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX__MAX:
+            setMax( ( Integer ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -175,12 +177,12 @@ public class ServiceWithMaxImpl extends SclObjectImpl implements ServiceWithMax
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX__MAX:
-                unsetMax();
-                return;
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX__MAX:
+            unsetMax();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -190,11 +192,11 @@ public class ServiceWithMaxImpl extends SclObjectImpl implements ServiceWithMax
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX__MAX:
-                return isSetMax();
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX__MAX:
+            return isSetMax();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -204,12 +206,15 @@ public class ServiceWithMaxImpl extends SclObjectImpl implements ServiceWithMax
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (max: ");
-        if (maxESet) result.append(max); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (max: " );
+        if( maxESet )
+            result.append( max );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxNonZeroImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxNonZeroImpl.java
index ddcf644..6a23e4c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxNonZeroImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithMaxNonZeroImpl.java
@@ -107,13 +107,14 @@ public class ServiceWithMaxNonZeroImpl extends SclObjectImpl implements ServiceW
      * @generated
      */
     @Override
-    public void setMax(Integer newMax) {
+    public void setMax( Integer newMax ) {
         Integer oldMax = max;
         max = newMax;
         boolean oldMaxESet = maxESet;
         maxESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICE_WITH_MAX_NON_ZERO__MAX, oldMax, max, !oldMaxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICE_WITH_MAX_NON_ZERO__MAX, oldMax,
+                    max, !oldMaxESet ) );
     }
 
     /**
@@ -127,8 +128,9 @@ public class ServiceWithMaxNonZeroImpl extends SclObjectImpl implements ServiceW
         boolean oldMaxESet = maxESet;
         max = MAX_EDEFAULT;
         maxESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICE_WITH_MAX_NON_ZERO__MAX, oldMax, MAX_EDEFAULT, oldMaxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICE_WITH_MAX_NON_ZERO__MAX, oldMax,
+                    MAX_EDEFAULT, oldMaxESet ) );
     }
 
     /**
@@ -147,12 +149,12 @@ public class ServiceWithMaxNonZeroImpl extends SclObjectImpl implements ServiceW
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX_NON_ZERO__MAX:
-                return getMax();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX_NON_ZERO__MAX:
+            return getMax();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -161,13 +163,13 @@ public class ServiceWithMaxNonZeroImpl extends SclObjectImpl implements ServiceW
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX_NON_ZERO__MAX:
-                setMax((Integer)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX_NON_ZERO__MAX:
+            setMax( ( Integer ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -176,13 +178,13 @@ public class ServiceWithMaxNonZeroImpl extends SclObjectImpl implements ServiceW
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX_NON_ZERO__MAX:
-                unsetMax();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX_NON_ZERO__MAX:
+            unsetMax();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -191,12 +193,12 @@ public class ServiceWithMaxNonZeroImpl extends SclObjectImpl implements ServiceW
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_MAX_NON_ZERO__MAX:
-                return isSetMax();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_MAX_NON_ZERO__MAX:
+            return isSetMax();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -206,12 +208,15 @@ public class ServiceWithMaxNonZeroImpl extends SclObjectImpl implements ServiceW
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (max: ");
-        if (maxESet) result.append(max); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (max: " );
+        if( maxESet )
+            result.append( max );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithOptionalMaxImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithOptionalMaxImpl.java
index 8c607a1..5d11a80 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithOptionalMaxImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServiceWithOptionalMaxImpl.java
@@ -107,13 +107,14 @@ public class ServiceWithOptionalMaxImpl extends SclObjectImpl implements Service
      * @generated
      */
     @Override
-    public void setMax(Integer newMax) {
+    public void setMax( Integer newMax ) {
         Integer oldMax = max;
         max = newMax;
         boolean oldMaxESet = maxESet;
         maxESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICE_WITH_OPTIONAL_MAX__MAX, oldMax, max, !oldMaxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICE_WITH_OPTIONAL_MAX__MAX, oldMax,
+                    max, !oldMaxESet ) );
     }
 
     /**
@@ -127,8 +128,9 @@ public class ServiceWithOptionalMaxImpl extends SclObjectImpl implements Service
         boolean oldMaxESet = maxESet;
         max = MAX_EDEFAULT;
         maxESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICE_WITH_OPTIONAL_MAX__MAX, oldMax, MAX_EDEFAULT, oldMaxESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICE_WITH_OPTIONAL_MAX__MAX, oldMax,
+                    MAX_EDEFAULT, oldMaxESet ) );
     }
 
     /**
@@ -147,12 +149,12 @@ public class ServiceWithOptionalMaxImpl extends SclObjectImpl implements Service
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_OPTIONAL_MAX__MAX:
-                return getMax();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_OPTIONAL_MAX__MAX:
+            return getMax();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -161,13 +163,13 @@ public class ServiceWithOptionalMaxImpl extends SclObjectImpl implements Service
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_OPTIONAL_MAX__MAX:
-                setMax((Integer)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_OPTIONAL_MAX__MAX:
+            setMax( ( Integer ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -176,13 +178,13 @@ public class ServiceWithOptionalMaxImpl extends SclObjectImpl implements Service
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_OPTIONAL_MAX__MAX:
-                unsetMax();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_OPTIONAL_MAX__MAX:
+            unsetMax();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -191,12 +193,12 @@ public class ServiceWithOptionalMaxImpl extends SclObjectImpl implements Service
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.SERVICE_WITH_OPTIONAL_MAX__MAX:
-                return isSetMax();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SERVICE_WITH_OPTIONAL_MAX__MAX:
+            return isSetMax();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -206,12 +208,15 @@ public class ServiceWithOptionalMaxImpl extends SclObjectImpl implements Service
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (max: ");
-        if (maxESet) result.append(max); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (max: " );
+        if( maxESet )
+            result.append( max );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServicesImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServicesImpl.java
index b76e7c4..386328c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServicesImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServicesImpl.java
@@ -805,13 +805,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      * @generated
      */
     @Override
-    public void setNameLength(Integer newNameLength) {
+    public void setNameLength( Integer newNameLength ) {
         Integer oldNameLength = nameLength;
         nameLength = newNameLength;
         boolean oldNameLengthESet = nameLengthESet;
         nameLengthESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__NAME_LENGTH, oldNameLength, nameLength, !oldNameLengthESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__NAME_LENGTH, oldNameLength,
+                    nameLength, !oldNameLengthESet ) );
     }
 
     /**
@@ -825,8 +826,9 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         boolean oldNameLengthESet = nameLengthESet;
         nameLength = NAME_LENGTH_EDEFAULT;
         nameLengthESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__NAME_LENGTH, oldNameLength, NAME_LENGTH_EDEFAULT, oldNameLengthESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__NAME_LENGTH, oldNameLength,
+                    NAME_LENGTH_EDEFAULT, oldNameLengthESet ) );
     }
 
     /**
@@ -846,8 +848,8 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public AccessPoint getParentAccessPoint() {
-        if (eContainerFeatureID() != SclPackage.SERVICES__PARENT_ACCESS_POINT) return null;
-        return (AccessPoint)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SERVICES__PARENT_ACCESS_POINT ) return null;
+        return ( AccessPoint ) eInternalContainer();
     }
 
     /**
@@ -855,8 +857,9 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAccessPoint(AccessPoint newParentAccessPoint, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAccessPoint, SclPackage.SERVICES__PARENT_ACCESS_POINT, msgs);
+    public NotificationChain basicSetParentAccessPoint( AccessPoint newParentAccessPoint, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAccessPoint, SclPackage.SERVICES__PARENT_ACCESS_POINT,
+                msgs );
         return msgs;
     }
 
@@ -866,20 +869,24 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      * @generated
      */
     @Override
-    public void setParentAccessPoint(AccessPoint newParentAccessPoint) {
-        if (newParentAccessPoint != eInternalContainer() || (eContainerFeatureID() != SclPackage.SERVICES__PARENT_ACCESS_POINT && newParentAccessPoint != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAccessPoint))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAccessPoint( AccessPoint newParentAccessPoint ) {
+        if( newParentAccessPoint != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SERVICES__PARENT_ACCESS_POINT
+                        && newParentAccessPoint != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAccessPoint ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAccessPoint != null)
-                msgs = ((InternalEObject)newParentAccessPoint).eInverseAdd(this, SclPackage.ACCESS_POINT__SERVICES, AccessPoint.class, msgs);
-            msgs = basicSetParentAccessPoint(newParentAccessPoint, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAccessPoint != null )
+                msgs = ( ( InternalEObject ) newParentAccessPoint ).eInverseAdd( this,
+                        SclPackage.ACCESS_POINT__SERVICES, AccessPoint.class, msgs );
+            msgs = basicSetParentAccessPoint( newParentAccessPoint, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__PARENT_ACCESS_POINT, newParentAccessPoint, newParentAccessPoint));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__PARENT_ACCESS_POINT,
+                    newParentAccessPoint, newParentAccessPoint ) );
     }
 
     /**
@@ -902,9 +909,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         clientServices = newClientServices;
         boolean oldClientServicesESet = clientServicesESet;
         clientServicesESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__CLIENT_SERVICES, oldClientServices, newClientServices, !oldClientServicesESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__CLIENT_SERVICES, oldClientServices, newClientServices,
+                    !oldClientServicesESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -916,20 +928,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setClientServices( ClientServices newClientServices ) {
-        if (newClientServices != clientServices) {
+        if( newClientServices != clientServices ) {
             NotificationChain msgs = null;
-            if (clientServices != null)
-                msgs = ((InternalEObject)clientServices).eInverseRemove(this, SclPackage.CLIENT_SERVICES__PARENT_SERVICES, ClientServices.class, msgs);
-            if (newClientServices != null)
-                msgs = ((InternalEObject)newClientServices).eInverseAdd(this, SclPackage.CLIENT_SERVICES__PARENT_SERVICES, ClientServices.class, msgs);
-            msgs = basicSetClientServices(newClientServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( clientServices != null )
+                msgs = ( ( InternalEObject ) clientServices ).eInverseRemove( this,
+                        SclPackage.CLIENT_SERVICES__PARENT_SERVICES, ClientServices.class, msgs );
+            if( newClientServices != null )
+                msgs = ( ( InternalEObject ) newClientServices ).eInverseAdd( this,
+                        SclPackage.CLIENT_SERVICES__PARENT_SERVICES, ClientServices.class, msgs );
+            msgs = basicSetClientServices( newClientServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldClientServicesESet = clientServicesESet;
             clientServicesESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__CLIENT_SERVICES, newClientServices, newClientServices, !oldClientServicesESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__CLIENT_SERVICES,
+                        newClientServices, newClientServices, !oldClientServicesESet ) );
         }
     }
 
@@ -943,9 +958,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         clientServices = null;
         boolean oldClientServicesESet = clientServicesESet;
         clientServicesESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__CLIENT_SERVICES, oldClientServices, null, oldClientServicesESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__CLIENT_SERVICES, oldClientServices, null, oldClientServicesESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -957,17 +976,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetClientServices() {
-        if (clientServices != null) {
+        if( clientServices != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)clientServices).eInverseRemove(this, SclPackage.CLIENT_SERVICES__PARENT_SERVICES, ClientServices.class, msgs);
-            msgs = basicUnsetClientServices(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) clientServices ).eInverseRemove( this,
+                    SclPackage.CLIENT_SERVICES__PARENT_SERVICES, ClientServices.class, msgs );
+            msgs = basicUnsetClientServices( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldClientServicesESet = clientServicesESet;
             clientServicesESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__CLIENT_SERVICES, null, null, oldClientServicesESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__CLIENT_SERVICES, null,
+                        null, oldClientServicesESet ) );
         }
     }
 
@@ -1001,9 +1022,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         commProt = newCommProt;
         boolean oldCommProtESet = commProtESet;
         commProtESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__COMM_PROT, oldCommProt, newCommProt, !oldCommProtESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__COMM_PROT, oldCommProt, newCommProt, !oldCommProtESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1015,20 +1040,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setCommProt( CommProt newCommProt ) {
-        if (newCommProt != commProt) {
+        if( newCommProt != commProt ) {
             NotificationChain msgs = null;
-            if (commProt != null)
-                msgs = ((InternalEObject)commProt).eInverseRemove(this, SclPackage.COMM_PROT__PARENT_SERVICES, CommProt.class, msgs);
-            if (newCommProt != null)
-                msgs = ((InternalEObject)newCommProt).eInverseAdd(this, SclPackage.COMM_PROT__PARENT_SERVICES, CommProt.class, msgs);
-            msgs = basicSetCommProt(newCommProt, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( commProt != null )
+                msgs = ( ( InternalEObject ) commProt ).eInverseRemove( this, SclPackage.COMM_PROT__PARENT_SERVICES,
+                        CommProt.class, msgs );
+            if( newCommProt != null )
+                msgs = ( ( InternalEObject ) newCommProt ).eInverseAdd( this, SclPackage.COMM_PROT__PARENT_SERVICES,
+                        CommProt.class, msgs );
+            msgs = basicSetCommProt( newCommProt, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldCommProtESet = commProtESet;
             commProtESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__COMM_PROT, newCommProt, newCommProt, !oldCommProtESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__COMM_PROT, newCommProt,
+                        newCommProt, !oldCommProtESet ) );
         }
     }
 
@@ -1042,9 +1070,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         commProt = null;
         boolean oldCommProtESet = commProtESet;
         commProtESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__COMM_PROT, oldCommProt, null, oldCommProtESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__COMM_PROT, oldCommProt, null, oldCommProtESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1056,17 +1088,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetCommProt() {
-        if (commProt != null) {
+        if( commProt != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)commProt).eInverseRemove(this, SclPackage.COMM_PROT__PARENT_SERVICES, CommProt.class, msgs);
-            msgs = basicUnsetCommProt(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) commProt ).eInverseRemove( this, SclPackage.COMM_PROT__PARENT_SERVICES,
+                    CommProt.class, msgs );
+            msgs = basicUnsetCommProt( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldCommProtESet = commProtESet;
             commProtESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__COMM_PROT, null, null, oldCommProtESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__COMM_PROT, null, null,
+                        oldCommProtESet ) );
         }
     }
 
@@ -1100,9 +1134,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         confDataSet = newConfDataSet;
         boolean oldConfDataSetESet = confDataSetESet;
         confDataSetESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__CONF_DATA_SET, oldConfDataSet, newConfDataSet, !oldConfDataSetESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__CONF_DATA_SET, oldConfDataSet, newConfDataSet, !oldConfDataSetESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1114,20 +1152,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setConfDataSet( ConfDataSet newConfDataSet ) {
-        if (newConfDataSet != confDataSet) {
+        if( newConfDataSet != confDataSet ) {
             NotificationChain msgs = null;
-            if (confDataSet != null)
-                msgs = ((InternalEObject)confDataSet).eInverseRemove(this, SclPackage.CONF_DATA_SET__PARENT_SERVICES, ConfDataSet.class, msgs);
-            if (newConfDataSet != null)
-                msgs = ((InternalEObject)newConfDataSet).eInverseAdd(this, SclPackage.CONF_DATA_SET__PARENT_SERVICES, ConfDataSet.class, msgs);
-            msgs = basicSetConfDataSet(newConfDataSet, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( confDataSet != null )
+                msgs = ( ( InternalEObject ) confDataSet ).eInverseRemove( this,
+                        SclPackage.CONF_DATA_SET__PARENT_SERVICES, ConfDataSet.class, msgs );
+            if( newConfDataSet != null )
+                msgs = ( ( InternalEObject ) newConfDataSet ).eInverseAdd( this,
+                        SclPackage.CONF_DATA_SET__PARENT_SERVICES, ConfDataSet.class, msgs );
+            msgs = basicSetConfDataSet( newConfDataSet, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldConfDataSetESet = confDataSetESet;
             confDataSetESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__CONF_DATA_SET, newConfDataSet, newConfDataSet, !oldConfDataSetESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__CONF_DATA_SET,
+                        newConfDataSet, newConfDataSet, !oldConfDataSetESet ) );
         }
     }
 
@@ -1141,9 +1182,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         confDataSet = null;
         boolean oldConfDataSetESet = confDataSetESet;
         confDataSetESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__CONF_DATA_SET, oldConfDataSet, null, oldConfDataSetESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__CONF_DATA_SET, oldConfDataSet, null, oldConfDataSetESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1155,17 +1200,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetConfDataSet() {
-        if (confDataSet != null) {
+        if( confDataSet != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)confDataSet).eInverseRemove(this, SclPackage.CONF_DATA_SET__PARENT_SERVICES, ConfDataSet.class, msgs);
-            msgs = basicUnsetConfDataSet(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) confDataSet ).eInverseRemove( this, SclPackage.CONF_DATA_SET__PARENT_SERVICES,
+                    ConfDataSet.class, msgs );
+            msgs = basicUnsetConfDataSet( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldConfDataSetESet = confDataSetESet;
             confDataSetESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__CONF_DATA_SET, null, null, oldConfDataSetESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__CONF_DATA_SET, null,
+                        null, oldConfDataSetESet ) );
         }
     }
 
@@ -1199,9 +1246,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         confLNs = newConfLNs;
         boolean oldConfLNsESet = confLNsESet;
         confLNsESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__CONF_LNS, oldConfLNs, newConfLNs, !oldConfLNsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__CONF_LNS, oldConfLNs, newConfLNs, !oldConfLNsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1213,20 +1264,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setConfLNs( ConfLNs newConfLNs ) {
-        if (newConfLNs != confLNs) {
+        if( newConfLNs != confLNs ) {
             NotificationChain msgs = null;
-            if (confLNs != null)
-                msgs = ((InternalEObject)confLNs).eInverseRemove(this, SclPackage.CONF_LNS__PARENT_SERVICES, ConfLNs.class, msgs);
-            if (newConfLNs != null)
-                msgs = ((InternalEObject)newConfLNs).eInverseAdd(this, SclPackage.CONF_LNS__PARENT_SERVICES, ConfLNs.class, msgs);
-            msgs = basicSetConfLNs(newConfLNs, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( confLNs != null )
+                msgs = ( ( InternalEObject ) confLNs ).eInverseRemove( this, SclPackage.CONF_LNS__PARENT_SERVICES,
+                        ConfLNs.class, msgs );
+            if( newConfLNs != null )
+                msgs = ( ( InternalEObject ) newConfLNs ).eInverseAdd( this, SclPackage.CONF_LNS__PARENT_SERVICES,
+                        ConfLNs.class, msgs );
+            msgs = basicSetConfLNs( newConfLNs, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldConfLNsESet = confLNsESet;
             confLNsESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__CONF_LNS, newConfLNs, newConfLNs, !oldConfLNsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__CONF_LNS, newConfLNs,
+                        newConfLNs, !oldConfLNsESet ) );
         }
     }
 
@@ -1240,9 +1294,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         confLNs = null;
         boolean oldConfLNsESet = confLNsESet;
         confLNsESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__CONF_LNS, oldConfLNs, null, oldConfLNsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__CONF_LNS, oldConfLNs, null, oldConfLNsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1254,17 +1312,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetConfLNs() {
-        if (confLNs != null) {
+        if( confLNs != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)confLNs).eInverseRemove(this, SclPackage.CONF_LNS__PARENT_SERVICES, ConfLNs.class, msgs);
-            msgs = basicUnsetConfLNs(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) confLNs ).eInverseRemove( this, SclPackage.CONF_LNS__PARENT_SERVICES,
+                    ConfLNs.class, msgs );
+            msgs = basicUnsetConfLNs( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldConfLNsESet = confLNsESet;
             confLNsESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__CONF_LNS, null, null, oldConfLNsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__CONF_LNS, null, null,
+                        oldConfLNsESet ) );
         }
     }
 
@@ -1298,9 +1358,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         confLdName = newConfLdName;
         boolean oldConfLdNameESet = confLdNameESet;
         confLdNameESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__CONF_LD_NAME, oldConfLdName, newConfLdName, !oldConfLdNameESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__CONF_LD_NAME, oldConfLdName, newConfLdName, !oldConfLdNameESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1312,20 +1376,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setConfLdName( ConfLdName newConfLdName ) {
-        if (newConfLdName != confLdName) {
+        if( newConfLdName != confLdName ) {
             NotificationChain msgs = null;
-            if (confLdName != null)
-                msgs = ((InternalEObject)confLdName).eInverseRemove(this, SclPackage.CONF_LD_NAME__PARENT_SERVICES, ConfLdName.class, msgs);
-            if (newConfLdName != null)
-                msgs = ((InternalEObject)newConfLdName).eInverseAdd(this, SclPackage.CONF_LD_NAME__PARENT_SERVICES, ConfLdName.class, msgs);
-            msgs = basicSetConfLdName(newConfLdName, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( confLdName != null )
+                msgs = ( ( InternalEObject ) confLdName ).eInverseRemove( this,
+                        SclPackage.CONF_LD_NAME__PARENT_SERVICES, ConfLdName.class, msgs );
+            if( newConfLdName != null )
+                msgs = ( ( InternalEObject ) newConfLdName ).eInverseAdd( this,
+                        SclPackage.CONF_LD_NAME__PARENT_SERVICES, ConfLdName.class, msgs );
+            msgs = basicSetConfLdName( newConfLdName, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldConfLdNameESet = confLdNameESet;
             confLdNameESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__CONF_LD_NAME, newConfLdName, newConfLdName, !oldConfLdNameESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__CONF_LD_NAME,
+                        newConfLdName, newConfLdName, !oldConfLdNameESet ) );
         }
     }
 
@@ -1339,9 +1406,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         confLdName = null;
         boolean oldConfLdNameESet = confLdNameESet;
         confLdNameESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__CONF_LD_NAME, oldConfLdName, null, oldConfLdNameESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__CONF_LD_NAME, oldConfLdName, null, oldConfLdNameESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1353,17 +1424,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetConfLdName() {
-        if (confLdName != null) {
+        if( confLdName != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)confLdName).eInverseRemove(this, SclPackage.CONF_LD_NAME__PARENT_SERVICES, ConfLdName.class, msgs);
-            msgs = basicUnsetConfLdName(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) confLdName ).eInverseRemove( this, SclPackage.CONF_LD_NAME__PARENT_SERVICES,
+                    ConfLdName.class, msgs );
+            msgs = basicUnsetConfLdName( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldConfLdNameESet = confLdNameESet;
             confLdNameESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__CONF_LD_NAME, null, null, oldConfLdNameESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__CONF_LD_NAME, null, null,
+                        oldConfLdNameESet ) );
         }
     }
 
@@ -1397,9 +1470,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         confLogControl = newConfLogControl;
         boolean oldConfLogControlESet = confLogControlESet;
         confLogControlESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__CONF_LOG_CONTROL, oldConfLogControl, newConfLogControl, !oldConfLogControlESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__CONF_LOG_CONTROL, oldConfLogControl, newConfLogControl,
+                    !oldConfLogControlESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1411,20 +1489,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setConfLogControl( ConfLogControl newConfLogControl ) {
-        if (newConfLogControl != confLogControl) {
+        if( newConfLogControl != confLogControl ) {
             NotificationChain msgs = null;
-            if (confLogControl != null)
-                msgs = ((InternalEObject)confLogControl).eInverseRemove(this, SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES, ConfLogControl.class, msgs);
-            if (newConfLogControl != null)
-                msgs = ((InternalEObject)newConfLogControl).eInverseAdd(this, SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES, ConfLogControl.class, msgs);
-            msgs = basicSetConfLogControl(newConfLogControl, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( confLogControl != null )
+                msgs = ( ( InternalEObject ) confLogControl ).eInverseRemove( this,
+                        SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES, ConfLogControl.class, msgs );
+            if( newConfLogControl != null )
+                msgs = ( ( InternalEObject ) newConfLogControl ).eInverseAdd( this,
+                        SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES, ConfLogControl.class, msgs );
+            msgs = basicSetConfLogControl( newConfLogControl, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldConfLogControlESet = confLogControlESet;
             confLogControlESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__CONF_LOG_CONTROL, newConfLogControl, newConfLogControl, !oldConfLogControlESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__CONF_LOG_CONTROL,
+                        newConfLogControl, newConfLogControl, !oldConfLogControlESet ) );
         }
     }
 
@@ -1438,9 +1519,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         confLogControl = null;
         boolean oldConfLogControlESet = confLogControlESet;
         confLogControlESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__CONF_LOG_CONTROL, oldConfLogControl, null, oldConfLogControlESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__CONF_LOG_CONTROL, oldConfLogControl, null, oldConfLogControlESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1452,17 +1537,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetConfLogControl() {
-        if (confLogControl != null) {
+        if( confLogControl != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)confLogControl).eInverseRemove(this, SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES, ConfLogControl.class, msgs);
-            msgs = basicUnsetConfLogControl(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) confLogControl ).eInverseRemove( this,
+                    SclPackage.CONF_LOG_CONTROL__PARENT_SERVICES, ConfLogControl.class, msgs );
+            msgs = basicUnsetConfLogControl( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldConfLogControlESet = confLogControlESet;
             confLogControlESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__CONF_LOG_CONTROL, null, null, oldConfLogControlESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__CONF_LOG_CONTROL, null,
+                        null, oldConfLogControlESet ) );
         }
     }
 
@@ -1491,14 +1578,20 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetConfReportControl( ConfReportControl newConfReportControl, NotificationChain msgs ) {
+    public NotificationChain basicSetConfReportControl( ConfReportControl newConfReportControl,
+            NotificationChain msgs ) {
         ConfReportControl oldConfReportControl = confReportControl;
         confReportControl = newConfReportControl;
         boolean oldConfReportControlESet = confReportControlESet;
         confReportControlESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__CONF_REPORT_CONTROL, oldConfReportControl, newConfReportControl, !oldConfReportControlESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__CONF_REPORT_CONTROL, oldConfReportControl, newConfReportControl,
+                    !oldConfReportControlESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1510,20 +1603,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setConfReportControl( ConfReportControl newConfReportControl ) {
-        if (newConfReportControl != confReportControl) {
+        if( newConfReportControl != confReportControl ) {
             NotificationChain msgs = null;
-            if (confReportControl != null)
-                msgs = ((InternalEObject)confReportControl).eInverseRemove(this, SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES, ConfReportControl.class, msgs);
-            if (newConfReportControl != null)
-                msgs = ((InternalEObject)newConfReportControl).eInverseAdd(this, SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES, ConfReportControl.class, msgs);
-            msgs = basicSetConfReportControl(newConfReportControl, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( confReportControl != null )
+                msgs = ( ( InternalEObject ) confReportControl ).eInverseRemove( this,
+                        SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES, ConfReportControl.class, msgs );
+            if( newConfReportControl != null )
+                msgs = ( ( InternalEObject ) newConfReportControl ).eInverseAdd( this,
+                        SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES, ConfReportControl.class, msgs );
+            msgs = basicSetConfReportControl( newConfReportControl, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldConfReportControlESet = confReportControlESet;
             confReportControlESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__CONF_REPORT_CONTROL, newConfReportControl, newConfReportControl, !oldConfReportControlESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__CONF_REPORT_CONTROL,
+                        newConfReportControl, newConfReportControl, !oldConfReportControlESet ) );
         }
     }
 
@@ -1537,9 +1633,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         confReportControl = null;
         boolean oldConfReportControlESet = confReportControlESet;
         confReportControlESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__CONF_REPORT_CONTROL, oldConfReportControl, null, oldConfReportControlESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__CONF_REPORT_CONTROL, oldConfReportControl, null, oldConfReportControlESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1551,17 +1651,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetConfReportControl() {
-        if (confReportControl != null) {
+        if( confReportControl != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)confReportControl).eInverseRemove(this, SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES, ConfReportControl.class, msgs);
-            msgs = basicUnsetConfReportControl(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) confReportControl ).eInverseRemove( this,
+                    SclPackage.CONF_REPORT_CONTROL__PARENT_SERVICES, ConfReportControl.class, msgs );
+            msgs = basicUnsetConfReportControl( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldConfReportControlESet = confReportControlESet;
             confReportControlESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__CONF_REPORT_CONTROL, null, null, oldConfReportControlESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__CONF_REPORT_CONTROL,
+                        null, null, oldConfReportControlESet ) );
         }
     }
 
@@ -1595,9 +1697,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         confSigRef = newConfSigRef;
         boolean oldConfSigRefESet = confSigRefESet;
         confSigRefESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__CONF_SIG_REF, oldConfSigRef, newConfSigRef, !oldConfSigRefESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__CONF_SIG_REF, oldConfSigRef, newConfSigRef, !oldConfSigRefESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1609,20 +1715,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setConfSigRef( ConfSigRef newConfSigRef ) {
-        if (newConfSigRef != confSigRef) {
+        if( newConfSigRef != confSigRef ) {
             NotificationChain msgs = null;
-            if (confSigRef != null)
-                msgs = ((InternalEObject)confSigRef).eInverseRemove(this, SclPackage.CONF_SIG_REF__PARENT_SERVICES, ConfSigRef.class, msgs);
-            if (newConfSigRef != null)
-                msgs = ((InternalEObject)newConfSigRef).eInverseAdd(this, SclPackage.CONF_SIG_REF__PARENT_SERVICES, ConfSigRef.class, msgs);
-            msgs = basicSetConfSigRef(newConfSigRef, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( confSigRef != null )
+                msgs = ( ( InternalEObject ) confSigRef ).eInverseRemove( this,
+                        SclPackage.CONF_SIG_REF__PARENT_SERVICES, ConfSigRef.class, msgs );
+            if( newConfSigRef != null )
+                msgs = ( ( InternalEObject ) newConfSigRef ).eInverseAdd( this,
+                        SclPackage.CONF_SIG_REF__PARENT_SERVICES, ConfSigRef.class, msgs );
+            msgs = basicSetConfSigRef( newConfSigRef, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldConfSigRefESet = confSigRefESet;
             confSigRefESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__CONF_SIG_REF, newConfSigRef, newConfSigRef, !oldConfSigRefESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__CONF_SIG_REF,
+                        newConfSigRef, newConfSigRef, !oldConfSigRefESet ) );
         }
     }
 
@@ -1636,9 +1745,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         confSigRef = null;
         boolean oldConfSigRefESet = confSigRefESet;
         confSigRefESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__CONF_SIG_REF, oldConfSigRef, null, oldConfSigRefESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__CONF_SIG_REF, oldConfSigRef, null, oldConfSigRefESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1650,17 +1763,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetConfSigRef() {
-        if (confSigRef != null) {
+        if( confSigRef != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)confSigRef).eInverseRemove(this, SclPackage.CONF_SIG_REF__PARENT_SERVICES, ConfSigRef.class, msgs);
-            msgs = basicUnsetConfSigRef(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) confSigRef ).eInverseRemove( this, SclPackage.CONF_SIG_REF__PARENT_SERVICES,
+                    ConfSigRef.class, msgs );
+            msgs = basicUnsetConfSigRef( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldConfSigRefESet = confSigRefESet;
             confSigRefESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__CONF_SIG_REF, null, null, oldConfSigRefESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__CONF_SIG_REF, null, null,
+                        oldConfSigRefESet ) );
         }
     }
 
@@ -1695,9 +1810,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         dataObjectDirectory = newDataObjectDirectory;
         boolean oldDataObjectDirectoryESet = dataObjectDirectoryESet;
         dataObjectDirectoryESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__DATA_OBJECT_DIRECTORY, oldDataObjectDirectory, newDataObjectDirectory, !oldDataObjectDirectoryESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__DATA_OBJECT_DIRECTORY, oldDataObjectDirectory, newDataObjectDirectory,
+                    !oldDataObjectDirectoryESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1709,20 +1829,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setDataObjectDirectory( DataObjectDirectory newDataObjectDirectory ) {
-        if (newDataObjectDirectory != dataObjectDirectory) {
+        if( newDataObjectDirectory != dataObjectDirectory ) {
             NotificationChain msgs = null;
-            if (dataObjectDirectory != null)
-                msgs = ((InternalEObject)dataObjectDirectory).eInverseRemove(this, SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES, DataObjectDirectory.class, msgs);
-            if (newDataObjectDirectory != null)
-                msgs = ((InternalEObject)newDataObjectDirectory).eInverseAdd(this, SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES, DataObjectDirectory.class, msgs);
-            msgs = basicSetDataObjectDirectory(newDataObjectDirectory, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( dataObjectDirectory != null )
+                msgs = ( ( InternalEObject ) dataObjectDirectory ).eInverseRemove( this,
+                        SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES, DataObjectDirectory.class, msgs );
+            if( newDataObjectDirectory != null )
+                msgs = ( ( InternalEObject ) newDataObjectDirectory ).eInverseAdd( this,
+                        SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES, DataObjectDirectory.class, msgs );
+            msgs = basicSetDataObjectDirectory( newDataObjectDirectory, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldDataObjectDirectoryESet = dataObjectDirectoryESet;
             dataObjectDirectoryESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__DATA_OBJECT_DIRECTORY, newDataObjectDirectory, newDataObjectDirectory, !oldDataObjectDirectoryESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__DATA_OBJECT_DIRECTORY,
+                        newDataObjectDirectory, newDataObjectDirectory, !oldDataObjectDirectoryESet ) );
         }
     }
 
@@ -1736,9 +1859,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         dataObjectDirectory = null;
         boolean oldDataObjectDirectoryESet = dataObjectDirectoryESet;
         dataObjectDirectoryESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__DATA_OBJECT_DIRECTORY, oldDataObjectDirectory, null, oldDataObjectDirectoryESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__DATA_OBJECT_DIRECTORY, oldDataObjectDirectory, null,
+                    oldDataObjectDirectoryESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1750,17 +1878,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetDataObjectDirectory() {
-        if (dataObjectDirectory != null) {
+        if( dataObjectDirectory != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)dataObjectDirectory).eInverseRemove(this, SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES, DataObjectDirectory.class, msgs);
-            msgs = basicUnsetDataObjectDirectory(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) dataObjectDirectory ).eInverseRemove( this,
+                    SclPackage.DATA_OBJECT_DIRECTORY__PARENT_SERVICES, DataObjectDirectory.class, msgs );
+            msgs = basicUnsetDataObjectDirectory( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldDataObjectDirectoryESet = dataObjectDirectoryESet;
             dataObjectDirectoryESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__DATA_OBJECT_DIRECTORY, null, null, oldDataObjectDirectoryESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__DATA_OBJECT_DIRECTORY,
+                        null, null, oldDataObjectDirectoryESet ) );
         }
     }
 
@@ -1794,9 +1924,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         dataSetDirectory = newDataSetDirectory;
         boolean oldDataSetDirectoryESet = dataSetDirectoryESet;
         dataSetDirectoryESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__DATA_SET_DIRECTORY, oldDataSetDirectory, newDataSetDirectory, !oldDataSetDirectoryESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__DATA_SET_DIRECTORY, oldDataSetDirectory, newDataSetDirectory,
+                    !oldDataSetDirectoryESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1808,20 +1943,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setDataSetDirectory( DataSetDirectory newDataSetDirectory ) {
-        if (newDataSetDirectory != dataSetDirectory) {
+        if( newDataSetDirectory != dataSetDirectory ) {
             NotificationChain msgs = null;
-            if (dataSetDirectory != null)
-                msgs = ((InternalEObject)dataSetDirectory).eInverseRemove(this, SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES, DataSetDirectory.class, msgs);
-            if (newDataSetDirectory != null)
-                msgs = ((InternalEObject)newDataSetDirectory).eInverseAdd(this, SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES, DataSetDirectory.class, msgs);
-            msgs = basicSetDataSetDirectory(newDataSetDirectory, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( dataSetDirectory != null )
+                msgs = ( ( InternalEObject ) dataSetDirectory ).eInverseRemove( this,
+                        SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES, DataSetDirectory.class, msgs );
+            if( newDataSetDirectory != null )
+                msgs = ( ( InternalEObject ) newDataSetDirectory ).eInverseAdd( this,
+                        SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES, DataSetDirectory.class, msgs );
+            msgs = basicSetDataSetDirectory( newDataSetDirectory, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldDataSetDirectoryESet = dataSetDirectoryESet;
             dataSetDirectoryESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__DATA_SET_DIRECTORY, newDataSetDirectory, newDataSetDirectory, !oldDataSetDirectoryESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__DATA_SET_DIRECTORY,
+                        newDataSetDirectory, newDataSetDirectory, !oldDataSetDirectoryESet ) );
         }
     }
 
@@ -1835,9 +1973,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         dataSetDirectory = null;
         boolean oldDataSetDirectoryESet = dataSetDirectoryESet;
         dataSetDirectoryESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__DATA_SET_DIRECTORY, oldDataSetDirectory, null, oldDataSetDirectoryESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__DATA_SET_DIRECTORY, oldDataSetDirectory, null, oldDataSetDirectoryESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1849,17 +1991,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetDataSetDirectory() {
-        if (dataSetDirectory != null) {
+        if( dataSetDirectory != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)dataSetDirectory).eInverseRemove(this, SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES, DataSetDirectory.class, msgs);
-            msgs = basicUnsetDataSetDirectory(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) dataSetDirectory ).eInverseRemove( this,
+                    SclPackage.DATA_SET_DIRECTORY__PARENT_SERVICES, DataSetDirectory.class, msgs );
+            msgs = basicUnsetDataSetDirectory( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldDataSetDirectoryESet = dataSetDirectoryESet;
             dataSetDirectoryESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__DATA_SET_DIRECTORY, null, null, oldDataSetDirectoryESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__DATA_SET_DIRECTORY, null,
+                        null, oldDataSetDirectoryESet ) );
         }
     }
 
@@ -1893,9 +2037,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         dynAssociation = newDynAssociation;
         boolean oldDynAssociationESet = dynAssociationESet;
         dynAssociationESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__DYN_ASSOCIATION, oldDynAssociation, newDynAssociation, !oldDynAssociationESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__DYN_ASSOCIATION, oldDynAssociation, newDynAssociation,
+                    !oldDynAssociationESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1907,20 +2056,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setDynAssociation( DynAssociation newDynAssociation ) {
-        if (newDynAssociation != dynAssociation) {
+        if( newDynAssociation != dynAssociation ) {
             NotificationChain msgs = null;
-            if (dynAssociation != null)
-                msgs = ((InternalEObject)dynAssociation).eInverseRemove(this, SclPackage.DYN_ASSOCIATION__PARENT_SERVICES, DynAssociation.class, msgs);
-            if (newDynAssociation != null)
-                msgs = ((InternalEObject)newDynAssociation).eInverseAdd(this, SclPackage.DYN_ASSOCIATION__PARENT_SERVICES, DynAssociation.class, msgs);
-            msgs = basicSetDynAssociation(newDynAssociation, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( dynAssociation != null )
+                msgs = ( ( InternalEObject ) dynAssociation ).eInverseRemove( this,
+                        SclPackage.DYN_ASSOCIATION__PARENT_SERVICES, DynAssociation.class, msgs );
+            if( newDynAssociation != null )
+                msgs = ( ( InternalEObject ) newDynAssociation ).eInverseAdd( this,
+                        SclPackage.DYN_ASSOCIATION__PARENT_SERVICES, DynAssociation.class, msgs );
+            msgs = basicSetDynAssociation( newDynAssociation, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldDynAssociationESet = dynAssociationESet;
             dynAssociationESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__DYN_ASSOCIATION, newDynAssociation, newDynAssociation, !oldDynAssociationESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__DYN_ASSOCIATION,
+                        newDynAssociation, newDynAssociation, !oldDynAssociationESet ) );
         }
     }
 
@@ -1934,9 +2086,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         dynAssociation = null;
         boolean oldDynAssociationESet = dynAssociationESet;
         dynAssociationESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__DYN_ASSOCIATION, oldDynAssociation, null, oldDynAssociationESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__DYN_ASSOCIATION, oldDynAssociation, null, oldDynAssociationESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -1948,17 +2104,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetDynAssociation() {
-        if (dynAssociation != null) {
+        if( dynAssociation != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)dynAssociation).eInverseRemove(this, SclPackage.DYN_ASSOCIATION__PARENT_SERVICES, DynAssociation.class, msgs);
-            msgs = basicUnsetDynAssociation(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) dynAssociation ).eInverseRemove( this,
+                    SclPackage.DYN_ASSOCIATION__PARENT_SERVICES, DynAssociation.class, msgs );
+            msgs = basicUnsetDynAssociation( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldDynAssociationESet = dynAssociationESet;
             dynAssociationESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__DYN_ASSOCIATION, null, null, oldDynAssociationESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__DYN_ASSOCIATION, null,
+                        null, oldDynAssociationESet ) );
         }
     }
 
@@ -1992,9 +2150,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         dynDataSet = newDynDataSet;
         boolean oldDynDataSetESet = dynDataSetESet;
         dynDataSetESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__DYN_DATA_SET, oldDynDataSet, newDynDataSet, !oldDynDataSetESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__DYN_DATA_SET, oldDynDataSet, newDynDataSet, !oldDynDataSetESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2006,20 +2168,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setDynDataSet( DynDataSet newDynDataSet ) {
-        if (newDynDataSet != dynDataSet) {
+        if( newDynDataSet != dynDataSet ) {
             NotificationChain msgs = null;
-            if (dynDataSet != null)
-                msgs = ((InternalEObject)dynDataSet).eInverseRemove(this, SclPackage.DYN_DATA_SET__PARENT_SERVICES, DynDataSet.class, msgs);
-            if (newDynDataSet != null)
-                msgs = ((InternalEObject)newDynDataSet).eInverseAdd(this, SclPackage.DYN_DATA_SET__PARENT_SERVICES, DynDataSet.class, msgs);
-            msgs = basicSetDynDataSet(newDynDataSet, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( dynDataSet != null )
+                msgs = ( ( InternalEObject ) dynDataSet ).eInverseRemove( this,
+                        SclPackage.DYN_DATA_SET__PARENT_SERVICES, DynDataSet.class, msgs );
+            if( newDynDataSet != null )
+                msgs = ( ( InternalEObject ) newDynDataSet ).eInverseAdd( this,
+                        SclPackage.DYN_DATA_SET__PARENT_SERVICES, DynDataSet.class, msgs );
+            msgs = basicSetDynDataSet( newDynDataSet, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldDynDataSetESet = dynDataSetESet;
             dynDataSetESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__DYN_DATA_SET, newDynDataSet, newDynDataSet, !oldDynDataSetESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__DYN_DATA_SET,
+                        newDynDataSet, newDynDataSet, !oldDynDataSetESet ) );
         }
     }
 
@@ -2033,9 +2198,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         dynDataSet = null;
         boolean oldDynDataSetESet = dynDataSetESet;
         dynDataSetESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__DYN_DATA_SET, oldDynDataSet, null, oldDynDataSetESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__DYN_DATA_SET, oldDynDataSet, null, oldDynDataSetESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2047,17 +2216,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetDynDataSet() {
-        if (dynDataSet != null) {
+        if( dynDataSet != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)dynDataSet).eInverseRemove(this, SclPackage.DYN_DATA_SET__PARENT_SERVICES, DynDataSet.class, msgs);
-            msgs = basicUnsetDynDataSet(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) dynDataSet ).eInverseRemove( this, SclPackage.DYN_DATA_SET__PARENT_SERVICES,
+                    DynDataSet.class, msgs );
+            msgs = basicUnsetDynDataSet( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldDynDataSetESet = dynDataSetESet;
             dynDataSetESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__DYN_DATA_SET, null, null, oldDynDataSetESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__DYN_DATA_SET, null, null,
+                        oldDynDataSetESet ) );
         }
     }
 
@@ -2091,9 +2262,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         fileHandling = newFileHandling;
         boolean oldFileHandlingESet = fileHandlingESet;
         fileHandlingESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__FILE_HANDLING, oldFileHandling, newFileHandling, !oldFileHandlingESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__FILE_HANDLING, oldFileHandling, newFileHandling, !oldFileHandlingESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2105,20 +2280,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setFileHandling( FileHandling newFileHandling ) {
-        if (newFileHandling != fileHandling) {
+        if( newFileHandling != fileHandling ) {
             NotificationChain msgs = null;
-            if (fileHandling != null)
-                msgs = ((InternalEObject)fileHandling).eInverseRemove(this, SclPackage.FILE_HANDLING__PARENT_SERVICES, FileHandling.class, msgs);
-            if (newFileHandling != null)
-                msgs = ((InternalEObject)newFileHandling).eInverseAdd(this, SclPackage.FILE_HANDLING__PARENT_SERVICES, FileHandling.class, msgs);
-            msgs = basicSetFileHandling(newFileHandling, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( fileHandling != null )
+                msgs = ( ( InternalEObject ) fileHandling ).eInverseRemove( this,
+                        SclPackage.FILE_HANDLING__PARENT_SERVICES, FileHandling.class, msgs );
+            if( newFileHandling != null )
+                msgs = ( ( InternalEObject ) newFileHandling ).eInverseAdd( this,
+                        SclPackage.FILE_HANDLING__PARENT_SERVICES, FileHandling.class, msgs );
+            msgs = basicSetFileHandling( newFileHandling, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldFileHandlingESet = fileHandlingESet;
             fileHandlingESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__FILE_HANDLING, newFileHandling, newFileHandling, !oldFileHandlingESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__FILE_HANDLING,
+                        newFileHandling, newFileHandling, !oldFileHandlingESet ) );
         }
     }
 
@@ -2132,9 +2310,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         fileHandling = null;
         boolean oldFileHandlingESet = fileHandlingESet;
         fileHandlingESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__FILE_HANDLING, oldFileHandling, null, oldFileHandlingESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__FILE_HANDLING, oldFileHandling, null, oldFileHandlingESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2146,17 +2328,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetFileHandling() {
-        if (fileHandling != null) {
+        if( fileHandling != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)fileHandling).eInverseRemove(this, SclPackage.FILE_HANDLING__PARENT_SERVICES, FileHandling.class, msgs);
-            msgs = basicUnsetFileHandling(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) fileHandling ).eInverseRemove( this, SclPackage.FILE_HANDLING__PARENT_SERVICES,
+                    FileHandling.class, msgs );
+            msgs = basicUnsetFileHandling( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldFileHandlingESet = fileHandlingESet;
             fileHandlingESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__FILE_HANDLING, null, null, oldFileHandlingESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__FILE_HANDLING, null,
+                        null, oldFileHandlingESet ) );
         }
     }
 
@@ -2190,9 +2374,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         goose = newGOOSE;
         boolean oldGOOSEESet = gooseESet;
         gooseESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GOOSE, oldGOOSE, newGOOSE, !oldGOOSEESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__GOOSE,
+                    oldGOOSE, newGOOSE, !oldGOOSEESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2204,20 +2392,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setGOOSE( GOOSE newGOOSE ) {
-        if (newGOOSE != goose) {
+        if( newGOOSE != goose ) {
             NotificationChain msgs = null;
-            if (goose != null)
-                msgs = ((InternalEObject)goose).eInverseRemove(this, SclPackage.GOOSE__PARENT_SERVICES, GOOSE.class, msgs);
-            if (newGOOSE != null)
-                msgs = ((InternalEObject)newGOOSE).eInverseAdd(this, SclPackage.GOOSE__PARENT_SERVICES, GOOSE.class, msgs);
-            msgs = basicSetGOOSE(newGOOSE, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( goose != null )
+                msgs = ( ( InternalEObject ) goose ).eInverseRemove( this, SclPackage.GOOSE__PARENT_SERVICES,
+                        GOOSE.class, msgs );
+            if( newGOOSE != null )
+                msgs = ( ( InternalEObject ) newGOOSE ).eInverseAdd( this, SclPackage.GOOSE__PARENT_SERVICES,
+                        GOOSE.class, msgs );
+            msgs = basicSetGOOSE( newGOOSE, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGOOSEESet = gooseESet;
             gooseESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GOOSE, newGOOSE, newGOOSE, !oldGOOSEESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__GOOSE, newGOOSE, newGOOSE,
+                        !oldGOOSEESet ) );
         }
     }
 
@@ -2231,9 +2422,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         goose = null;
         boolean oldGOOSEESet = gooseESet;
         gooseESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GOOSE, oldGOOSE, null, oldGOOSEESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__GOOSE, oldGOOSE, null, oldGOOSEESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2245,17 +2440,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetGOOSE() {
-        if (goose != null) {
+        if( goose != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)goose).eInverseRemove(this, SclPackage.GOOSE__PARENT_SERVICES, GOOSE.class, msgs);
-            msgs = basicUnsetGOOSE(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) goose ).eInverseRemove( this, SclPackage.GOOSE__PARENT_SERVICES, GOOSE.class,
+                    msgs );
+            msgs = basicUnsetGOOSE( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGOOSEESet = gooseESet;
             gooseESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GOOSE, null, null, oldGOOSEESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__GOOSE, null, null,
+                        oldGOOSEESet ) );
         }
     }
 
@@ -2289,9 +2486,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         gseDir = newGSEDir;
         boolean oldGSEDirESet = gseDirESet;
         gseDirESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GSE_DIR, oldGSEDir, newGSEDir, !oldGSEDirESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__GSE_DIR, oldGSEDir, newGSEDir, !oldGSEDirESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2303,20 +2504,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setGSEDir( GSEDir newGSEDir ) {
-        if (newGSEDir != gseDir) {
+        if( newGSEDir != gseDir ) {
             NotificationChain msgs = null;
-            if (gseDir != null)
-                msgs = ((InternalEObject)gseDir).eInverseRemove(this, SclPackage.GSE_DIR__PARENT_SERVICES, GSEDir.class, msgs);
-            if (newGSEDir != null)
-                msgs = ((InternalEObject)newGSEDir).eInverseAdd(this, SclPackage.GSE_DIR__PARENT_SERVICES, GSEDir.class, msgs);
-            msgs = basicSetGSEDir(newGSEDir, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( gseDir != null )
+                msgs = ( ( InternalEObject ) gseDir ).eInverseRemove( this, SclPackage.GSE_DIR__PARENT_SERVICES,
+                        GSEDir.class, msgs );
+            if( newGSEDir != null )
+                msgs = ( ( InternalEObject ) newGSEDir ).eInverseAdd( this, SclPackage.GSE_DIR__PARENT_SERVICES,
+                        GSEDir.class, msgs );
+            msgs = basicSetGSEDir( newGSEDir, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGSEDirESet = gseDirESet;
             gseDirESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GSE_DIR, newGSEDir, newGSEDir, !oldGSEDirESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__GSE_DIR, newGSEDir,
+                        newGSEDir, !oldGSEDirESet ) );
         }
     }
 
@@ -2330,9 +2534,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         gseDir = null;
         boolean oldGSEDirESet = gseDirESet;
         gseDirESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GSE_DIR, oldGSEDir, null, oldGSEDirESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__GSE_DIR, oldGSEDir, null, oldGSEDirESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2344,17 +2552,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetGSEDir() {
-        if (gseDir != null) {
+        if( gseDir != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)gseDir).eInverseRemove(this, SclPackage.GSE_DIR__PARENT_SERVICES, GSEDir.class, msgs);
-            msgs = basicUnsetGSEDir(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) gseDir ).eInverseRemove( this, SclPackage.GSE_DIR__PARENT_SERVICES,
+                    GSEDir.class, msgs );
+            msgs = basicUnsetGSEDir( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGSEDirESet = gseDirESet;
             gseDirESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GSE_DIR, null, null, oldGSEDirESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__GSE_DIR, null, null,
+                        oldGSEDirESet ) );
         }
     }
 
@@ -2388,9 +2598,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         gseSettings = newGSESettings;
         boolean oldGSESettingsESet = gseSettingsESet;
         gseSettingsESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GSE_SETTINGS, oldGSESettings, newGSESettings, !oldGSESettingsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__GSE_SETTINGS, oldGSESettings, newGSESettings, !oldGSESettingsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2402,20 +2616,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setGSESettings( GSESettings newGSESettings ) {
-        if (newGSESettings != gseSettings) {
+        if( newGSESettings != gseSettings ) {
             NotificationChain msgs = null;
-            if (gseSettings != null)
-                msgs = ((InternalEObject)gseSettings).eInverseRemove(this, SclPackage.GSE_SETTINGS__PARENT_SERVICES, GSESettings.class, msgs);
-            if (newGSESettings != null)
-                msgs = ((InternalEObject)newGSESettings).eInverseAdd(this, SclPackage.GSE_SETTINGS__PARENT_SERVICES, GSESettings.class, msgs);
-            msgs = basicSetGSESettings(newGSESettings, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( gseSettings != null )
+                msgs = ( ( InternalEObject ) gseSettings ).eInverseRemove( this,
+                        SclPackage.GSE_SETTINGS__PARENT_SERVICES, GSESettings.class, msgs );
+            if( newGSESettings != null )
+                msgs = ( ( InternalEObject ) newGSESettings ).eInverseAdd( this,
+                        SclPackage.GSE_SETTINGS__PARENT_SERVICES, GSESettings.class, msgs );
+            msgs = basicSetGSESettings( newGSESettings, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGSESettingsESet = gseSettingsESet;
             gseSettingsESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GSE_SETTINGS, newGSESettings, newGSESettings, !oldGSESettingsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__GSE_SETTINGS,
+                        newGSESettings, newGSESettings, !oldGSESettingsESet ) );
         }
     }
 
@@ -2429,9 +2646,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         gseSettings = null;
         boolean oldGSESettingsESet = gseSettingsESet;
         gseSettingsESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GSE_SETTINGS, oldGSESettings, null, oldGSESettingsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__GSE_SETTINGS, oldGSESettings, null, oldGSESettingsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2443,17 +2664,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetGSESettings() {
-        if (gseSettings != null) {
+        if( gseSettings != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)gseSettings).eInverseRemove(this, SclPackage.GSE_SETTINGS__PARENT_SERVICES, GSESettings.class, msgs);
-            msgs = basicUnsetGSESettings(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) gseSettings ).eInverseRemove( this, SclPackage.GSE_SETTINGS__PARENT_SERVICES,
+                    GSESettings.class, msgs );
+            msgs = basicUnsetGSESettings( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGSESettingsESet = gseSettingsESet;
             gseSettingsESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GSE_SETTINGS, null, null, oldGSESettingsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__GSE_SETTINGS, null, null,
+                        oldGSESettingsESet ) );
         }
     }
 
@@ -2487,9 +2710,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         gsse = newGSSE;
         boolean oldGSSEESet = gsseESet;
         gsseESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GSSE, oldGSSE, newGSSE, !oldGSSEESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__GSSE,
+                    oldGSSE, newGSSE, !oldGSSEESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2501,20 +2728,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setGSSE( GSSE newGSSE ) {
-        if (newGSSE != gsse) {
+        if( newGSSE != gsse ) {
             NotificationChain msgs = null;
-            if (gsse != null)
-                msgs = ((InternalEObject)gsse).eInverseRemove(this, SclPackage.GSSE__PARENT_SERVICES, GSSE.class, msgs);
-            if (newGSSE != null)
-                msgs = ((InternalEObject)newGSSE).eInverseAdd(this, SclPackage.GSSE__PARENT_SERVICES, GSSE.class, msgs);
-            msgs = basicSetGSSE(newGSSE, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( gsse != null )
+                msgs = ( ( InternalEObject ) gsse ).eInverseRemove( this, SclPackage.GSSE__PARENT_SERVICES, GSSE.class,
+                        msgs );
+            if( newGSSE != null )
+                msgs = ( ( InternalEObject ) newGSSE ).eInverseAdd( this, SclPackage.GSSE__PARENT_SERVICES, GSSE.class,
+                        msgs );
+            msgs = basicSetGSSE( newGSSE, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGSSEESet = gsseESet;
             gsseESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GSSE, newGSSE, newGSSE, !oldGSSEESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__GSSE, newGSSE, newGSSE,
+                        !oldGSSEESet ) );
         }
     }
 
@@ -2528,9 +2758,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         gsse = null;
         boolean oldGSSEESet = gsseESet;
         gsseESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GSSE, oldGSSE, null, oldGSSEESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__GSSE,
+                    oldGSSE, null, oldGSSEESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2542,17 +2776,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetGSSE() {
-        if (gsse != null) {
+        if( gsse != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)gsse).eInverseRemove(this, SclPackage.GSSE__PARENT_SERVICES, GSSE.class, msgs);
-            msgs = basicUnsetGSSE(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) gsse ).eInverseRemove( this, SclPackage.GSSE__PARENT_SERVICES, GSSE.class,
+                    msgs );
+            msgs = basicUnsetGSSE( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGSSEESet = gsseESet;
             gsseESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GSSE, null, null, oldGSSEESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__GSSE, null, null,
+                        oldGSSEESet ) );
         }
     }
 
@@ -2586,9 +2822,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         getCBValues = newGetCBValues;
         boolean oldGetCBValuesESet = getCBValuesESet;
         getCBValuesESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GET_CB_VALUES, oldGetCBValues, newGetCBValues, !oldGetCBValuesESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__GET_CB_VALUES, oldGetCBValues, newGetCBValues, !oldGetCBValuesESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2600,20 +2840,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setGetCBValues( GetCBValues newGetCBValues ) {
-        if (newGetCBValues != getCBValues) {
+        if( newGetCBValues != getCBValues ) {
             NotificationChain msgs = null;
-            if (getCBValues != null)
-                msgs = ((InternalEObject)getCBValues).eInverseRemove(this, SclPackage.GET_CB_VALUES__PARENT_SERVICES, GetCBValues.class, msgs);
-            if (newGetCBValues != null)
-                msgs = ((InternalEObject)newGetCBValues).eInverseAdd(this, SclPackage.GET_CB_VALUES__PARENT_SERVICES, GetCBValues.class, msgs);
-            msgs = basicSetGetCBValues(newGetCBValues, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( getCBValues != null )
+                msgs = ( ( InternalEObject ) getCBValues ).eInverseRemove( this,
+                        SclPackage.GET_CB_VALUES__PARENT_SERVICES, GetCBValues.class, msgs );
+            if( newGetCBValues != null )
+                msgs = ( ( InternalEObject ) newGetCBValues ).eInverseAdd( this,
+                        SclPackage.GET_CB_VALUES__PARENT_SERVICES, GetCBValues.class, msgs );
+            msgs = basicSetGetCBValues( newGetCBValues, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGetCBValuesESet = getCBValuesESet;
             getCBValuesESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GET_CB_VALUES, newGetCBValues, newGetCBValues, !oldGetCBValuesESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__GET_CB_VALUES,
+                        newGetCBValues, newGetCBValues, !oldGetCBValuesESet ) );
         }
     }
 
@@ -2627,9 +2870,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         getCBValues = null;
         boolean oldGetCBValuesESet = getCBValuesESet;
         getCBValuesESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GET_CB_VALUES, oldGetCBValues, null, oldGetCBValuesESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__GET_CB_VALUES, oldGetCBValues, null, oldGetCBValuesESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2641,17 +2888,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetGetCBValues() {
-        if (getCBValues != null) {
+        if( getCBValues != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)getCBValues).eInverseRemove(this, SclPackage.GET_CB_VALUES__PARENT_SERVICES, GetCBValues.class, msgs);
-            msgs = basicUnsetGetCBValues(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) getCBValues ).eInverseRemove( this, SclPackage.GET_CB_VALUES__PARENT_SERVICES,
+                    GetCBValues.class, msgs );
+            msgs = basicUnsetGetCBValues( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGetCBValuesESet = getCBValuesESet;
             getCBValuesESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GET_CB_VALUES, null, null, oldGetCBValuesESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__GET_CB_VALUES, null,
+                        null, oldGetCBValuesESet ) );
         }
     }
 
@@ -2686,9 +2935,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         getDataObjectDefinition = newGetDataObjectDefinition;
         boolean oldGetDataObjectDefinitionESet = getDataObjectDefinitionESet;
         getDataObjectDefinitionESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION, oldGetDataObjectDefinition, newGetDataObjectDefinition, !oldGetDataObjectDefinitionESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION, oldGetDataObjectDefinition,
+                    newGetDataObjectDefinition, !oldGetDataObjectDefinitionESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2700,20 +2954,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setGetDataObjectDefinition( GetDataObjectDefinition newGetDataObjectDefinition ) {
-        if (newGetDataObjectDefinition != getDataObjectDefinition) {
+        if( newGetDataObjectDefinition != getDataObjectDefinition ) {
             NotificationChain msgs = null;
-            if (getDataObjectDefinition != null)
-                msgs = ((InternalEObject)getDataObjectDefinition).eInverseRemove(this, SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES, GetDataObjectDefinition.class, msgs);
-            if (newGetDataObjectDefinition != null)
-                msgs = ((InternalEObject)newGetDataObjectDefinition).eInverseAdd(this, SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES, GetDataObjectDefinition.class, msgs);
-            msgs = basicSetGetDataObjectDefinition(newGetDataObjectDefinition, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( getDataObjectDefinition != null )
+                msgs = ( ( InternalEObject ) getDataObjectDefinition ).eInverseRemove( this,
+                        SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES, GetDataObjectDefinition.class, msgs );
+            if( newGetDataObjectDefinition != null )
+                msgs = ( ( InternalEObject ) newGetDataObjectDefinition ).eInverseAdd( this,
+                        SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES, GetDataObjectDefinition.class, msgs );
+            msgs = basicSetGetDataObjectDefinition( newGetDataObjectDefinition, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGetDataObjectDefinitionESet = getDataObjectDefinitionESet;
             getDataObjectDefinitionESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION, newGetDataObjectDefinition, newGetDataObjectDefinition, !oldGetDataObjectDefinitionESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION,
+                        newGetDataObjectDefinition, newGetDataObjectDefinition, !oldGetDataObjectDefinitionESet ) );
         }
     }
 
@@ -2727,9 +2984,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         getDataObjectDefinition = null;
         boolean oldGetDataObjectDefinitionESet = getDataObjectDefinitionESet;
         getDataObjectDefinitionESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION, oldGetDataObjectDefinition, null, oldGetDataObjectDefinitionESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION, oldGetDataObjectDefinition, null,
+                    oldGetDataObjectDefinitionESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2741,17 +3003,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetGetDataObjectDefinition() {
-        if (getDataObjectDefinition != null) {
+        if( getDataObjectDefinition != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)getDataObjectDefinition).eInverseRemove(this, SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES, GetDataObjectDefinition.class, msgs);
-            msgs = basicUnsetGetDataObjectDefinition(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) getDataObjectDefinition ).eInverseRemove( this,
+                    SclPackage.GET_DATA_OBJECT_DEFINITION__PARENT_SERVICES, GetDataObjectDefinition.class, msgs );
+            msgs = basicUnsetGetDataObjectDefinition( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGetDataObjectDefinitionESet = getDataObjectDefinitionESet;
             getDataObjectDefinitionESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION, null, null, oldGetDataObjectDefinitionESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET,
+                        SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION, null, null, oldGetDataObjectDefinitionESet ) );
         }
     }
 
@@ -2785,9 +3049,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         getDataSetValue = newGetDataSetValue;
         boolean oldGetDataSetValueESet = getDataSetValueESet;
         getDataSetValueESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GET_DATA_SET_VALUE, oldGetDataSetValue, newGetDataSetValue, !oldGetDataSetValueESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__GET_DATA_SET_VALUE, oldGetDataSetValue, newGetDataSetValue,
+                    !oldGetDataSetValueESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2799,20 +3068,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setGetDataSetValue( GetDataSetValue newGetDataSetValue ) {
-        if (newGetDataSetValue != getDataSetValue) {
+        if( newGetDataSetValue != getDataSetValue ) {
             NotificationChain msgs = null;
-            if (getDataSetValue != null)
-                msgs = ((InternalEObject)getDataSetValue).eInverseRemove(this, SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES, GetDataSetValue.class, msgs);
-            if (newGetDataSetValue != null)
-                msgs = ((InternalEObject)newGetDataSetValue).eInverseAdd(this, SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES, GetDataSetValue.class, msgs);
-            msgs = basicSetGetDataSetValue(newGetDataSetValue, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( getDataSetValue != null )
+                msgs = ( ( InternalEObject ) getDataSetValue ).eInverseRemove( this,
+                        SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES, GetDataSetValue.class, msgs );
+            if( newGetDataSetValue != null )
+                msgs = ( ( InternalEObject ) newGetDataSetValue ).eInverseAdd( this,
+                        SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES, GetDataSetValue.class, msgs );
+            msgs = basicSetGetDataSetValue( newGetDataSetValue, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGetDataSetValueESet = getDataSetValueESet;
             getDataSetValueESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GET_DATA_SET_VALUE, newGetDataSetValue, newGetDataSetValue, !oldGetDataSetValueESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__GET_DATA_SET_VALUE,
+                        newGetDataSetValue, newGetDataSetValue, !oldGetDataSetValueESet ) );
         }
     }
 
@@ -2826,9 +3098,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         getDataSetValue = null;
         boolean oldGetDataSetValueESet = getDataSetValueESet;
         getDataSetValueESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GET_DATA_SET_VALUE, oldGetDataSetValue, null, oldGetDataSetValueESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__GET_DATA_SET_VALUE, oldGetDataSetValue, null, oldGetDataSetValueESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2840,17 +3116,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetGetDataSetValue() {
-        if (getDataSetValue != null) {
+        if( getDataSetValue != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)getDataSetValue).eInverseRemove(this, SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES, GetDataSetValue.class, msgs);
-            msgs = basicUnsetGetDataSetValue(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) getDataSetValue ).eInverseRemove( this,
+                    SclPackage.GET_DATA_SET_VALUE__PARENT_SERVICES, GetDataSetValue.class, msgs );
+            msgs = basicUnsetGetDataSetValue( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGetDataSetValueESet = getDataSetValueESet;
             getDataSetValueESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GET_DATA_SET_VALUE, null, null, oldGetDataSetValueESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__GET_DATA_SET_VALUE, null,
+                        null, oldGetDataSetValueESet ) );
         }
     }
 
@@ -2884,9 +3162,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         getDirectory = newGetDirectory;
         boolean oldGetDirectoryESet = getDirectoryESet;
         getDirectoryESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GET_DIRECTORY, oldGetDirectory, newGetDirectory, !oldGetDirectoryESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__GET_DIRECTORY, oldGetDirectory, newGetDirectory, !oldGetDirectoryESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2898,20 +3180,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setGetDirectory( GetDirectory newGetDirectory ) {
-        if (newGetDirectory != getDirectory) {
+        if( newGetDirectory != getDirectory ) {
             NotificationChain msgs = null;
-            if (getDirectory != null)
-                msgs = ((InternalEObject)getDirectory).eInverseRemove(this, SclPackage.GET_DIRECTORY__PARENT_SERVICES, GetDirectory.class, msgs);
-            if (newGetDirectory != null)
-                msgs = ((InternalEObject)newGetDirectory).eInverseAdd(this, SclPackage.GET_DIRECTORY__PARENT_SERVICES, GetDirectory.class, msgs);
-            msgs = basicSetGetDirectory(newGetDirectory, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( getDirectory != null )
+                msgs = ( ( InternalEObject ) getDirectory ).eInverseRemove( this,
+                        SclPackage.GET_DIRECTORY__PARENT_SERVICES, GetDirectory.class, msgs );
+            if( newGetDirectory != null )
+                msgs = ( ( InternalEObject ) newGetDirectory ).eInverseAdd( this,
+                        SclPackage.GET_DIRECTORY__PARENT_SERVICES, GetDirectory.class, msgs );
+            msgs = basicSetGetDirectory( newGetDirectory, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGetDirectoryESet = getDirectoryESet;
             getDirectoryESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__GET_DIRECTORY, newGetDirectory, newGetDirectory, !oldGetDirectoryESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__GET_DIRECTORY,
+                        newGetDirectory, newGetDirectory, !oldGetDirectoryESet ) );
         }
     }
 
@@ -2925,9 +3210,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         getDirectory = null;
         boolean oldGetDirectoryESet = getDirectoryESet;
         getDirectoryESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GET_DIRECTORY, oldGetDirectory, null, oldGetDirectoryESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__GET_DIRECTORY, oldGetDirectory, null, oldGetDirectoryESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -2939,17 +3228,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetGetDirectory() {
-        if (getDirectory != null) {
+        if( getDirectory != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)getDirectory).eInverseRemove(this, SclPackage.GET_DIRECTORY__PARENT_SERVICES, GetDirectory.class, msgs);
-            msgs = basicUnsetGetDirectory(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) getDirectory ).eInverseRemove( this, SclPackage.GET_DIRECTORY__PARENT_SERVICES,
+                    GetDirectory.class, msgs );
+            msgs = basicUnsetGetDirectory( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldGetDirectoryESet = getDirectoryESet;
             getDirectoryESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__GET_DIRECTORY, null, null, oldGetDirectoryESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__GET_DIRECTORY, null,
+                        null, oldGetDirectoryESet ) );
         }
     }
 
@@ -2970,8 +3261,8 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public IED getParentIED() {
-        if (eContainerFeatureID() != SclPackage.SERVICES__PARENT_IED) return null;
-        return (IED)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SERVICES__PARENT_IED ) return null;
+        return ( IED ) eInternalContainer();
     }
 
     /**
@@ -2979,8 +3270,8 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentIED(IED newParentIED, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentIED, SclPackage.SERVICES__PARENT_IED, msgs);
+    public NotificationChain basicSetParentIED( IED newParentIED, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentIED, SclPackage.SERVICES__PARENT_IED, msgs );
         return msgs;
     }
 
@@ -2990,20 +3281,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      * @generated
      */
     @Override
-    public void setParentIED(IED newParentIED) {
-        if (newParentIED != eInternalContainer() || (eContainerFeatureID() != SclPackage.SERVICES__PARENT_IED && newParentIED != null)) {
-            if (EcoreUtil.isAncestor(this, newParentIED))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentIED( IED newParentIED ) {
+        if( newParentIED != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SERVICES__PARENT_IED && newParentIED != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentIED ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentIED != null)
-                msgs = ((InternalEObject)newParentIED).eInverseAdd(this, SclPackage.IED__SERVICES, IED.class, msgs);
-            msgs = basicSetParentIED(newParentIED, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentIED != null )
+                msgs = ( ( InternalEObject ) newParentIED ).eInverseAdd( this, SclPackage.IED__SERVICES, IED.class,
+                        msgs );
+            msgs = basicSetParentIED( newParentIED, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__PARENT_IED, newParentIED, newParentIED));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__PARENT_IED, newParentIED,
+                    newParentIED ) );
     }
 
     /**
@@ -3026,9 +3320,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         logSettings = newLogSettings;
         boolean oldLogSettingsESet = logSettingsESet;
         logSettingsESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__LOG_SETTINGS, oldLogSettings, newLogSettings, !oldLogSettingsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__LOG_SETTINGS, oldLogSettings, newLogSettings, !oldLogSettingsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3040,20 +3338,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setLogSettings( LogSettings newLogSettings ) {
-        if (newLogSettings != logSettings) {
+        if( newLogSettings != logSettings ) {
             NotificationChain msgs = null;
-            if (logSettings != null)
-                msgs = ((InternalEObject)logSettings).eInverseRemove(this, SclPackage.LOG_SETTINGS__PARENT_SERVICES, LogSettings.class, msgs);
-            if (newLogSettings != null)
-                msgs = ((InternalEObject)newLogSettings).eInverseAdd(this, SclPackage.LOG_SETTINGS__PARENT_SERVICES, LogSettings.class, msgs);
-            msgs = basicSetLogSettings(newLogSettings, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( logSettings != null )
+                msgs = ( ( InternalEObject ) logSettings ).eInverseRemove( this,
+                        SclPackage.LOG_SETTINGS__PARENT_SERVICES, LogSettings.class, msgs );
+            if( newLogSettings != null )
+                msgs = ( ( InternalEObject ) newLogSettings ).eInverseAdd( this,
+                        SclPackage.LOG_SETTINGS__PARENT_SERVICES, LogSettings.class, msgs );
+            msgs = basicSetLogSettings( newLogSettings, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldLogSettingsESet = logSettingsESet;
             logSettingsESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__LOG_SETTINGS, newLogSettings, newLogSettings, !oldLogSettingsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__LOG_SETTINGS,
+                        newLogSettings, newLogSettings, !oldLogSettingsESet ) );
         }
     }
 
@@ -3067,9 +3368,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         logSettings = null;
         boolean oldLogSettingsESet = logSettingsESet;
         logSettingsESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__LOG_SETTINGS, oldLogSettings, null, oldLogSettingsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__LOG_SETTINGS, oldLogSettings, null, oldLogSettingsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3081,17 +3386,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetLogSettings() {
-        if (logSettings != null) {
+        if( logSettings != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)logSettings).eInverseRemove(this, SclPackage.LOG_SETTINGS__PARENT_SERVICES, LogSettings.class, msgs);
-            msgs = basicUnsetLogSettings(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) logSettings ).eInverseRemove( this, SclPackage.LOG_SETTINGS__PARENT_SERVICES,
+                    LogSettings.class, msgs );
+            msgs = basicUnsetLogSettings( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldLogSettingsESet = logSettingsESet;
             logSettingsESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__LOG_SETTINGS, null, null, oldLogSettingsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__LOG_SETTINGS, null, null,
+                        oldLogSettingsESet ) );
         }
     }
 
@@ -3125,9 +3432,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         readWrite = newReadWrite;
         boolean oldReadWriteESet = readWriteESet;
         readWriteESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__READ_WRITE, oldReadWrite, newReadWrite, !oldReadWriteESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__READ_WRITE, oldReadWrite, newReadWrite, !oldReadWriteESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3139,20 +3450,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setReadWrite( ReadWrite newReadWrite ) {
-        if (newReadWrite != readWrite) {
+        if( newReadWrite != readWrite ) {
             NotificationChain msgs = null;
-            if (readWrite != null)
-                msgs = ((InternalEObject)readWrite).eInverseRemove(this, SclPackage.READ_WRITE__PARENT_SERVICES, ReadWrite.class, msgs);
-            if (newReadWrite != null)
-                msgs = ((InternalEObject)newReadWrite).eInverseAdd(this, SclPackage.READ_WRITE__PARENT_SERVICES, ReadWrite.class, msgs);
-            msgs = basicSetReadWrite(newReadWrite, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( readWrite != null )
+                msgs = ( ( InternalEObject ) readWrite ).eInverseRemove( this, SclPackage.READ_WRITE__PARENT_SERVICES,
+                        ReadWrite.class, msgs );
+            if( newReadWrite != null )
+                msgs = ( ( InternalEObject ) newReadWrite ).eInverseAdd( this, SclPackage.READ_WRITE__PARENT_SERVICES,
+                        ReadWrite.class, msgs );
+            msgs = basicSetReadWrite( newReadWrite, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldReadWriteESet = readWriteESet;
             readWriteESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__READ_WRITE, newReadWrite, newReadWrite, !oldReadWriteESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__READ_WRITE, newReadWrite,
+                        newReadWrite, !oldReadWriteESet ) );
         }
     }
 
@@ -3166,9 +3480,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         readWrite = null;
         boolean oldReadWriteESet = readWriteESet;
         readWriteESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__READ_WRITE, oldReadWrite, null, oldReadWriteESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__READ_WRITE, oldReadWrite, null, oldReadWriteESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3180,17 +3498,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetReadWrite() {
-        if (readWrite != null) {
+        if( readWrite != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)readWrite).eInverseRemove(this, SclPackage.READ_WRITE__PARENT_SERVICES, ReadWrite.class, msgs);
-            msgs = basicUnsetReadWrite(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) readWrite ).eInverseRemove( this, SclPackage.READ_WRITE__PARENT_SERVICES,
+                    ReadWrite.class, msgs );
+            msgs = basicUnsetReadWrite( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldReadWriteESet = readWriteESet;
             readWriteESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__READ_WRITE, null, null, oldReadWriteESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__READ_WRITE, null, null,
+                        oldReadWriteESet ) );
         }
     }
 
@@ -3224,9 +3544,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         redProt = newRedProt;
         boolean oldRedProtESet = redProtESet;
         redProtESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__RED_PROT, oldRedProt, newRedProt, !oldRedProtESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__RED_PROT, oldRedProt, newRedProt, !oldRedProtESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3238,20 +3562,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setRedProt( RedProt newRedProt ) {
-        if (newRedProt != redProt) {
+        if( newRedProt != redProt ) {
             NotificationChain msgs = null;
-            if (redProt != null)
-                msgs = ((InternalEObject)redProt).eInverseRemove(this, SclPackage.RED_PROT__PARENT_SERVICES, RedProt.class, msgs);
-            if (newRedProt != null)
-                msgs = ((InternalEObject)newRedProt).eInverseAdd(this, SclPackage.RED_PROT__PARENT_SERVICES, RedProt.class, msgs);
-            msgs = basicSetRedProt(newRedProt, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( redProt != null )
+                msgs = ( ( InternalEObject ) redProt ).eInverseRemove( this, SclPackage.RED_PROT__PARENT_SERVICES,
+                        RedProt.class, msgs );
+            if( newRedProt != null )
+                msgs = ( ( InternalEObject ) newRedProt ).eInverseAdd( this, SclPackage.RED_PROT__PARENT_SERVICES,
+                        RedProt.class, msgs );
+            msgs = basicSetRedProt( newRedProt, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRedProtESet = redProtESet;
             redProtESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__RED_PROT, newRedProt, newRedProt, !oldRedProtESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__RED_PROT, newRedProt,
+                        newRedProt, !oldRedProtESet ) );
         }
     }
 
@@ -3265,9 +3592,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         redProt = null;
         boolean oldRedProtESet = redProtESet;
         redProtESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__RED_PROT, oldRedProt, null, oldRedProtESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__RED_PROT, oldRedProt, null, oldRedProtESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3279,17 +3610,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetRedProt() {
-        if (redProt != null) {
+        if( redProt != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)redProt).eInverseRemove(this, SclPackage.RED_PROT__PARENT_SERVICES, RedProt.class, msgs);
-            msgs = basicUnsetRedProt(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) redProt ).eInverseRemove( this, SclPackage.RED_PROT__PARENT_SERVICES,
+                    RedProt.class, msgs );
+            msgs = basicUnsetRedProt( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRedProtESet = redProtESet;
             redProtESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__RED_PROT, null, null, oldRedProtESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__RED_PROT, null, null,
+                        oldRedProtESet ) );
         }
     }
 
@@ -3323,9 +3656,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         reportSettings = newReportSettings;
         boolean oldReportSettingsESet = reportSettingsESet;
         reportSettingsESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__REPORT_SETTINGS, oldReportSettings, newReportSettings, !oldReportSettingsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__REPORT_SETTINGS, oldReportSettings, newReportSettings,
+                    !oldReportSettingsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3337,20 +3675,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setReportSettings( ReportSettings newReportSettings ) {
-        if (newReportSettings != reportSettings) {
+        if( newReportSettings != reportSettings ) {
             NotificationChain msgs = null;
-            if (reportSettings != null)
-                msgs = ((InternalEObject)reportSettings).eInverseRemove(this, SclPackage.REPORT_SETTINGS__PARENT_SERVICES, ReportSettings.class, msgs);
-            if (newReportSettings != null)
-                msgs = ((InternalEObject)newReportSettings).eInverseAdd(this, SclPackage.REPORT_SETTINGS__PARENT_SERVICES, ReportSettings.class, msgs);
-            msgs = basicSetReportSettings(newReportSettings, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( reportSettings != null )
+                msgs = ( ( InternalEObject ) reportSettings ).eInverseRemove( this,
+                        SclPackage.REPORT_SETTINGS__PARENT_SERVICES, ReportSettings.class, msgs );
+            if( newReportSettings != null )
+                msgs = ( ( InternalEObject ) newReportSettings ).eInverseAdd( this,
+                        SclPackage.REPORT_SETTINGS__PARENT_SERVICES, ReportSettings.class, msgs );
+            msgs = basicSetReportSettings( newReportSettings, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldReportSettingsESet = reportSettingsESet;
             reportSettingsESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__REPORT_SETTINGS, newReportSettings, newReportSettings, !oldReportSettingsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__REPORT_SETTINGS,
+                        newReportSettings, newReportSettings, !oldReportSettingsESet ) );
         }
     }
 
@@ -3364,9 +3705,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         reportSettings = null;
         boolean oldReportSettingsESet = reportSettingsESet;
         reportSettingsESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__REPORT_SETTINGS, oldReportSettings, null, oldReportSettingsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__REPORT_SETTINGS, oldReportSettings, null, oldReportSettingsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3378,17 +3723,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetReportSettings() {
-        if (reportSettings != null) {
+        if( reportSettings != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)reportSettings).eInverseRemove(this, SclPackage.REPORT_SETTINGS__PARENT_SERVICES, ReportSettings.class, msgs);
-            msgs = basicUnsetReportSettings(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) reportSettings ).eInverseRemove( this,
+                    SclPackage.REPORT_SETTINGS__PARENT_SERVICES, ReportSettings.class, msgs );
+            msgs = basicUnsetReportSettings( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldReportSettingsESet = reportSettingsESet;
             reportSettingsESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__REPORT_SETTINGS, null, null, oldReportSettingsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__REPORT_SETTINGS, null,
+                        null, oldReportSettingsESet ) );
         }
     }
 
@@ -3422,9 +3769,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         smVsc = newSMVsc;
         boolean oldSMVscESet = smVscESet;
         smVscESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__SM_VSC, oldSMVsc, newSMVsc, !oldSMVscESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__SM_VSC,
+                    oldSMVsc, newSMVsc, !oldSMVscESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3436,20 +3787,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setSMVsc( SMVsc newSMVsc ) {
-        if (newSMVsc != smVsc) {
+        if( newSMVsc != smVsc ) {
             NotificationChain msgs = null;
-            if (smVsc != null)
-                msgs = ((InternalEObject)smVsc).eInverseRemove(this, SclPackage.SM_VSC__PARENT_SERVICES, SMVsc.class, msgs);
-            if (newSMVsc != null)
-                msgs = ((InternalEObject)newSMVsc).eInverseAdd(this, SclPackage.SM_VSC__PARENT_SERVICES, SMVsc.class, msgs);
-            msgs = basicSetSMVsc(newSMVsc, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( smVsc != null )
+                msgs = ( ( InternalEObject ) smVsc ).eInverseRemove( this, SclPackage.SM_VSC__PARENT_SERVICES,
+                        SMVsc.class, msgs );
+            if( newSMVsc != null )
+                msgs = ( ( InternalEObject ) newSMVsc ).eInverseAdd( this, SclPackage.SM_VSC__PARENT_SERVICES,
+                        SMVsc.class, msgs );
+            msgs = basicSetSMVsc( newSMVsc, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSMVscESet = smVscESet;
             smVscESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__SM_VSC, newSMVsc, newSMVsc, !oldSMVscESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__SM_VSC, newSMVsc, newSMVsc,
+                        !oldSMVscESet ) );
         }
     }
 
@@ -3463,9 +3817,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         smVsc = null;
         boolean oldSMVscESet = smVscESet;
         smVscESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__SM_VSC, oldSMVsc, null, oldSMVscESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__SM_VSC, oldSMVsc, null, oldSMVscESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3477,17 +3835,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetSMVsc() {
-        if (smVsc != null) {
+        if( smVsc != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)smVsc).eInverseRemove(this, SclPackage.SM_VSC__PARENT_SERVICES, SMVsc.class, msgs);
-            msgs = basicUnsetSMVsc(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) smVsc ).eInverseRemove( this, SclPackage.SM_VSC__PARENT_SERVICES, SMVsc.class,
+                    msgs );
+            msgs = basicUnsetSMVsc( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSMVscESet = smVscESet;
             smVscESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__SM_VSC, null, null, oldSMVscESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__SM_VSC, null, null,
+                        oldSMVscESet ) );
         }
     }
 
@@ -3521,9 +3881,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         supSubscription = newSupSubscription;
         boolean oldSupSubscriptionESet = supSubscriptionESet;
         supSubscriptionESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__SUP_SUBSCRIPTION, oldSupSubscription, newSupSubscription, !oldSupSubscriptionESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__SUP_SUBSCRIPTION, oldSupSubscription, newSupSubscription,
+                    !oldSupSubscriptionESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3535,20 +3900,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setSupSubscription( SupSubscription newSupSubscription ) {
-        if (newSupSubscription != supSubscription) {
+        if( newSupSubscription != supSubscription ) {
             NotificationChain msgs = null;
-            if (supSubscription != null)
-                msgs = ((InternalEObject)supSubscription).eInverseRemove(this, SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES, SupSubscription.class, msgs);
-            if (newSupSubscription != null)
-                msgs = ((InternalEObject)newSupSubscription).eInverseAdd(this, SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES, SupSubscription.class, msgs);
-            msgs = basicSetSupSubscription(newSupSubscription, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( supSubscription != null )
+                msgs = ( ( InternalEObject ) supSubscription ).eInverseRemove( this,
+                        SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES, SupSubscription.class, msgs );
+            if( newSupSubscription != null )
+                msgs = ( ( InternalEObject ) newSupSubscription ).eInverseAdd( this,
+                        SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES, SupSubscription.class, msgs );
+            msgs = basicSetSupSubscription( newSupSubscription, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSupSubscriptionESet = supSubscriptionESet;
             supSubscriptionESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__SUP_SUBSCRIPTION, newSupSubscription, newSupSubscription, !oldSupSubscriptionESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__SUP_SUBSCRIPTION,
+                        newSupSubscription, newSupSubscription, !oldSupSubscriptionESet ) );
         }
     }
 
@@ -3562,9 +3930,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         supSubscription = null;
         boolean oldSupSubscriptionESet = supSubscriptionESet;
         supSubscriptionESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__SUP_SUBSCRIPTION, oldSupSubscription, null, oldSupSubscriptionESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__SUP_SUBSCRIPTION, oldSupSubscription, null, oldSupSubscriptionESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3576,17 +3948,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetSupSubscription() {
-        if (supSubscription != null) {
+        if( supSubscription != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)supSubscription).eInverseRemove(this, SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES, SupSubscription.class, msgs);
-            msgs = basicUnsetSupSubscription(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) supSubscription ).eInverseRemove( this,
+                    SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES, SupSubscription.class, msgs );
+            msgs = basicUnsetSupSubscription( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSupSubscriptionESet = supSubscriptionESet;
             supSubscriptionESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__SUP_SUBSCRIPTION, null, null, oldSupSubscriptionESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__SUP_SUBSCRIPTION, null,
+                        null, oldSupSubscriptionESet ) );
         }
     }
 
@@ -3620,9 +3994,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         valueHandling = newValueHandling;
         boolean oldValueHandlingESet = valueHandlingESet;
         valueHandlingESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__VALUE_HANDLING, oldValueHandling, newValueHandling, !oldValueHandlingESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__VALUE_HANDLING, oldValueHandling, newValueHandling, !oldValueHandlingESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3634,20 +4012,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setValueHandling( ValueHandling newValueHandling ) {
-        if (newValueHandling != valueHandling) {
+        if( newValueHandling != valueHandling ) {
             NotificationChain msgs = null;
-            if (valueHandling != null)
-                msgs = ((InternalEObject)valueHandling).eInverseRemove(this, SclPackage.VALUE_HANDLING__PARENT_SERVICES, ValueHandling.class, msgs);
-            if (newValueHandling != null)
-                msgs = ((InternalEObject)newValueHandling).eInverseAdd(this, SclPackage.VALUE_HANDLING__PARENT_SERVICES, ValueHandling.class, msgs);
-            msgs = basicSetValueHandling(newValueHandling, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( valueHandling != null )
+                msgs = ( ( InternalEObject ) valueHandling ).eInverseRemove( this,
+                        SclPackage.VALUE_HANDLING__PARENT_SERVICES, ValueHandling.class, msgs );
+            if( newValueHandling != null )
+                msgs = ( ( InternalEObject ) newValueHandling ).eInverseAdd( this,
+                        SclPackage.VALUE_HANDLING__PARENT_SERVICES, ValueHandling.class, msgs );
+            msgs = basicSetValueHandling( newValueHandling, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldValueHandlingESet = valueHandlingESet;
             valueHandlingESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__VALUE_HANDLING, newValueHandling, newValueHandling, !oldValueHandlingESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__VALUE_HANDLING,
+                        newValueHandling, newValueHandling, !oldValueHandlingESet ) );
         }
     }
 
@@ -3661,9 +4042,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         valueHandling = null;
         boolean oldValueHandlingESet = valueHandlingESet;
         valueHandlingESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__VALUE_HANDLING, oldValueHandling, null, oldValueHandlingESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__VALUE_HANDLING, oldValueHandling, null, oldValueHandlingESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3675,17 +4060,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetValueHandling() {
-        if (valueHandling != null) {
+        if( valueHandling != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)valueHandling).eInverseRemove(this, SclPackage.VALUE_HANDLING__PARENT_SERVICES, ValueHandling.class, msgs);
-            msgs = basicUnsetValueHandling(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) valueHandling ).eInverseRemove( this,
+                    SclPackage.VALUE_HANDLING__PARENT_SERVICES, ValueHandling.class, msgs );
+            msgs = basicUnsetValueHandling( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldValueHandlingESet = valueHandlingESet;
             valueHandlingESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__VALUE_HANDLING, null, null, oldValueHandlingESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__VALUE_HANDLING, null,
+                        null, oldValueHandlingESet ) );
         }
     }
 
@@ -3719,9 +4106,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         setDataSetValue = newSetDataSetValue;
         boolean oldSetDataSetValueESet = setDataSetValueESet;
         setDataSetValueESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__SET_DATA_SET_VALUE, oldSetDataSetValue, newSetDataSetValue, !oldSetDataSetValueESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__SET_DATA_SET_VALUE, oldSetDataSetValue, newSetDataSetValue,
+                    !oldSetDataSetValueESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3733,20 +4125,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setSetDataSetValue( SetDataSetValue newSetDataSetValue ) {
-        if (newSetDataSetValue != setDataSetValue) {
+        if( newSetDataSetValue != setDataSetValue ) {
             NotificationChain msgs = null;
-            if (setDataSetValue != null)
-                msgs = ((InternalEObject)setDataSetValue).eInverseRemove(this, SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES, SetDataSetValue.class, msgs);
-            if (newSetDataSetValue != null)
-                msgs = ((InternalEObject)newSetDataSetValue).eInverseAdd(this, SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES, SetDataSetValue.class, msgs);
-            msgs = basicSetSetDataSetValue(newSetDataSetValue, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( setDataSetValue != null )
+                msgs = ( ( InternalEObject ) setDataSetValue ).eInverseRemove( this,
+                        SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES, SetDataSetValue.class, msgs );
+            if( newSetDataSetValue != null )
+                msgs = ( ( InternalEObject ) newSetDataSetValue ).eInverseAdd( this,
+                        SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES, SetDataSetValue.class, msgs );
+            msgs = basicSetSetDataSetValue( newSetDataSetValue, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSetDataSetValueESet = setDataSetValueESet;
             setDataSetValueESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__SET_DATA_SET_VALUE, newSetDataSetValue, newSetDataSetValue, !oldSetDataSetValueESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__SET_DATA_SET_VALUE,
+                        newSetDataSetValue, newSetDataSetValue, !oldSetDataSetValueESet ) );
         }
     }
 
@@ -3760,9 +4155,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         setDataSetValue = null;
         boolean oldSetDataSetValueESet = setDataSetValueESet;
         setDataSetValueESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__SET_DATA_SET_VALUE, oldSetDataSetValue, null, oldSetDataSetValueESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__SET_DATA_SET_VALUE, oldSetDataSetValue, null, oldSetDataSetValueESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3774,17 +4173,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetSetDataSetValue() {
-        if (setDataSetValue != null) {
+        if( setDataSetValue != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)setDataSetValue).eInverseRemove(this, SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES, SetDataSetValue.class, msgs);
-            msgs = basicUnsetSetDataSetValue(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) setDataSetValue ).eInverseRemove( this,
+                    SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES, SetDataSetValue.class, msgs );
+            msgs = basicUnsetSetDataSetValue( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSetDataSetValueESet = setDataSetValueESet;
             setDataSetValueESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__SET_DATA_SET_VALUE, null, null, oldSetDataSetValueESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__SET_DATA_SET_VALUE, null,
+                        null, oldSetDataSetValueESet ) );
         }
     }
 
@@ -3818,9 +4219,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         settingGroups = newSettingGroups;
         boolean oldSettingGroupsESet = settingGroupsESet;
         settingGroupsESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__SETTING_GROUPS, oldSettingGroups, newSettingGroups, !oldSettingGroupsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__SETTING_GROUPS, oldSettingGroups, newSettingGroups, !oldSettingGroupsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3832,20 +4237,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setSettingGroups( SettingGroups newSettingGroups ) {
-        if (newSettingGroups != settingGroups) {
+        if( newSettingGroups != settingGroups ) {
             NotificationChain msgs = null;
-            if (settingGroups != null)
-                msgs = ((InternalEObject)settingGroups).eInverseRemove(this, SclPackage.SETTING_GROUPS__PARENT_SERVICES, SettingGroups.class, msgs);
-            if (newSettingGroups != null)
-                msgs = ((InternalEObject)newSettingGroups).eInverseAdd(this, SclPackage.SETTING_GROUPS__PARENT_SERVICES, SettingGroups.class, msgs);
-            msgs = basicSetSettingGroups(newSettingGroups, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( settingGroups != null )
+                msgs = ( ( InternalEObject ) settingGroups ).eInverseRemove( this,
+                        SclPackage.SETTING_GROUPS__PARENT_SERVICES, SettingGroups.class, msgs );
+            if( newSettingGroups != null )
+                msgs = ( ( InternalEObject ) newSettingGroups ).eInverseAdd( this,
+                        SclPackage.SETTING_GROUPS__PARENT_SERVICES, SettingGroups.class, msgs );
+            msgs = basicSetSettingGroups( newSettingGroups, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSettingGroupsESet = settingGroupsESet;
             settingGroupsESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__SETTING_GROUPS, newSettingGroups, newSettingGroups, !oldSettingGroupsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__SETTING_GROUPS,
+                        newSettingGroups, newSettingGroups, !oldSettingGroupsESet ) );
         }
     }
 
@@ -3859,9 +4267,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         settingGroups = null;
         boolean oldSettingGroupsESet = settingGroupsESet;
         settingGroupsESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__SETTING_GROUPS, oldSettingGroups, null, oldSettingGroupsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__SETTING_GROUPS, oldSettingGroups, null, oldSettingGroupsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3873,17 +4285,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetSettingGroups() {
-        if (settingGroups != null) {
+        if( settingGroups != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)settingGroups).eInverseRemove(this, SclPackage.SETTING_GROUPS__PARENT_SERVICES, SettingGroups.class, msgs);
-            msgs = basicUnsetSettingGroups(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) settingGroups ).eInverseRemove( this,
+                    SclPackage.SETTING_GROUPS__PARENT_SERVICES, SettingGroups.class, msgs );
+            msgs = basicUnsetSettingGroups( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSettingGroupsESet = settingGroupsESet;
             settingGroupsESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__SETTING_GROUPS, null, null, oldSettingGroupsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__SETTING_GROUPS, null,
+                        null, oldSettingGroupsESet ) );
         }
     }
 
@@ -3917,9 +4331,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         timeSyncProt = newTimeSyncProt;
         boolean oldTimeSyncProtESet = timeSyncProtESet;
         timeSyncProtESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__TIME_SYNC_PROT, oldTimeSyncProt, newTimeSyncProt, !oldTimeSyncProtESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__TIME_SYNC_PROT, oldTimeSyncProt, newTimeSyncProt, !oldTimeSyncProtESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3931,20 +4349,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setTimeSyncProt( TimeSyncProt newTimeSyncProt ) {
-        if (newTimeSyncProt != timeSyncProt) {
+        if( newTimeSyncProt != timeSyncProt ) {
             NotificationChain msgs = null;
-            if (timeSyncProt != null)
-                msgs = ((InternalEObject)timeSyncProt).eInverseRemove(this, SclPackage.TIME_SYNC_PROT__PARENT_SERVICES, TimeSyncProt.class, msgs);
-            if (newTimeSyncProt != null)
-                msgs = ((InternalEObject)newTimeSyncProt).eInverseAdd(this, SclPackage.TIME_SYNC_PROT__PARENT_SERVICES, TimeSyncProt.class, msgs);
-            msgs = basicSetTimeSyncProt(newTimeSyncProt, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( timeSyncProt != null )
+                msgs = ( ( InternalEObject ) timeSyncProt ).eInverseRemove( this,
+                        SclPackage.TIME_SYNC_PROT__PARENT_SERVICES, TimeSyncProt.class, msgs );
+            if( newTimeSyncProt != null )
+                msgs = ( ( InternalEObject ) newTimeSyncProt ).eInverseAdd( this,
+                        SclPackage.TIME_SYNC_PROT__PARENT_SERVICES, TimeSyncProt.class, msgs );
+            msgs = basicSetTimeSyncProt( newTimeSyncProt, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldTimeSyncProtESet = timeSyncProtESet;
             timeSyncProtESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__TIME_SYNC_PROT, newTimeSyncProt, newTimeSyncProt, !oldTimeSyncProtESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__TIME_SYNC_PROT,
+                        newTimeSyncProt, newTimeSyncProt, !oldTimeSyncProtESet ) );
         }
     }
 
@@ -3958,9 +4379,13 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         timeSyncProt = null;
         boolean oldTimeSyncProtESet = timeSyncProtESet;
         timeSyncProtESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__TIME_SYNC_PROT, oldTimeSyncProt, null, oldTimeSyncProtESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__TIME_SYNC_PROT, oldTimeSyncProt, null, oldTimeSyncProtESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -3972,17 +4397,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetTimeSyncProt() {
-        if (timeSyncProt != null) {
+        if( timeSyncProt != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)timeSyncProt).eInverseRemove(this, SclPackage.TIME_SYNC_PROT__PARENT_SERVICES, TimeSyncProt.class, msgs);
-            msgs = basicUnsetTimeSyncProt(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) timeSyncProt ).eInverseRemove( this,
+                    SclPackage.TIME_SYNC_PROT__PARENT_SERVICES, TimeSyncProt.class, msgs );
+            msgs = basicUnsetTimeSyncProt( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldTimeSyncProtESet = timeSyncProtESet;
             timeSyncProtESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__TIME_SYNC_PROT, null, null, oldTimeSyncProtESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__TIME_SYNC_PROT, null,
+                        null, oldTimeSyncProtESet ) );
         }
     }
 
@@ -4017,9 +4444,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         timerActivatedControl = newTimerActivatedControl;
         boolean oldTimerActivatedControlESet = timerActivatedControlESet;
         timerActivatedControlESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL, oldTimerActivatedControl, newTimerActivatedControl, !oldTimerActivatedControlESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL, oldTimerActivatedControl, newTimerActivatedControl,
+                    !oldTimerActivatedControlESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -4031,20 +4463,23 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void setTimerActivatedControl( TimerActivatedControl newTimerActivatedControl ) {
-        if (newTimerActivatedControl != timerActivatedControl) {
+        if( newTimerActivatedControl != timerActivatedControl ) {
             NotificationChain msgs = null;
-            if (timerActivatedControl != null)
-                msgs = ((InternalEObject)timerActivatedControl).eInverseRemove(this, SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES, TimerActivatedControl.class, msgs);
-            if (newTimerActivatedControl != null)
-                msgs = ((InternalEObject)newTimerActivatedControl).eInverseAdd(this, SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES, TimerActivatedControl.class, msgs);
-            msgs = basicSetTimerActivatedControl(newTimerActivatedControl, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( timerActivatedControl != null )
+                msgs = ( ( InternalEObject ) timerActivatedControl ).eInverseRemove( this,
+                        SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES, TimerActivatedControl.class, msgs );
+            if( newTimerActivatedControl != null )
+                msgs = ( ( InternalEObject ) newTimerActivatedControl ).eInverseAdd( this,
+                        SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES, TimerActivatedControl.class, msgs );
+            msgs = basicSetTimerActivatedControl( newTimerActivatedControl, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldTimerActivatedControlESet = timerActivatedControlESet;
             timerActivatedControlESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL, newTimerActivatedControl, newTimerActivatedControl, !oldTimerActivatedControlESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL,
+                        newTimerActivatedControl, newTimerActivatedControl, !oldTimerActivatedControlESet ) );
         }
     }
 
@@ -4058,9 +4493,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
         timerActivatedControl = null;
         boolean oldTimerActivatedControlESet = timerActivatedControlESet;
         timerActivatedControlESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL, oldTimerActivatedControl, null, oldTimerActivatedControlESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL, oldTimerActivatedControl, null,
+                    oldTimerActivatedControlESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -4072,17 +4512,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetTimerActivatedControl() {
-        if (timerActivatedControl != null) {
+        if( timerActivatedControl != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)timerActivatedControl).eInverseRemove(this, SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES, TimerActivatedControl.class, msgs);
-            msgs = basicUnsetTimerActivatedControl(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) timerActivatedControl ).eInverseRemove( this,
+                    SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES, TimerActivatedControl.class, msgs );
+            msgs = basicUnsetTimerActivatedControl( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldTimerActivatedControlESet = timerActivatedControlESet;
             timerActivatedControlESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL, null, null, oldTimerActivatedControlESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL,
+                        null, null, oldTimerActivatedControlESet ) );
         }
     }
 
@@ -4111,14 +4553,18 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetSMVSettings(SMVSettings newSMVSettings, NotificationChain msgs) {
+    public NotificationChain basicSetSMVSettings( SMVSettings newSMVSettings, NotificationChain msgs ) {
         SMVSettings oldSMVSettings = smvSettings;
         smvSettings = newSMVSettings;
         boolean oldSMVSettingsESet = smvSettingsESet;
         smvSettingsESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__SMV_SETTINGS, oldSMVSettings, newSMVSettings, !oldSMVSettingsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SERVICES__SMV_SETTINGS, oldSMVSettings, newSMVSettings, !oldSMVSettingsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -4129,21 +4575,24 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      * @generated
      */
     @Override
-    public void setSMVSettings(SMVSettings newSMVSettings) {
-        if (newSMVSettings != smvSettings) {
+    public void setSMVSettings( SMVSettings newSMVSettings ) {
+        if( newSMVSettings != smvSettings ) {
             NotificationChain msgs = null;
-            if (smvSettings != null)
-                msgs = ((InternalEObject)smvSettings).eInverseRemove(this, SclPackage.SMV_SETTINGS__PARENT_SERVICES, SMVSettings.class, msgs);
-            if (newSMVSettings != null)
-                msgs = ((InternalEObject)newSMVSettings).eInverseAdd(this, SclPackage.SMV_SETTINGS__PARENT_SERVICES, SMVSettings.class, msgs);
-            msgs = basicSetSMVSettings(newSMVSettings, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( smvSettings != null )
+                msgs = ( ( InternalEObject ) smvSettings ).eInverseRemove( this,
+                        SclPackage.SMV_SETTINGS__PARENT_SERVICES, SMVSettings.class, msgs );
+            if( newSMVSettings != null )
+                msgs = ( ( InternalEObject ) newSMVSettings ).eInverseAdd( this,
+                        SclPackage.SMV_SETTINGS__PARENT_SERVICES, SMVSettings.class, msgs );
+            msgs = basicSetSMVSettings( newSMVSettings, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSMVSettingsESet = smvSettingsESet;
             smvSettingsESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SERVICES__SMV_SETTINGS, newSMVSettings, newSMVSettings, !oldSMVSettingsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SERVICES__SMV_SETTINGS,
+                        newSMVSettings, newSMVSettings, !oldSMVSettingsESet ) );
         }
     }
 
@@ -4152,14 +4601,18 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetSMVSettings(NotificationChain msgs) {
+    public NotificationChain basicUnsetSMVSettings( NotificationChain msgs ) {
         SMVSettings oldSMVSettings = smvSettings;
         smvSettings = null;
         boolean oldSMVSettingsESet = smvSettingsESet;
         smvSettingsESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__SMV_SETTINGS, oldSMVSettings, null, oldSMVSettingsESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SERVICES__SMV_SETTINGS, oldSMVSettings, null, oldSMVSettingsESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -4171,17 +4624,19 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void unsetSMVSettings() {
-        if (smvSettings != null) {
+        if( smvSettings != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)smvSettings).eInverseRemove(this, SclPackage.SMV_SETTINGS__PARENT_SERVICES, SMVSettings.class, msgs);
-            msgs = basicUnsetSMVSettings(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) smvSettings ).eInverseRemove( this, SclPackage.SMV_SETTINGS__PARENT_SERVICES,
+                    SMVSettings.class, msgs );
+            msgs = basicUnsetSMVSettings( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSMVSettingsESet = smvSettingsESet;
             smvSettingsESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SERVICES__SMV_SETTINGS, null, null, oldSMVSettingsESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SERVICES__SMV_SETTINGS, null, null,
+                        oldSMVSettingsESet ) );
         }
     }
 
@@ -4202,149 +4657,182 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SERVICES__PARENT_ACCESS_POINT:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAccessPoint((AccessPoint)otherEnd, msgs);
-            case SclPackage.SERVICES__CLIENT_SERVICES:
-                if (clientServices != null)
-                    msgs = ((InternalEObject)clientServices).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__CLIENT_SERVICES, null, msgs);
-                return basicSetClientServices((ClientServices)otherEnd, msgs);
-            case SclPackage.SERVICES__COMM_PROT:
-                if (commProt != null)
-                    msgs = ((InternalEObject)commProt).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__COMM_PROT, null, msgs);
-                return basicSetCommProt((CommProt)otherEnd, msgs);
-            case SclPackage.SERVICES__CONF_DATA_SET:
-                if (confDataSet != null)
-                    msgs = ((InternalEObject)confDataSet).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__CONF_DATA_SET, null, msgs);
-                return basicSetConfDataSet((ConfDataSet)otherEnd, msgs);
-            case SclPackage.SERVICES__CONF_LNS:
-                if (confLNs != null)
-                    msgs = ((InternalEObject)confLNs).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__CONF_LNS, null, msgs);
-                return basicSetConfLNs((ConfLNs)otherEnd, msgs);
-            case SclPackage.SERVICES__CONF_LD_NAME:
-                if (confLdName != null)
-                    msgs = ((InternalEObject)confLdName).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__CONF_LD_NAME, null, msgs);
-                return basicSetConfLdName((ConfLdName)otherEnd, msgs);
-            case SclPackage.SERVICES__CONF_LOG_CONTROL:
-                if (confLogControl != null)
-                    msgs = ((InternalEObject)confLogControl).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__CONF_LOG_CONTROL, null, msgs);
-                return basicSetConfLogControl((ConfLogControl)otherEnd, msgs);
-            case SclPackage.SERVICES__CONF_REPORT_CONTROL:
-                if (confReportControl != null)
-                    msgs = ((InternalEObject)confReportControl).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__CONF_REPORT_CONTROL, null, msgs);
-                return basicSetConfReportControl((ConfReportControl)otherEnd, msgs);
-            case SclPackage.SERVICES__CONF_SIG_REF:
-                if (confSigRef != null)
-                    msgs = ((InternalEObject)confSigRef).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__CONF_SIG_REF, null, msgs);
-                return basicSetConfSigRef((ConfSigRef)otherEnd, msgs);
-            case SclPackage.SERVICES__DATA_OBJECT_DIRECTORY:
-                if (dataObjectDirectory != null)
-                    msgs = ((InternalEObject)dataObjectDirectory).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__DATA_OBJECT_DIRECTORY, null, msgs);
-                return basicSetDataObjectDirectory((DataObjectDirectory)otherEnd, msgs);
-            case SclPackage.SERVICES__DATA_SET_DIRECTORY:
-                if (dataSetDirectory != null)
-                    msgs = ((InternalEObject)dataSetDirectory).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__DATA_SET_DIRECTORY, null, msgs);
-                return basicSetDataSetDirectory((DataSetDirectory)otherEnd, msgs);
-            case SclPackage.SERVICES__DYN_ASSOCIATION:
-                if (dynAssociation != null)
-                    msgs = ((InternalEObject)dynAssociation).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__DYN_ASSOCIATION, null, msgs);
-                return basicSetDynAssociation((DynAssociation)otherEnd, msgs);
-            case SclPackage.SERVICES__DYN_DATA_SET:
-                if (dynDataSet != null)
-                    msgs = ((InternalEObject)dynDataSet).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__DYN_DATA_SET, null, msgs);
-                return basicSetDynDataSet((DynDataSet)otherEnd, msgs);
-            case SclPackage.SERVICES__FILE_HANDLING:
-                if (fileHandling != null)
-                    msgs = ((InternalEObject)fileHandling).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__FILE_HANDLING, null, msgs);
-                return basicSetFileHandling((FileHandling)otherEnd, msgs);
-            case SclPackage.SERVICES__GOOSE:
-                if (goose != null)
-                    msgs = ((InternalEObject)goose).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GOOSE, null, msgs);
-                return basicSetGOOSE((GOOSE)otherEnd, msgs);
-            case SclPackage.SERVICES__GSE_DIR:
-                if (gseDir != null)
-                    msgs = ((InternalEObject)gseDir).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GSE_DIR, null, msgs);
-                return basicSetGSEDir((GSEDir)otherEnd, msgs);
-            case SclPackage.SERVICES__GSE_SETTINGS:
-                if (gseSettings != null)
-                    msgs = ((InternalEObject)gseSettings).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GSE_SETTINGS, null, msgs);
-                return basicSetGSESettings((GSESettings)otherEnd, msgs);
-            case SclPackage.SERVICES__GSSE:
-                if (gsse != null)
-                    msgs = ((InternalEObject)gsse).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GSSE, null, msgs);
-                return basicSetGSSE((GSSE)otherEnd, msgs);
-            case SclPackage.SERVICES__GET_CB_VALUES:
-                if (getCBValues != null)
-                    msgs = ((InternalEObject)getCBValues).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GET_CB_VALUES, null, msgs);
-                return basicSetGetCBValues((GetCBValues)otherEnd, msgs);
-            case SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION:
-                if (getDataObjectDefinition != null)
-                    msgs = ((InternalEObject)getDataObjectDefinition).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION, null, msgs);
-                return basicSetGetDataObjectDefinition((GetDataObjectDefinition)otherEnd, msgs);
-            case SclPackage.SERVICES__GET_DATA_SET_VALUE:
-                if (getDataSetValue != null)
-                    msgs = ((InternalEObject)getDataSetValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GET_DATA_SET_VALUE, null, msgs);
-                return basicSetGetDataSetValue((GetDataSetValue)otherEnd, msgs);
-            case SclPackage.SERVICES__GET_DIRECTORY:
-                if (getDirectory != null)
-                    msgs = ((InternalEObject)getDirectory).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GET_DIRECTORY, null, msgs);
-                return basicSetGetDirectory((GetDirectory)otherEnd, msgs);
-            case SclPackage.SERVICES__PARENT_IED:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentIED((IED)otherEnd, msgs);
-            case SclPackage.SERVICES__LOG_SETTINGS:
-                if (logSettings != null)
-                    msgs = ((InternalEObject)logSettings).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__LOG_SETTINGS, null, msgs);
-                return basicSetLogSettings((LogSettings)otherEnd, msgs);
-            case SclPackage.SERVICES__READ_WRITE:
-                if (readWrite != null)
-                    msgs = ((InternalEObject)readWrite).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__READ_WRITE, null, msgs);
-                return basicSetReadWrite((ReadWrite)otherEnd, msgs);
-            case SclPackage.SERVICES__RED_PROT:
-                if (redProt != null)
-                    msgs = ((InternalEObject)redProt).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__RED_PROT, null, msgs);
-                return basicSetRedProt((RedProt)otherEnd, msgs);
-            case SclPackage.SERVICES__REPORT_SETTINGS:
-                if (reportSettings != null)
-                    msgs = ((InternalEObject)reportSettings).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__REPORT_SETTINGS, null, msgs);
-                return basicSetReportSettings((ReportSettings)otherEnd, msgs);
-            case SclPackage.SERVICES__SM_VSC:
-                if (smVsc != null)
-                    msgs = ((InternalEObject)smVsc).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__SM_VSC, null, msgs);
-                return basicSetSMVsc((SMVsc)otherEnd, msgs);
-            case SclPackage.SERVICES__SUP_SUBSCRIPTION:
-                if (supSubscription != null)
-                    msgs = ((InternalEObject)supSubscription).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__SUP_SUBSCRIPTION, null, msgs);
-                return basicSetSupSubscription((SupSubscription)otherEnd, msgs);
-            case SclPackage.SERVICES__VALUE_HANDLING:
-                if (valueHandling != null)
-                    msgs = ((InternalEObject)valueHandling).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__VALUE_HANDLING, null, msgs);
-                return basicSetValueHandling((ValueHandling)otherEnd, msgs);
-            case SclPackage.SERVICES__SET_DATA_SET_VALUE:
-                if (setDataSetValue != null)
-                    msgs = ((InternalEObject)setDataSetValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__SET_DATA_SET_VALUE, null, msgs);
-                return basicSetSetDataSetValue((SetDataSetValue)otherEnd, msgs);
-            case SclPackage.SERVICES__SETTING_GROUPS:
-                if (settingGroups != null)
-                    msgs = ((InternalEObject)settingGroups).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__SETTING_GROUPS, null, msgs);
-                return basicSetSettingGroups((SettingGroups)otherEnd, msgs);
-            case SclPackage.SERVICES__TIME_SYNC_PROT:
-                if (timeSyncProt != null)
-                    msgs = ((InternalEObject)timeSyncProt).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__TIME_SYNC_PROT, null, msgs);
-                return basicSetTimeSyncProt((TimeSyncProt)otherEnd, msgs);
-            case SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL:
-                if (timerActivatedControl != null)
-                    msgs = ((InternalEObject)timerActivatedControl).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL, null, msgs);
-                return basicSetTimerActivatedControl((TimerActivatedControl)otherEnd, msgs);
-            case SclPackage.SERVICES__SMV_SETTINGS:
-                if (smvSettings != null)
-                    msgs = ((InternalEObject)smvSettings).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__SMV_SETTINGS, null, msgs);
-                return basicSetSMVSettings((SMVSettings)otherEnd, msgs);
-        }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        switch( featureID ) {
+        case SclPackage.SERVICES__PARENT_ACCESS_POINT:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAccessPoint( ( AccessPoint ) otherEnd, msgs );
+        case SclPackage.SERVICES__CLIENT_SERVICES:
+            if( clientServices != null )
+                msgs = ( ( InternalEObject ) clientServices ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__CLIENT_SERVICES, null, msgs );
+            return basicSetClientServices( ( ClientServices ) otherEnd, msgs );
+        case SclPackage.SERVICES__COMM_PROT:
+            if( commProt != null )
+                msgs = ( ( InternalEObject ) commProt ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__COMM_PROT, null, msgs );
+            return basicSetCommProt( ( CommProt ) otherEnd, msgs );
+        case SclPackage.SERVICES__CONF_DATA_SET:
+            if( confDataSet != null )
+                msgs = ( ( InternalEObject ) confDataSet ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__CONF_DATA_SET, null, msgs );
+            return basicSetConfDataSet( ( ConfDataSet ) otherEnd, msgs );
+        case SclPackage.SERVICES__CONF_LNS:
+            if( confLNs != null )
+                msgs = ( ( InternalEObject ) confLNs ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__CONF_LNS, null, msgs );
+            return basicSetConfLNs( ( ConfLNs ) otherEnd, msgs );
+        case SclPackage.SERVICES__CONF_LD_NAME:
+            if( confLdName != null )
+                msgs = ( ( InternalEObject ) confLdName ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__CONF_LD_NAME, null, msgs );
+            return basicSetConfLdName( ( ConfLdName ) otherEnd, msgs );
+        case SclPackage.SERVICES__CONF_LOG_CONTROL:
+            if( confLogControl != null )
+                msgs = ( ( InternalEObject ) confLogControl ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__CONF_LOG_CONTROL, null, msgs );
+            return basicSetConfLogControl( ( ConfLogControl ) otherEnd, msgs );
+        case SclPackage.SERVICES__CONF_REPORT_CONTROL:
+            if( confReportControl != null )
+                msgs = ( ( InternalEObject ) confReportControl ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__CONF_REPORT_CONTROL, null, msgs );
+            return basicSetConfReportControl( ( ConfReportControl ) otherEnd, msgs );
+        case SclPackage.SERVICES__CONF_SIG_REF:
+            if( confSigRef != null )
+                msgs = ( ( InternalEObject ) confSigRef ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__CONF_SIG_REF, null, msgs );
+            return basicSetConfSigRef( ( ConfSigRef ) otherEnd, msgs );
+        case SclPackage.SERVICES__DATA_OBJECT_DIRECTORY:
+            if( dataObjectDirectory != null )
+                msgs = ( ( InternalEObject ) dataObjectDirectory ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__DATA_OBJECT_DIRECTORY, null, msgs );
+            return basicSetDataObjectDirectory( ( DataObjectDirectory ) otherEnd, msgs );
+        case SclPackage.SERVICES__DATA_SET_DIRECTORY:
+            if( dataSetDirectory != null )
+                msgs = ( ( InternalEObject ) dataSetDirectory ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__DATA_SET_DIRECTORY, null, msgs );
+            return basicSetDataSetDirectory( ( DataSetDirectory ) otherEnd, msgs );
+        case SclPackage.SERVICES__DYN_ASSOCIATION:
+            if( dynAssociation != null )
+                msgs = ( ( InternalEObject ) dynAssociation ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__DYN_ASSOCIATION, null, msgs );
+            return basicSetDynAssociation( ( DynAssociation ) otherEnd, msgs );
+        case SclPackage.SERVICES__DYN_DATA_SET:
+            if( dynDataSet != null )
+                msgs = ( ( InternalEObject ) dynDataSet ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__DYN_DATA_SET, null, msgs );
+            return basicSetDynDataSet( ( DynDataSet ) otherEnd, msgs );
+        case SclPackage.SERVICES__FILE_HANDLING:
+            if( fileHandling != null )
+                msgs = ( ( InternalEObject ) fileHandling ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__FILE_HANDLING, null, msgs );
+            return basicSetFileHandling( ( FileHandling ) otherEnd, msgs );
+        case SclPackage.SERVICES__GOOSE:
+            if( goose != null )
+                msgs = ( ( InternalEObject ) goose ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GOOSE, null, msgs );
+            return basicSetGOOSE( ( GOOSE ) otherEnd, msgs );
+        case SclPackage.SERVICES__GSE_DIR:
+            if( gseDir != null )
+                msgs = ( ( InternalEObject ) gseDir ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GSE_DIR, null, msgs );
+            return basicSetGSEDir( ( GSEDir ) otherEnd, msgs );
+        case SclPackage.SERVICES__GSE_SETTINGS:
+            if( gseSettings != null )
+                msgs = ( ( InternalEObject ) gseSettings ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GSE_SETTINGS, null, msgs );
+            return basicSetGSESettings( ( GSESettings ) otherEnd, msgs );
+        case SclPackage.SERVICES__GSSE:
+            if( gsse != null )
+                msgs = ( ( InternalEObject ) gsse ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GSSE, null, msgs );
+            return basicSetGSSE( ( GSSE ) otherEnd, msgs );
+        case SclPackage.SERVICES__GET_CB_VALUES:
+            if( getCBValues != null )
+                msgs = ( ( InternalEObject ) getCBValues ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GET_CB_VALUES, null, msgs );
+            return basicSetGetCBValues( ( GetCBValues ) otherEnd, msgs );
+        case SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION:
+            if( getDataObjectDefinition != null )
+                msgs = ( ( InternalEObject ) getDataObjectDefinition ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION, null, msgs );
+            return basicSetGetDataObjectDefinition( ( GetDataObjectDefinition ) otherEnd, msgs );
+        case SclPackage.SERVICES__GET_DATA_SET_VALUE:
+            if( getDataSetValue != null )
+                msgs = ( ( InternalEObject ) getDataSetValue ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GET_DATA_SET_VALUE, null, msgs );
+            return basicSetGetDataSetValue( ( GetDataSetValue ) otherEnd, msgs );
+        case SclPackage.SERVICES__GET_DIRECTORY:
+            if( getDirectory != null )
+                msgs = ( ( InternalEObject ) getDirectory ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__GET_DIRECTORY, null, msgs );
+            return basicSetGetDirectory( ( GetDirectory ) otherEnd, msgs );
+        case SclPackage.SERVICES__PARENT_IED:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentIED( ( IED ) otherEnd, msgs );
+        case SclPackage.SERVICES__LOG_SETTINGS:
+            if( logSettings != null )
+                msgs = ( ( InternalEObject ) logSettings ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__LOG_SETTINGS, null, msgs );
+            return basicSetLogSettings( ( LogSettings ) otherEnd, msgs );
+        case SclPackage.SERVICES__READ_WRITE:
+            if( readWrite != null )
+                msgs = ( ( InternalEObject ) readWrite ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__READ_WRITE, null, msgs );
+            return basicSetReadWrite( ( ReadWrite ) otherEnd, msgs );
+        case SclPackage.SERVICES__RED_PROT:
+            if( redProt != null )
+                msgs = ( ( InternalEObject ) redProt ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__RED_PROT, null, msgs );
+            return basicSetRedProt( ( RedProt ) otherEnd, msgs );
+        case SclPackage.SERVICES__REPORT_SETTINGS:
+            if( reportSettings != null )
+                msgs = ( ( InternalEObject ) reportSettings ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__REPORT_SETTINGS, null, msgs );
+            return basicSetReportSettings( ( ReportSettings ) otherEnd, msgs );
+        case SclPackage.SERVICES__SM_VSC:
+            if( smVsc != null )
+                msgs = ( ( InternalEObject ) smVsc ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__SM_VSC, null, msgs );
+            return basicSetSMVsc( ( SMVsc ) otherEnd, msgs );
+        case SclPackage.SERVICES__SUP_SUBSCRIPTION:
+            if( supSubscription != null )
+                msgs = ( ( InternalEObject ) supSubscription ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__SUP_SUBSCRIPTION, null, msgs );
+            return basicSetSupSubscription( ( SupSubscription ) otherEnd, msgs );
+        case SclPackage.SERVICES__VALUE_HANDLING:
+            if( valueHandling != null )
+                msgs = ( ( InternalEObject ) valueHandling ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__VALUE_HANDLING, null, msgs );
+            return basicSetValueHandling( ( ValueHandling ) otherEnd, msgs );
+        case SclPackage.SERVICES__SET_DATA_SET_VALUE:
+            if( setDataSetValue != null )
+                msgs = ( ( InternalEObject ) setDataSetValue ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__SET_DATA_SET_VALUE, null, msgs );
+            return basicSetSetDataSetValue( ( SetDataSetValue ) otherEnd, msgs );
+        case SclPackage.SERVICES__SETTING_GROUPS:
+            if( settingGroups != null )
+                msgs = ( ( InternalEObject ) settingGroups ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__SETTING_GROUPS, null, msgs );
+            return basicSetSettingGroups( ( SettingGroups ) otherEnd, msgs );
+        case SclPackage.SERVICES__TIME_SYNC_PROT:
+            if( timeSyncProt != null )
+                msgs = ( ( InternalEObject ) timeSyncProt ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__TIME_SYNC_PROT, null, msgs );
+            return basicSetTimeSyncProt( ( TimeSyncProt ) otherEnd, msgs );
+        case SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL:
+            if( timerActivatedControl != null )
+                msgs = ( ( InternalEObject ) timerActivatedControl ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL, null, msgs );
+            return basicSetTimerActivatedControl( ( TimerActivatedControl ) otherEnd, msgs );
+        case SclPackage.SERVICES__SMV_SETTINGS:
+            if( smvSettings != null )
+                msgs = ( ( InternalEObject ) smvSettings ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SERVICES__SMV_SETTINGS, null, msgs );
+            return basicSetSMVSettings( ( SMVSettings ) otherEnd, msgs );
+        }
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -4354,79 +4842,79 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SERVICES__PARENT_ACCESS_POINT:
-                return basicSetParentAccessPoint(null, msgs);
-            case SclPackage.SERVICES__CLIENT_SERVICES:
-                return basicUnsetClientServices(msgs);
-            case SclPackage.SERVICES__COMM_PROT:
-                return basicUnsetCommProt(msgs);
-            case SclPackage.SERVICES__CONF_DATA_SET:
-                return basicUnsetConfDataSet(msgs);
-            case SclPackage.SERVICES__CONF_LNS:
-                return basicUnsetConfLNs(msgs);
-            case SclPackage.SERVICES__CONF_LD_NAME:
-                return basicUnsetConfLdName(msgs);
-            case SclPackage.SERVICES__CONF_LOG_CONTROL:
-                return basicUnsetConfLogControl(msgs);
-            case SclPackage.SERVICES__CONF_REPORT_CONTROL:
-                return basicUnsetConfReportControl(msgs);
-            case SclPackage.SERVICES__CONF_SIG_REF:
-                return basicUnsetConfSigRef(msgs);
-            case SclPackage.SERVICES__DATA_OBJECT_DIRECTORY:
-                return basicUnsetDataObjectDirectory(msgs);
-            case SclPackage.SERVICES__DATA_SET_DIRECTORY:
-                return basicUnsetDataSetDirectory(msgs);
-            case SclPackage.SERVICES__DYN_ASSOCIATION:
-                return basicUnsetDynAssociation(msgs);
-            case SclPackage.SERVICES__DYN_DATA_SET:
-                return basicUnsetDynDataSet(msgs);
-            case SclPackage.SERVICES__FILE_HANDLING:
-                return basicUnsetFileHandling(msgs);
-            case SclPackage.SERVICES__GOOSE:
-                return basicUnsetGOOSE(msgs);
-            case SclPackage.SERVICES__GSE_DIR:
-                return basicUnsetGSEDir(msgs);
-            case SclPackage.SERVICES__GSE_SETTINGS:
-                return basicUnsetGSESettings(msgs);
-            case SclPackage.SERVICES__GSSE:
-                return basicUnsetGSSE(msgs);
-            case SclPackage.SERVICES__GET_CB_VALUES:
-                return basicUnsetGetCBValues(msgs);
-            case SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION:
-                return basicUnsetGetDataObjectDefinition(msgs);
-            case SclPackage.SERVICES__GET_DATA_SET_VALUE:
-                return basicUnsetGetDataSetValue(msgs);
-            case SclPackage.SERVICES__GET_DIRECTORY:
-                return basicUnsetGetDirectory(msgs);
-            case SclPackage.SERVICES__PARENT_IED:
-                return basicSetParentIED(null, msgs);
-            case SclPackage.SERVICES__LOG_SETTINGS:
-                return basicUnsetLogSettings(msgs);
-            case SclPackage.SERVICES__READ_WRITE:
-                return basicUnsetReadWrite(msgs);
-            case SclPackage.SERVICES__RED_PROT:
-                return basicUnsetRedProt(msgs);
-            case SclPackage.SERVICES__REPORT_SETTINGS:
-                return basicUnsetReportSettings(msgs);
-            case SclPackage.SERVICES__SM_VSC:
-                return basicUnsetSMVsc(msgs);
-            case SclPackage.SERVICES__SUP_SUBSCRIPTION:
-                return basicUnsetSupSubscription(msgs);
-            case SclPackage.SERVICES__VALUE_HANDLING:
-                return basicUnsetValueHandling(msgs);
-            case SclPackage.SERVICES__SET_DATA_SET_VALUE:
-                return basicUnsetSetDataSetValue(msgs);
-            case SclPackage.SERVICES__SETTING_GROUPS:
-                return basicUnsetSettingGroups(msgs);
-            case SclPackage.SERVICES__TIME_SYNC_PROT:
-                return basicUnsetTimeSyncProt(msgs);
-            case SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL:
-                return basicUnsetTimerActivatedControl(msgs);
-            case SclPackage.SERVICES__SMV_SETTINGS:
-                return basicUnsetSMVSettings(msgs);
-        }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        switch( featureID ) {
+        case SclPackage.SERVICES__PARENT_ACCESS_POINT:
+            return basicSetParentAccessPoint( null, msgs );
+        case SclPackage.SERVICES__CLIENT_SERVICES:
+            return basicUnsetClientServices( msgs );
+        case SclPackage.SERVICES__COMM_PROT:
+            return basicUnsetCommProt( msgs );
+        case SclPackage.SERVICES__CONF_DATA_SET:
+            return basicUnsetConfDataSet( msgs );
+        case SclPackage.SERVICES__CONF_LNS:
+            return basicUnsetConfLNs( msgs );
+        case SclPackage.SERVICES__CONF_LD_NAME:
+            return basicUnsetConfLdName( msgs );
+        case SclPackage.SERVICES__CONF_LOG_CONTROL:
+            return basicUnsetConfLogControl( msgs );
+        case SclPackage.SERVICES__CONF_REPORT_CONTROL:
+            return basicUnsetConfReportControl( msgs );
+        case SclPackage.SERVICES__CONF_SIG_REF:
+            return basicUnsetConfSigRef( msgs );
+        case SclPackage.SERVICES__DATA_OBJECT_DIRECTORY:
+            return basicUnsetDataObjectDirectory( msgs );
+        case SclPackage.SERVICES__DATA_SET_DIRECTORY:
+            return basicUnsetDataSetDirectory( msgs );
+        case SclPackage.SERVICES__DYN_ASSOCIATION:
+            return basicUnsetDynAssociation( msgs );
+        case SclPackage.SERVICES__DYN_DATA_SET:
+            return basicUnsetDynDataSet( msgs );
+        case SclPackage.SERVICES__FILE_HANDLING:
+            return basicUnsetFileHandling( msgs );
+        case SclPackage.SERVICES__GOOSE:
+            return basicUnsetGOOSE( msgs );
+        case SclPackage.SERVICES__GSE_DIR:
+            return basicUnsetGSEDir( msgs );
+        case SclPackage.SERVICES__GSE_SETTINGS:
+            return basicUnsetGSESettings( msgs );
+        case SclPackage.SERVICES__GSSE:
+            return basicUnsetGSSE( msgs );
+        case SclPackage.SERVICES__GET_CB_VALUES:
+            return basicUnsetGetCBValues( msgs );
+        case SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION:
+            return basicUnsetGetDataObjectDefinition( msgs );
+        case SclPackage.SERVICES__GET_DATA_SET_VALUE:
+            return basicUnsetGetDataSetValue( msgs );
+        case SclPackage.SERVICES__GET_DIRECTORY:
+            return basicUnsetGetDirectory( msgs );
+        case SclPackage.SERVICES__PARENT_IED:
+            return basicSetParentIED( null, msgs );
+        case SclPackage.SERVICES__LOG_SETTINGS:
+            return basicUnsetLogSettings( msgs );
+        case SclPackage.SERVICES__READ_WRITE:
+            return basicUnsetReadWrite( msgs );
+        case SclPackage.SERVICES__RED_PROT:
+            return basicUnsetRedProt( msgs );
+        case SclPackage.SERVICES__REPORT_SETTINGS:
+            return basicUnsetReportSettings( msgs );
+        case SclPackage.SERVICES__SM_VSC:
+            return basicUnsetSMVsc( msgs );
+        case SclPackage.SERVICES__SUP_SUBSCRIPTION:
+            return basicUnsetSupSubscription( msgs );
+        case SclPackage.SERVICES__VALUE_HANDLING:
+            return basicUnsetValueHandling( msgs );
+        case SclPackage.SERVICES__SET_DATA_SET_VALUE:
+            return basicUnsetSetDataSetValue( msgs );
+        case SclPackage.SERVICES__SETTING_GROUPS:
+            return basicUnsetSettingGroups( msgs );
+        case SclPackage.SERVICES__TIME_SYNC_PROT:
+            return basicUnsetTimeSyncProt( msgs );
+        case SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL:
+            return basicUnsetTimerActivatedControl( msgs );
+        case SclPackage.SERVICES__SMV_SETTINGS:
+            return basicUnsetSMVSettings( msgs );
+        }
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -4436,13 +4924,14 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SERVICES__PARENT_ACCESS_POINT:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ACCESS_POINT__SERVICES, AccessPoint.class, msgs);
-            case SclPackage.SERVICES__PARENT_IED:
-                return eInternalContainer().eInverseRemove(this, SclPackage.IED__SERVICES, IED.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SERVICES__PARENT_ACCESS_POINT:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ACCESS_POINT__SERVICES, AccessPoint.class,
+                    msgs );
+        case SclPackage.SERVICES__PARENT_IED:
+            return eInternalContainer().eInverseRemove( this, SclPackage.IED__SERVICES, IED.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -4452,81 +4941,81 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SERVICES__NAME_LENGTH:
-                return getNameLength();
-            case SclPackage.SERVICES__PARENT_ACCESS_POINT:
-                return getParentAccessPoint();
-            case SclPackage.SERVICES__CLIENT_SERVICES:
-                return getClientServices();
-            case SclPackage.SERVICES__COMM_PROT:
-                return getCommProt();
-            case SclPackage.SERVICES__CONF_DATA_SET:
-                return getConfDataSet();
-            case SclPackage.SERVICES__CONF_LNS:
-                return getConfLNs();
-            case SclPackage.SERVICES__CONF_LD_NAME:
-                return getConfLdName();
-            case SclPackage.SERVICES__CONF_LOG_CONTROL:
-                return getConfLogControl();
-            case SclPackage.SERVICES__CONF_REPORT_CONTROL:
-                return getConfReportControl();
-            case SclPackage.SERVICES__CONF_SIG_REF:
-                return getConfSigRef();
-            case SclPackage.SERVICES__DATA_OBJECT_DIRECTORY:
-                return getDataObjectDirectory();
-            case SclPackage.SERVICES__DATA_SET_DIRECTORY:
-                return getDataSetDirectory();
-            case SclPackage.SERVICES__DYN_ASSOCIATION:
-                return getDynAssociation();
-            case SclPackage.SERVICES__DYN_DATA_SET:
-                return getDynDataSet();
-            case SclPackage.SERVICES__FILE_HANDLING:
-                return getFileHandling();
-            case SclPackage.SERVICES__GOOSE:
-                return getGOOSE();
-            case SclPackage.SERVICES__GSE_DIR:
-                return getGSEDir();
-            case SclPackage.SERVICES__GSE_SETTINGS:
-                return getGSESettings();
-            case SclPackage.SERVICES__GSSE:
-                return getGSSE();
-            case SclPackage.SERVICES__GET_CB_VALUES:
-                return getGetCBValues();
-            case SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION:
-                return getGetDataObjectDefinition();
-            case SclPackage.SERVICES__GET_DATA_SET_VALUE:
-                return getGetDataSetValue();
-            case SclPackage.SERVICES__GET_DIRECTORY:
-                return getGetDirectory();
-            case SclPackage.SERVICES__PARENT_IED:
-                return getParentIED();
-            case SclPackage.SERVICES__LOG_SETTINGS:
-                return getLogSettings();
-            case SclPackage.SERVICES__READ_WRITE:
-                return getReadWrite();
-            case SclPackage.SERVICES__RED_PROT:
-                return getRedProt();
-            case SclPackage.SERVICES__REPORT_SETTINGS:
-                return getReportSettings();
-            case SclPackage.SERVICES__SM_VSC:
-                return getSMVsc();
-            case SclPackage.SERVICES__SUP_SUBSCRIPTION:
-                return getSupSubscription();
-            case SclPackage.SERVICES__VALUE_HANDLING:
-                return getValueHandling();
-            case SclPackage.SERVICES__SET_DATA_SET_VALUE:
-                return getSetDataSetValue();
-            case SclPackage.SERVICES__SETTING_GROUPS:
-                return getSettingGroups();
-            case SclPackage.SERVICES__TIME_SYNC_PROT:
-                return getTimeSyncProt();
-            case SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL:
-                return getTimerActivatedControl();
-            case SclPackage.SERVICES__SMV_SETTINGS:
-                return getSMVSettings();
-        }
-        return super.eGet(featureID, resolve, coreType);
+        switch( featureID ) {
+        case SclPackage.SERVICES__NAME_LENGTH:
+            return getNameLength();
+        case SclPackage.SERVICES__PARENT_ACCESS_POINT:
+            return getParentAccessPoint();
+        case SclPackage.SERVICES__CLIENT_SERVICES:
+            return getClientServices();
+        case SclPackage.SERVICES__COMM_PROT:
+            return getCommProt();
+        case SclPackage.SERVICES__CONF_DATA_SET:
+            return getConfDataSet();
+        case SclPackage.SERVICES__CONF_LNS:
+            return getConfLNs();
+        case SclPackage.SERVICES__CONF_LD_NAME:
+            return getConfLdName();
+        case SclPackage.SERVICES__CONF_LOG_CONTROL:
+            return getConfLogControl();
+        case SclPackage.SERVICES__CONF_REPORT_CONTROL:
+            return getConfReportControl();
+        case SclPackage.SERVICES__CONF_SIG_REF:
+            return getConfSigRef();
+        case SclPackage.SERVICES__DATA_OBJECT_DIRECTORY:
+            return getDataObjectDirectory();
+        case SclPackage.SERVICES__DATA_SET_DIRECTORY:
+            return getDataSetDirectory();
+        case SclPackage.SERVICES__DYN_ASSOCIATION:
+            return getDynAssociation();
+        case SclPackage.SERVICES__DYN_DATA_SET:
+            return getDynDataSet();
+        case SclPackage.SERVICES__FILE_HANDLING:
+            return getFileHandling();
+        case SclPackage.SERVICES__GOOSE:
+            return getGOOSE();
+        case SclPackage.SERVICES__GSE_DIR:
+            return getGSEDir();
+        case SclPackage.SERVICES__GSE_SETTINGS:
+            return getGSESettings();
+        case SclPackage.SERVICES__GSSE:
+            return getGSSE();
+        case SclPackage.SERVICES__GET_CB_VALUES:
+            return getGetCBValues();
+        case SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION:
+            return getGetDataObjectDefinition();
+        case SclPackage.SERVICES__GET_DATA_SET_VALUE:
+            return getGetDataSetValue();
+        case SclPackage.SERVICES__GET_DIRECTORY:
+            return getGetDirectory();
+        case SclPackage.SERVICES__PARENT_IED:
+            return getParentIED();
+        case SclPackage.SERVICES__LOG_SETTINGS:
+            return getLogSettings();
+        case SclPackage.SERVICES__READ_WRITE:
+            return getReadWrite();
+        case SclPackage.SERVICES__RED_PROT:
+            return getRedProt();
+        case SclPackage.SERVICES__REPORT_SETTINGS:
+            return getReportSettings();
+        case SclPackage.SERVICES__SM_VSC:
+            return getSMVsc();
+        case SclPackage.SERVICES__SUP_SUBSCRIPTION:
+            return getSupSubscription();
+        case SclPackage.SERVICES__VALUE_HANDLING:
+            return getValueHandling();
+        case SclPackage.SERVICES__SET_DATA_SET_VALUE:
+            return getSetDataSetValue();
+        case SclPackage.SERVICES__SETTING_GROUPS:
+            return getSettingGroups();
+        case SclPackage.SERVICES__TIME_SYNC_PROT:
+            return getTimeSyncProt();
+        case SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL:
+            return getTimerActivatedControl();
+        case SclPackage.SERVICES__SMV_SETTINGS:
+            return getSMVSettings();
+        }
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -4536,117 +5025,117 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SERVICES__NAME_LENGTH:
-                setNameLength((Integer)newValue);
-                return;
-            case SclPackage.SERVICES__PARENT_ACCESS_POINT:
-                setParentAccessPoint((AccessPoint)newValue);
-                return;
-            case SclPackage.SERVICES__CLIENT_SERVICES:
-                setClientServices((ClientServices)newValue);
-                return;
-            case SclPackage.SERVICES__COMM_PROT:
-                setCommProt((CommProt)newValue);
-                return;
-            case SclPackage.SERVICES__CONF_DATA_SET:
-                setConfDataSet((ConfDataSet)newValue);
-                return;
-            case SclPackage.SERVICES__CONF_LNS:
-                setConfLNs((ConfLNs)newValue);
-                return;
-            case SclPackage.SERVICES__CONF_LD_NAME:
-                setConfLdName((ConfLdName)newValue);
-                return;
-            case SclPackage.SERVICES__CONF_LOG_CONTROL:
-                setConfLogControl((ConfLogControl)newValue);
-                return;
-            case SclPackage.SERVICES__CONF_REPORT_CONTROL:
-                setConfReportControl((ConfReportControl)newValue);
-                return;
-            case SclPackage.SERVICES__CONF_SIG_REF:
-                setConfSigRef((ConfSigRef)newValue);
-                return;
-            case SclPackage.SERVICES__DATA_OBJECT_DIRECTORY:
-                setDataObjectDirectory((DataObjectDirectory)newValue);
-                return;
-            case SclPackage.SERVICES__DATA_SET_DIRECTORY:
-                setDataSetDirectory((DataSetDirectory)newValue);
-                return;
-            case SclPackage.SERVICES__DYN_ASSOCIATION:
-                setDynAssociation((DynAssociation)newValue);
-                return;
-            case SclPackage.SERVICES__DYN_DATA_SET:
-                setDynDataSet((DynDataSet)newValue);
-                return;
-            case SclPackage.SERVICES__FILE_HANDLING:
-                setFileHandling((FileHandling)newValue);
-                return;
-            case SclPackage.SERVICES__GOOSE:
-                setGOOSE((GOOSE)newValue);
-                return;
-            case SclPackage.SERVICES__GSE_DIR:
-                setGSEDir((GSEDir)newValue);
-                return;
-            case SclPackage.SERVICES__GSE_SETTINGS:
-                setGSESettings((GSESettings)newValue);
-                return;
-            case SclPackage.SERVICES__GSSE:
-                setGSSE((GSSE)newValue);
-                return;
-            case SclPackage.SERVICES__GET_CB_VALUES:
-                setGetCBValues((GetCBValues)newValue);
-                return;
-            case SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION:
-                setGetDataObjectDefinition((GetDataObjectDefinition)newValue);
-                return;
-            case SclPackage.SERVICES__GET_DATA_SET_VALUE:
-                setGetDataSetValue((GetDataSetValue)newValue);
-                return;
-            case SclPackage.SERVICES__GET_DIRECTORY:
-                setGetDirectory((GetDirectory)newValue);
-                return;
-            case SclPackage.SERVICES__PARENT_IED:
-                setParentIED((IED)newValue);
-                return;
-            case SclPackage.SERVICES__LOG_SETTINGS:
-                setLogSettings((LogSettings)newValue);
-                return;
-            case SclPackage.SERVICES__READ_WRITE:
-                setReadWrite((ReadWrite)newValue);
-                return;
-            case SclPackage.SERVICES__RED_PROT:
-                setRedProt((RedProt)newValue);
-                return;
-            case SclPackage.SERVICES__REPORT_SETTINGS:
-                setReportSettings((ReportSettings)newValue);
-                return;
-            case SclPackage.SERVICES__SM_VSC:
-                setSMVsc((SMVsc)newValue);
-                return;
-            case SclPackage.SERVICES__SUP_SUBSCRIPTION:
-                setSupSubscription((SupSubscription)newValue);
-                return;
-            case SclPackage.SERVICES__VALUE_HANDLING:
-                setValueHandling((ValueHandling)newValue);
-                return;
-            case SclPackage.SERVICES__SET_DATA_SET_VALUE:
-                setSetDataSetValue((SetDataSetValue)newValue);
-                return;
-            case SclPackage.SERVICES__SETTING_GROUPS:
-                setSettingGroups((SettingGroups)newValue);
-                return;
-            case SclPackage.SERVICES__TIME_SYNC_PROT:
-                setTimeSyncProt((TimeSyncProt)newValue);
-                return;
-            case SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL:
-                setTimerActivatedControl((TimerActivatedControl)newValue);
-                return;
-            case SclPackage.SERVICES__SMV_SETTINGS:
-                setSMVSettings((SMVSettings)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
+        switch( featureID ) {
+        case SclPackage.SERVICES__NAME_LENGTH:
+            setNameLength( ( Integer ) newValue );
+            return;
+        case SclPackage.SERVICES__PARENT_ACCESS_POINT:
+            setParentAccessPoint( ( AccessPoint ) newValue );
+            return;
+        case SclPackage.SERVICES__CLIENT_SERVICES:
+            setClientServices( ( ClientServices ) newValue );
+            return;
+        case SclPackage.SERVICES__COMM_PROT:
+            setCommProt( ( CommProt ) newValue );
+            return;
+        case SclPackage.SERVICES__CONF_DATA_SET:
+            setConfDataSet( ( ConfDataSet ) newValue );
+            return;
+        case SclPackage.SERVICES__CONF_LNS:
+            setConfLNs( ( ConfLNs ) newValue );
+            return;
+        case SclPackage.SERVICES__CONF_LD_NAME:
+            setConfLdName( ( ConfLdName ) newValue );
+            return;
+        case SclPackage.SERVICES__CONF_LOG_CONTROL:
+            setConfLogControl( ( ConfLogControl ) newValue );
+            return;
+        case SclPackage.SERVICES__CONF_REPORT_CONTROL:
+            setConfReportControl( ( ConfReportControl ) newValue );
+            return;
+        case SclPackage.SERVICES__CONF_SIG_REF:
+            setConfSigRef( ( ConfSigRef ) newValue );
+            return;
+        case SclPackage.SERVICES__DATA_OBJECT_DIRECTORY:
+            setDataObjectDirectory( ( DataObjectDirectory ) newValue );
+            return;
+        case SclPackage.SERVICES__DATA_SET_DIRECTORY:
+            setDataSetDirectory( ( DataSetDirectory ) newValue );
+            return;
+        case SclPackage.SERVICES__DYN_ASSOCIATION:
+            setDynAssociation( ( DynAssociation ) newValue );
+            return;
+        case SclPackage.SERVICES__DYN_DATA_SET:
+            setDynDataSet( ( DynDataSet ) newValue );
+            return;
+        case SclPackage.SERVICES__FILE_HANDLING:
+            setFileHandling( ( FileHandling ) newValue );
+            return;
+        case SclPackage.SERVICES__GOOSE:
+            setGOOSE( ( GOOSE ) newValue );
+            return;
+        case SclPackage.SERVICES__GSE_DIR:
+            setGSEDir( ( GSEDir ) newValue );
+            return;
+        case SclPackage.SERVICES__GSE_SETTINGS:
+            setGSESettings( ( GSESettings ) newValue );
+            return;
+        case SclPackage.SERVICES__GSSE:
+            setGSSE( ( GSSE ) newValue );
+            return;
+        case SclPackage.SERVICES__GET_CB_VALUES:
+            setGetCBValues( ( GetCBValues ) newValue );
+            return;
+        case SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION:
+            setGetDataObjectDefinition( ( GetDataObjectDefinition ) newValue );
+            return;
+        case SclPackage.SERVICES__GET_DATA_SET_VALUE:
+            setGetDataSetValue( ( GetDataSetValue ) newValue );
+            return;
+        case SclPackage.SERVICES__GET_DIRECTORY:
+            setGetDirectory( ( GetDirectory ) newValue );
+            return;
+        case SclPackage.SERVICES__PARENT_IED:
+            setParentIED( ( IED ) newValue );
+            return;
+        case SclPackage.SERVICES__LOG_SETTINGS:
+            setLogSettings( ( LogSettings ) newValue );
+            return;
+        case SclPackage.SERVICES__READ_WRITE:
+            setReadWrite( ( ReadWrite ) newValue );
+            return;
+        case SclPackage.SERVICES__RED_PROT:
+            setRedProt( ( RedProt ) newValue );
+            return;
+        case SclPackage.SERVICES__REPORT_SETTINGS:
+            setReportSettings( ( ReportSettings ) newValue );
+            return;
+        case SclPackage.SERVICES__SM_VSC:
+            setSMVsc( ( SMVsc ) newValue );
+            return;
+        case SclPackage.SERVICES__SUP_SUBSCRIPTION:
+            setSupSubscription( ( SupSubscription ) newValue );
+            return;
+        case SclPackage.SERVICES__VALUE_HANDLING:
+            setValueHandling( ( ValueHandling ) newValue );
+            return;
+        case SclPackage.SERVICES__SET_DATA_SET_VALUE:
+            setSetDataSetValue( ( SetDataSetValue ) newValue );
+            return;
+        case SclPackage.SERVICES__SETTING_GROUPS:
+            setSettingGroups( ( SettingGroups ) newValue );
+            return;
+        case SclPackage.SERVICES__TIME_SYNC_PROT:
+            setTimeSyncProt( ( TimeSyncProt ) newValue );
+            return;
+        case SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL:
+            setTimerActivatedControl( ( TimerActivatedControl ) newValue );
+            return;
+        case SclPackage.SERVICES__SMV_SETTINGS:
+            setSMVSettings( ( SMVSettings ) newValue );
+            return;
+        }
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -4656,117 +5145,117 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SERVICES__NAME_LENGTH:
-                unsetNameLength();
-                return;
-            case SclPackage.SERVICES__PARENT_ACCESS_POINT:
-                setParentAccessPoint((AccessPoint)null);
-                return;
-            case SclPackage.SERVICES__CLIENT_SERVICES:
-                unsetClientServices();
-                return;
-            case SclPackage.SERVICES__COMM_PROT:
-                unsetCommProt();
-                return;
-            case SclPackage.SERVICES__CONF_DATA_SET:
-                unsetConfDataSet();
-                return;
-            case SclPackage.SERVICES__CONF_LNS:
-                unsetConfLNs();
-                return;
-            case SclPackage.SERVICES__CONF_LD_NAME:
-                unsetConfLdName();
-                return;
-            case SclPackage.SERVICES__CONF_LOG_CONTROL:
-                unsetConfLogControl();
-                return;
-            case SclPackage.SERVICES__CONF_REPORT_CONTROL:
-                unsetConfReportControl();
-                return;
-            case SclPackage.SERVICES__CONF_SIG_REF:
-                unsetConfSigRef();
-                return;
-            case SclPackage.SERVICES__DATA_OBJECT_DIRECTORY:
-                unsetDataObjectDirectory();
-                return;
-            case SclPackage.SERVICES__DATA_SET_DIRECTORY:
-                unsetDataSetDirectory();
-                return;
-            case SclPackage.SERVICES__DYN_ASSOCIATION:
-                unsetDynAssociation();
-                return;
-            case SclPackage.SERVICES__DYN_DATA_SET:
-                unsetDynDataSet();
-                return;
-            case SclPackage.SERVICES__FILE_HANDLING:
-                unsetFileHandling();
-                return;
-            case SclPackage.SERVICES__GOOSE:
-                unsetGOOSE();
-                return;
-            case SclPackage.SERVICES__GSE_DIR:
-                unsetGSEDir();
-                return;
-            case SclPackage.SERVICES__GSE_SETTINGS:
-                unsetGSESettings();
-                return;
-            case SclPackage.SERVICES__GSSE:
-                unsetGSSE();
-                return;
-            case SclPackage.SERVICES__GET_CB_VALUES:
-                unsetGetCBValues();
-                return;
-            case SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION:
-                unsetGetDataObjectDefinition();
-                return;
-            case SclPackage.SERVICES__GET_DATA_SET_VALUE:
-                unsetGetDataSetValue();
-                return;
-            case SclPackage.SERVICES__GET_DIRECTORY:
-                unsetGetDirectory();
-                return;
-            case SclPackage.SERVICES__PARENT_IED:
-                setParentIED((IED)null);
-                return;
-            case SclPackage.SERVICES__LOG_SETTINGS:
-                unsetLogSettings();
-                return;
-            case SclPackage.SERVICES__READ_WRITE:
-                unsetReadWrite();
-                return;
-            case SclPackage.SERVICES__RED_PROT:
-                unsetRedProt();
-                return;
-            case SclPackage.SERVICES__REPORT_SETTINGS:
-                unsetReportSettings();
-                return;
-            case SclPackage.SERVICES__SM_VSC:
-                unsetSMVsc();
-                return;
-            case SclPackage.SERVICES__SUP_SUBSCRIPTION:
-                unsetSupSubscription();
-                return;
-            case SclPackage.SERVICES__VALUE_HANDLING:
-                unsetValueHandling();
-                return;
-            case SclPackage.SERVICES__SET_DATA_SET_VALUE:
-                unsetSetDataSetValue();
-                return;
-            case SclPackage.SERVICES__SETTING_GROUPS:
-                unsetSettingGroups();
-                return;
-            case SclPackage.SERVICES__TIME_SYNC_PROT:
-                unsetTimeSyncProt();
-                return;
-            case SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL:
-                unsetTimerActivatedControl();
-                return;
-            case SclPackage.SERVICES__SMV_SETTINGS:
-                unsetSMVSettings();
-                return;
-        }
-        super.eUnset(featureID);
+        switch( featureID ) {
+        case SclPackage.SERVICES__NAME_LENGTH:
+            unsetNameLength();
+            return;
+        case SclPackage.SERVICES__PARENT_ACCESS_POINT:
+            setParentAccessPoint( ( AccessPoint ) null );
+            return;
+        case SclPackage.SERVICES__CLIENT_SERVICES:
+            unsetClientServices();
+            return;
+        case SclPackage.SERVICES__COMM_PROT:
+            unsetCommProt();
+            return;
+        case SclPackage.SERVICES__CONF_DATA_SET:
+            unsetConfDataSet();
+            return;
+        case SclPackage.SERVICES__CONF_LNS:
+            unsetConfLNs();
+            return;
+        case SclPackage.SERVICES__CONF_LD_NAME:
+            unsetConfLdName();
+            return;
+        case SclPackage.SERVICES__CONF_LOG_CONTROL:
+            unsetConfLogControl();
+            return;
+        case SclPackage.SERVICES__CONF_REPORT_CONTROL:
+            unsetConfReportControl();
+            return;
+        case SclPackage.SERVICES__CONF_SIG_REF:
+            unsetConfSigRef();
+            return;
+        case SclPackage.SERVICES__DATA_OBJECT_DIRECTORY:
+            unsetDataObjectDirectory();
+            return;
+        case SclPackage.SERVICES__DATA_SET_DIRECTORY:
+            unsetDataSetDirectory();
+            return;
+        case SclPackage.SERVICES__DYN_ASSOCIATION:
+            unsetDynAssociation();
+            return;
+        case SclPackage.SERVICES__DYN_DATA_SET:
+            unsetDynDataSet();
+            return;
+        case SclPackage.SERVICES__FILE_HANDLING:
+            unsetFileHandling();
+            return;
+        case SclPackage.SERVICES__GOOSE:
+            unsetGOOSE();
+            return;
+        case SclPackage.SERVICES__GSE_DIR:
+            unsetGSEDir();
+            return;
+        case SclPackage.SERVICES__GSE_SETTINGS:
+            unsetGSESettings();
+            return;
+        case SclPackage.SERVICES__GSSE:
+            unsetGSSE();
+            return;
+        case SclPackage.SERVICES__GET_CB_VALUES:
+            unsetGetCBValues();
+            return;
+        case SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION:
+            unsetGetDataObjectDefinition();
+            return;
+        case SclPackage.SERVICES__GET_DATA_SET_VALUE:
+            unsetGetDataSetValue();
+            return;
+        case SclPackage.SERVICES__GET_DIRECTORY:
+            unsetGetDirectory();
+            return;
+        case SclPackage.SERVICES__PARENT_IED:
+            setParentIED( ( IED ) null );
+            return;
+        case SclPackage.SERVICES__LOG_SETTINGS:
+            unsetLogSettings();
+            return;
+        case SclPackage.SERVICES__READ_WRITE:
+            unsetReadWrite();
+            return;
+        case SclPackage.SERVICES__RED_PROT:
+            unsetRedProt();
+            return;
+        case SclPackage.SERVICES__REPORT_SETTINGS:
+            unsetReportSettings();
+            return;
+        case SclPackage.SERVICES__SM_VSC:
+            unsetSMVsc();
+            return;
+        case SclPackage.SERVICES__SUP_SUBSCRIPTION:
+            unsetSupSubscription();
+            return;
+        case SclPackage.SERVICES__VALUE_HANDLING:
+            unsetValueHandling();
+            return;
+        case SclPackage.SERVICES__SET_DATA_SET_VALUE:
+            unsetSetDataSetValue();
+            return;
+        case SclPackage.SERVICES__SETTING_GROUPS:
+            unsetSettingGroups();
+            return;
+        case SclPackage.SERVICES__TIME_SYNC_PROT:
+            unsetTimeSyncProt();
+            return;
+        case SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL:
+            unsetTimerActivatedControl();
+            return;
+        case SclPackage.SERVICES__SMV_SETTINGS:
+            unsetSMVSettings();
+            return;
+        }
+        super.eUnset( featureID );
     }
 
     /**
@@ -4776,81 +5265,81 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SERVICES__NAME_LENGTH:
-                return isSetNameLength();
-            case SclPackage.SERVICES__PARENT_ACCESS_POINT:
-                return getParentAccessPoint() != null;
-            case SclPackage.SERVICES__CLIENT_SERVICES:
-                return isSetClientServices();
-            case SclPackage.SERVICES__COMM_PROT:
-                return isSetCommProt();
-            case SclPackage.SERVICES__CONF_DATA_SET:
-                return isSetConfDataSet();
-            case SclPackage.SERVICES__CONF_LNS:
-                return isSetConfLNs();
-            case SclPackage.SERVICES__CONF_LD_NAME:
-                return isSetConfLdName();
-            case SclPackage.SERVICES__CONF_LOG_CONTROL:
-                return isSetConfLogControl();
-            case SclPackage.SERVICES__CONF_REPORT_CONTROL:
-                return isSetConfReportControl();
-            case SclPackage.SERVICES__CONF_SIG_REF:
-                return isSetConfSigRef();
-            case SclPackage.SERVICES__DATA_OBJECT_DIRECTORY:
-                return isSetDataObjectDirectory();
-            case SclPackage.SERVICES__DATA_SET_DIRECTORY:
-                return isSetDataSetDirectory();
-            case SclPackage.SERVICES__DYN_ASSOCIATION:
-                return isSetDynAssociation();
-            case SclPackage.SERVICES__DYN_DATA_SET:
-                return isSetDynDataSet();
-            case SclPackage.SERVICES__FILE_HANDLING:
-                return isSetFileHandling();
-            case SclPackage.SERVICES__GOOSE:
-                return isSetGOOSE();
-            case SclPackage.SERVICES__GSE_DIR:
-                return isSetGSEDir();
-            case SclPackage.SERVICES__GSE_SETTINGS:
-                return isSetGSESettings();
-            case SclPackage.SERVICES__GSSE:
-                return isSetGSSE();
-            case SclPackage.SERVICES__GET_CB_VALUES:
-                return isSetGetCBValues();
-            case SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION:
-                return isSetGetDataObjectDefinition();
-            case SclPackage.SERVICES__GET_DATA_SET_VALUE:
-                return isSetGetDataSetValue();
-            case SclPackage.SERVICES__GET_DIRECTORY:
-                return isSetGetDirectory();
-            case SclPackage.SERVICES__PARENT_IED:
-                return getParentIED() != null;
-            case SclPackage.SERVICES__LOG_SETTINGS:
-                return isSetLogSettings();
-            case SclPackage.SERVICES__READ_WRITE:
-                return isSetReadWrite();
-            case SclPackage.SERVICES__RED_PROT:
-                return isSetRedProt();
-            case SclPackage.SERVICES__REPORT_SETTINGS:
-                return isSetReportSettings();
-            case SclPackage.SERVICES__SM_VSC:
-                return isSetSMVsc();
-            case SclPackage.SERVICES__SUP_SUBSCRIPTION:
-                return isSetSupSubscription();
-            case SclPackage.SERVICES__VALUE_HANDLING:
-                return isSetValueHandling();
-            case SclPackage.SERVICES__SET_DATA_SET_VALUE:
-                return isSetSetDataSetValue();
-            case SclPackage.SERVICES__SETTING_GROUPS:
-                return isSetSettingGroups();
-            case SclPackage.SERVICES__TIME_SYNC_PROT:
-                return isSetTimeSyncProt();
-            case SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL:
-                return isSetTimerActivatedControl();
-            case SclPackage.SERVICES__SMV_SETTINGS:
-                return isSetSMVSettings();
-        }
-        return super.eIsSet(featureID);
+        switch( featureID ) {
+        case SclPackage.SERVICES__NAME_LENGTH:
+            return isSetNameLength();
+        case SclPackage.SERVICES__PARENT_ACCESS_POINT:
+            return getParentAccessPoint() != null;
+        case SclPackage.SERVICES__CLIENT_SERVICES:
+            return isSetClientServices();
+        case SclPackage.SERVICES__COMM_PROT:
+            return isSetCommProt();
+        case SclPackage.SERVICES__CONF_DATA_SET:
+            return isSetConfDataSet();
+        case SclPackage.SERVICES__CONF_LNS:
+            return isSetConfLNs();
+        case SclPackage.SERVICES__CONF_LD_NAME:
+            return isSetConfLdName();
+        case SclPackage.SERVICES__CONF_LOG_CONTROL:
+            return isSetConfLogControl();
+        case SclPackage.SERVICES__CONF_REPORT_CONTROL:
+            return isSetConfReportControl();
+        case SclPackage.SERVICES__CONF_SIG_REF:
+            return isSetConfSigRef();
+        case SclPackage.SERVICES__DATA_OBJECT_DIRECTORY:
+            return isSetDataObjectDirectory();
+        case SclPackage.SERVICES__DATA_SET_DIRECTORY:
+            return isSetDataSetDirectory();
+        case SclPackage.SERVICES__DYN_ASSOCIATION:
+            return isSetDynAssociation();
+        case SclPackage.SERVICES__DYN_DATA_SET:
+            return isSetDynDataSet();
+        case SclPackage.SERVICES__FILE_HANDLING:
+            return isSetFileHandling();
+        case SclPackage.SERVICES__GOOSE:
+            return isSetGOOSE();
+        case SclPackage.SERVICES__GSE_DIR:
+            return isSetGSEDir();
+        case SclPackage.SERVICES__GSE_SETTINGS:
+            return isSetGSESettings();
+        case SclPackage.SERVICES__GSSE:
+            return isSetGSSE();
+        case SclPackage.SERVICES__GET_CB_VALUES:
+            return isSetGetCBValues();
+        case SclPackage.SERVICES__GET_DATA_OBJECT_DEFINITION:
+            return isSetGetDataObjectDefinition();
+        case SclPackage.SERVICES__GET_DATA_SET_VALUE:
+            return isSetGetDataSetValue();
+        case SclPackage.SERVICES__GET_DIRECTORY:
+            return isSetGetDirectory();
+        case SclPackage.SERVICES__PARENT_IED:
+            return getParentIED() != null;
+        case SclPackage.SERVICES__LOG_SETTINGS:
+            return isSetLogSettings();
+        case SclPackage.SERVICES__READ_WRITE:
+            return isSetReadWrite();
+        case SclPackage.SERVICES__RED_PROT:
+            return isSetRedProt();
+        case SclPackage.SERVICES__REPORT_SETTINGS:
+            return isSetReportSettings();
+        case SclPackage.SERVICES__SM_VSC:
+            return isSetSMVsc();
+        case SclPackage.SERVICES__SUP_SUBSCRIPTION:
+            return isSetSupSubscription();
+        case SclPackage.SERVICES__VALUE_HANDLING:
+            return isSetValueHandling();
+        case SclPackage.SERVICES__SET_DATA_SET_VALUE:
+            return isSetSetDataSetValue();
+        case SclPackage.SERVICES__SETTING_GROUPS:
+            return isSetSettingGroups();
+        case SclPackage.SERVICES__TIME_SYNC_PROT:
+            return isSetTimeSyncProt();
+        case SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL:
+            return isSetTimerActivatedControl();
+        case SclPackage.SERVICES__SMV_SETTINGS:
+            return isSetSMVSettings();
+        }
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -4860,12 +5349,15 @@ public class ServicesImpl extends SclObjectImpl implements Services {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (nameLength: ");
-        if (nameLengthESet) result.append(nameLength); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (nameLength: " );
+        if( nameLengthESet )
+            result.append( nameLength );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SetDataSetValueImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SetDataSetValueImpl.java
index a9f102f..c21cf3e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SetDataSetValueImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SetDataSetValueImpl.java
@@ -71,8 +71,8 @@ public class SetDataSetValueImpl extends ServiceYesNoImpl implements SetDataSetV
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class SetDataSetValueImpl extends ServiceYesNoImpl implements SetDataSetV
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices,
+                SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class SetDataSetValueImpl extends ServiceYesNoImpl implements SetDataSetV
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__SET_DATA_SET_VALUE, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this,
+                        SclPackage.SERVICES__SET_DATA_SET_VALUE, Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class SetDataSetValueImpl extends ServiceYesNoImpl implements SetDataSetV
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class SetDataSetValueImpl extends ServiceYesNoImpl implements SetDataSetV
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class SetDataSetValueImpl extends ServiceYesNoImpl implements SetDataSetV
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__SET_DATA_SET_VALUE, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__SET_DATA_SET_VALUE, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class SetDataSetValueImpl extends ServiceYesNoImpl implements SetDataSetV
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class SetDataSetValueImpl extends ServiceYesNoImpl implements SetDataSetV
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class SetDataSetValueImpl extends ServiceYesNoImpl implements SetDataSetV
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class SetDataSetValueImpl extends ServiceYesNoImpl implements SetDataSetV
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.SET_DATA_SET_VALUE__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //SetDataSetValueImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SettingControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SettingControlImpl.java
index b0d1fc6..9067fe9 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SettingControlImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SettingControlImpl.java
@@ -56,7 +56,7 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
      * @generated
      * @ordered
      */
-    protected static final Integer ACT_SG_EDEFAULT = new Integer(1);
+    protected static final Integer ACT_SG_EDEFAULT = new Integer( 1 );
 
     /**
      * The cached value of the '{@link #getActSG() <em>Act SG</em>}' attribute.
@@ -175,8 +175,9 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
         actSG = newActSG;
         boolean oldActSGESet = actSGESet;
         actSGESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SETTING_CONTROL__ACT_SG, oldActSG, actSG, !oldActSGESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SETTING_CONTROL__ACT_SG, oldActSG, actSG,
+                    !oldActSGESet ) );
     }
 
     /**
@@ -190,8 +191,9 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
         boolean oldActSGESet = actSGESet;
         actSG = ACT_SG_EDEFAULT;
         actSGESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SETTING_CONTROL__ACT_SG, oldActSG, ACT_SG_EDEFAULT, oldActSGESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SETTING_CONTROL__ACT_SG, oldActSG,
+                    ACT_SG_EDEFAULT, oldActSGESet ) );
     }
 
     /**
@@ -225,8 +227,9 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
         numOfSGs = newNumOfSGs;
         boolean oldNumOfSGsESet = numOfSGsESet;
         numOfSGsESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SETTING_CONTROL__NUM_OF_SGS, oldNumOfSGs, numOfSGs, !oldNumOfSGsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SETTING_CONTROL__NUM_OF_SGS, oldNumOfSGs,
+                    numOfSGs, !oldNumOfSGsESet ) );
     }
 
     /**
@@ -240,8 +243,9 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
         boolean oldNumOfSGsESet = numOfSGsESet;
         numOfSGs = NUM_OF_SGS_EDEFAULT;
         numOfSGsESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SETTING_CONTROL__NUM_OF_SGS, oldNumOfSGs, NUM_OF_SGS_EDEFAULT, oldNumOfSGsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SETTING_CONTROL__NUM_OF_SGS,
+                    oldNumOfSGs, NUM_OF_SGS_EDEFAULT, oldNumOfSGsESet ) );
     }
 
     /**
@@ -275,8 +279,9 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
         resvTms = newResvTms;
         boolean oldResvTmsESet = resvTmsESet;
         resvTmsESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SETTING_CONTROL__RESV_TMS, oldResvTms, resvTms, !oldResvTmsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SETTING_CONTROL__RESV_TMS, oldResvTms,
+                    resvTms, !oldResvTmsESet ) );
     }
 
     /**
@@ -290,8 +295,9 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
         boolean oldResvTmsESet = resvTmsESet;
         resvTms = RESV_TMS_EDEFAULT;
         resvTmsESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SETTING_CONTROL__RESV_TMS, oldResvTms, RESV_TMS_EDEFAULT, oldResvTmsESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SETTING_CONTROL__RESV_TMS, oldResvTms,
+                    RESV_TMS_EDEFAULT, oldResvTmsESet ) );
     }
 
     /**
@@ -311,8 +317,8 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
      */
     @Override
     public LN0 getParentLN0() {
-        if (eContainerFeatureID() != SclPackage.SETTING_CONTROL__PARENT_LN0) return null;
-        return (LN0)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SETTING_CONTROL__PARENT_LN0 ) return null;
+        return ( LN0 ) eInternalContainer();
     }
 
     /**
@@ -320,8 +326,8 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentLN0(LN0 newParentLN0, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentLN0, SclPackage.SETTING_CONTROL__PARENT_LN0, msgs);
+    public NotificationChain basicSetParentLN0( LN0 newParentLN0, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentLN0, SclPackage.SETTING_CONTROL__PARENT_LN0, msgs );
         return msgs;
     }
 
@@ -331,20 +337,23 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
      * @generated
      */
     @Override
-    public void setParentLN0(LN0 newParentLN0) {
-        if (newParentLN0 != eInternalContainer() || (eContainerFeatureID() != SclPackage.SETTING_CONTROL__PARENT_LN0 && newParentLN0 != null)) {
-            if (EcoreUtil.isAncestor(this, newParentLN0))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentLN0( LN0 newParentLN0 ) {
+        if( newParentLN0 != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SETTING_CONTROL__PARENT_LN0 && newParentLN0 != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentLN0 ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentLN0 != null)
-                msgs = ((InternalEObject)newParentLN0).eInverseAdd(this, SclPackage.LN0__SETTING_CONTROL, LN0.class, msgs);
-            msgs = basicSetParentLN0(newParentLN0, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentLN0 != null )
+                msgs = ( ( InternalEObject ) newParentLN0 ).eInverseAdd( this, SclPackage.LN0__SETTING_CONTROL,
+                        LN0.class, msgs );
+            msgs = basicSetParentLN0( newParentLN0, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SETTING_CONTROL__PARENT_LN0, newParentLN0, newParentLN0));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SETTING_CONTROL__PARENT_LN0,
+                    newParentLN0, newParentLN0 ) );
     }
 
     /**
@@ -354,13 +363,13 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SETTING_CONTROL__PARENT_LN0:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentLN0((LN0)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SETTING_CONTROL__PARENT_LN0:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentLN0( ( LN0 ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -370,11 +379,11 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SETTING_CONTROL__PARENT_LN0:
-                return basicSetParentLN0(null, msgs);
+        switch( featureID ) {
+        case SclPackage.SETTING_CONTROL__PARENT_LN0:
+            return basicSetParentLN0( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -384,11 +393,11 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SETTING_CONTROL__PARENT_LN0:
-                return eInternalContainer().eInverseRemove(this, SclPackage.LN0__SETTING_CONTROL, LN0.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SETTING_CONTROL__PARENT_LN0:
+            return eInternalContainer().eInverseRemove( this, SclPackage.LN0__SETTING_CONTROL, LN0.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -398,17 +407,17 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SETTING_CONTROL__ACT_SG:
-                return getActSG();
-            case SclPackage.SETTING_CONTROL__NUM_OF_SGS:
-                return getNumOfSGs();
-            case SclPackage.SETTING_CONTROL__RESV_TMS:
-                return getResvTms();
-            case SclPackage.SETTING_CONTROL__PARENT_LN0:
-                return getParentLN0();
+        switch( featureID ) {
+        case SclPackage.SETTING_CONTROL__ACT_SG:
+            return getActSG();
+        case SclPackage.SETTING_CONTROL__NUM_OF_SGS:
+            return getNumOfSGs();
+        case SclPackage.SETTING_CONTROL__RESV_TMS:
+            return getResvTms();
+        case SclPackage.SETTING_CONTROL__PARENT_LN0:
+            return getParentLN0();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -418,21 +427,21 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SETTING_CONTROL__ACT_SG:
-                setActSG((Integer)newValue);
-                return;
-            case SclPackage.SETTING_CONTROL__NUM_OF_SGS:
-                setNumOfSGs((Integer)newValue);
-                return;
-            case SclPackage.SETTING_CONTROL__RESV_TMS:
-                setResvTms((Short)newValue);
-                return;
-            case SclPackage.SETTING_CONTROL__PARENT_LN0:
-                setParentLN0((LN0)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SETTING_CONTROL__ACT_SG:
+            setActSG( ( Integer ) newValue );
+            return;
+        case SclPackage.SETTING_CONTROL__NUM_OF_SGS:
+            setNumOfSGs( ( Integer ) newValue );
+            return;
+        case SclPackage.SETTING_CONTROL__RESV_TMS:
+            setResvTms( ( Short ) newValue );
+            return;
+        case SclPackage.SETTING_CONTROL__PARENT_LN0:
+            setParentLN0( ( LN0 ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -442,21 +451,21 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SETTING_CONTROL__ACT_SG:
-                unsetActSG();
-                return;
-            case SclPackage.SETTING_CONTROL__NUM_OF_SGS:
-                unsetNumOfSGs();
-                return;
-            case SclPackage.SETTING_CONTROL__RESV_TMS:
-                unsetResvTms();
-                return;
-            case SclPackage.SETTING_CONTROL__PARENT_LN0:
-                setParentLN0((LN0)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.SETTING_CONTROL__ACT_SG:
+            unsetActSG();
+            return;
+        case SclPackage.SETTING_CONTROL__NUM_OF_SGS:
+            unsetNumOfSGs();
+            return;
+        case SclPackage.SETTING_CONTROL__RESV_TMS:
+            unsetResvTms();
+            return;
+        case SclPackage.SETTING_CONTROL__PARENT_LN0:
+            setParentLN0( ( LN0 ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -466,17 +475,17 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SETTING_CONTROL__ACT_SG:
-                return isSetActSG();
-            case SclPackage.SETTING_CONTROL__NUM_OF_SGS:
-                return isSetNumOfSGs();
-            case SclPackage.SETTING_CONTROL__RESV_TMS:
-                return isSetResvTms();
-            case SclPackage.SETTING_CONTROL__PARENT_LN0:
-                return getParentLN0() != null;
+        switch( featureID ) {
+        case SclPackage.SETTING_CONTROL__ACT_SG:
+            return isSetActSG();
+        case SclPackage.SETTING_CONTROL__NUM_OF_SGS:
+            return isSetNumOfSGs();
+        case SclPackage.SETTING_CONTROL__RESV_TMS:
+            return isSetResvTms();
+        case SclPackage.SETTING_CONTROL__PARENT_LN0:
+            return getParentLN0() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -486,16 +495,25 @@ public class SettingControlImpl extends UnNamingImpl implements SettingControl {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (actSG: ");
-        if (actSGESet) result.append(actSG); else result.append("<unset>");
-        result.append(", numOfSGs: ");
-        if (numOfSGsESet) result.append(numOfSGs); else result.append("<unset>");
-        result.append(", resvTms: ");
-        if (resvTmsESet) result.append(resvTms); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (actSG: " );
+        if( actSGESet )
+            result.append( actSG );
+        else
+            result.append( "<unset>" );
+        result.append( ", numOfSGs: " );
+        if( numOfSGsESet )
+            result.append( numOfSGs );
+        else
+            result.append( "<unset>" );
+        result.append( ", resvTms: " );
+        if( resvTmsESet )
+            result.append( resvTms );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SettingGroupsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SettingGroupsImpl.java
index 0411326..6905611 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SettingGroupsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SettingGroupsImpl.java
@@ -126,9 +126,13 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
         confSG = newConfSG;
         boolean oldConfSGESet = confSGESet;
         confSGESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SETTING_GROUPS__CONF_SG, oldConfSG, newConfSG, !oldConfSGESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SETTING_GROUPS__CONF_SG, oldConfSG, newConfSG, !oldConfSGESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -140,20 +144,23 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
      */
     @Override
     public void setConfSG( ConfSG newConfSG ) {
-        if (newConfSG != confSG) {
+        if( newConfSG != confSG ) {
             NotificationChain msgs = null;
-            if (confSG != null)
-                msgs = ((InternalEObject)confSG).eInverseRemove(this, SclPackage.CONF_SG__PARENT_SETTING_GROUPS, ConfSG.class, msgs);
-            if (newConfSG != null)
-                msgs = ((InternalEObject)newConfSG).eInverseAdd(this, SclPackage.CONF_SG__PARENT_SETTING_GROUPS, ConfSG.class, msgs);
-            msgs = basicSetConfSG(newConfSG, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( confSG != null )
+                msgs = ( ( InternalEObject ) confSG ).eInverseRemove( this, SclPackage.CONF_SG__PARENT_SETTING_GROUPS,
+                        ConfSG.class, msgs );
+            if( newConfSG != null )
+                msgs = ( ( InternalEObject ) newConfSG ).eInverseAdd( this, SclPackage.CONF_SG__PARENT_SETTING_GROUPS,
+                        ConfSG.class, msgs );
+            msgs = basicSetConfSG( newConfSG, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldConfSGESet = confSGESet;
             confSGESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SETTING_GROUPS__CONF_SG, newConfSG, newConfSG, !oldConfSGESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SETTING_GROUPS__CONF_SG, newConfSG,
+                        newConfSG, !oldConfSGESet ) );
         }
     }
 
@@ -167,9 +174,13 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
         confSG = null;
         boolean oldConfSGESet = confSGESet;
         confSGESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SETTING_GROUPS__CONF_SG, oldConfSG, null, oldConfSGESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SETTING_GROUPS__CONF_SG, oldConfSG, null, oldConfSGESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -181,17 +192,19 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
      */
     @Override
     public void unsetConfSG() {
-        if (confSG != null) {
+        if( confSG != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)confSG).eInverseRemove(this, SclPackage.CONF_SG__PARENT_SETTING_GROUPS, ConfSG.class, msgs);
-            msgs = basicUnsetConfSG(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) confSG ).eInverseRemove( this, SclPackage.CONF_SG__PARENT_SETTING_GROUPS,
+                    ConfSG.class, msgs );
+            msgs = basicUnsetConfSG( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldConfSGESet = confSGESet;
             confSGESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SETTING_GROUPS__CONF_SG, null, null, oldConfSGESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SETTING_GROUPS__CONF_SG, null,
+                        null, oldConfSGESet ) );
         }
     }
 
@@ -225,9 +238,13 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
         sgEdit = newSGEdit;
         boolean oldSGEditESet = sgEditESet;
         sgEditESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SETTING_GROUPS__SG_EDIT, oldSGEdit, newSGEdit, !oldSGEditESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SETTING_GROUPS__SG_EDIT, oldSGEdit, newSGEdit, !oldSGEditESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -239,20 +256,23 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
      */
     @Override
     public void setSGEdit( SGEdit newSGEdit ) {
-        if (newSGEdit != sgEdit) {
+        if( newSGEdit != sgEdit ) {
             NotificationChain msgs = null;
-            if (sgEdit != null)
-                msgs = ((InternalEObject)sgEdit).eInverseRemove(this, SclPackage.SG_EDIT__PARENT_SETTING_GROUPS, SGEdit.class, msgs);
-            if (newSGEdit != null)
-                msgs = ((InternalEObject)newSGEdit).eInverseAdd(this, SclPackage.SG_EDIT__PARENT_SETTING_GROUPS, SGEdit.class, msgs);
-            msgs = basicSetSGEdit(newSGEdit, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( sgEdit != null )
+                msgs = ( ( InternalEObject ) sgEdit ).eInverseRemove( this, SclPackage.SG_EDIT__PARENT_SETTING_GROUPS,
+                        SGEdit.class, msgs );
+            if( newSGEdit != null )
+                msgs = ( ( InternalEObject ) newSGEdit ).eInverseAdd( this, SclPackage.SG_EDIT__PARENT_SETTING_GROUPS,
+                        SGEdit.class, msgs );
+            msgs = basicSetSGEdit( newSGEdit, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSGEditESet = sgEditESet;
             sgEditESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SETTING_GROUPS__SG_EDIT, newSGEdit, newSGEdit, !oldSGEditESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SETTING_GROUPS__SG_EDIT, newSGEdit,
+                        newSGEdit, !oldSGEditESet ) );
         }
     }
 
@@ -266,9 +286,13 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
         sgEdit = null;
         boolean oldSGEditESet = sgEditESet;
         sgEditESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SETTING_GROUPS__SG_EDIT, oldSGEdit, null, oldSGEditESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SETTING_GROUPS__SG_EDIT, oldSGEdit, null, oldSGEditESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -280,17 +304,19 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
      */
     @Override
     public void unsetSGEdit() {
-        if (sgEdit != null) {
+        if( sgEdit != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)sgEdit).eInverseRemove(this, SclPackage.SG_EDIT__PARENT_SETTING_GROUPS, SGEdit.class, msgs);
-            msgs = basicUnsetSGEdit(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) sgEdit ).eInverseRemove( this, SclPackage.SG_EDIT__PARENT_SETTING_GROUPS,
+                    SGEdit.class, msgs );
+            msgs = basicUnsetSGEdit( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldSGEditESet = sgEditESet;
             sgEditESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SETTING_GROUPS__SG_EDIT, null, null, oldSGEditESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SETTING_GROUPS__SG_EDIT, null,
+                        null, oldSGEditESet ) );
         }
     }
 
@@ -311,8 +337,8 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.SETTING_GROUPS__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SETTING_GROUPS__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -320,8 +346,9 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.SETTING_GROUPS__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.SETTING_GROUPS__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -331,20 +358,24 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.SETTING_GROUPS__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SETTING_GROUPS__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__SETTING_GROUPS, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__SETTING_GROUPS,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SETTING_GROUPS__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SETTING_GROUPS__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -354,21 +385,23 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SETTING_GROUPS__CONF_SG:
-                if (confSG != null)
-                    msgs = ((InternalEObject)confSG).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SETTING_GROUPS__CONF_SG, null, msgs);
-                return basicSetConfSG((ConfSG)otherEnd, msgs);
-            case SclPackage.SETTING_GROUPS__SG_EDIT:
-                if (sgEdit != null)
-                    msgs = ((InternalEObject)sgEdit).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SETTING_GROUPS__SG_EDIT, null, msgs);
-                return basicSetSGEdit((SGEdit)otherEnd, msgs);
-            case SclPackage.SETTING_GROUPS__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SETTING_GROUPS__CONF_SG:
+            if( confSG != null )
+                msgs = ( ( InternalEObject ) confSG ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SETTING_GROUPS__CONF_SG, null, msgs );
+            return basicSetConfSG( ( ConfSG ) otherEnd, msgs );
+        case SclPackage.SETTING_GROUPS__SG_EDIT:
+            if( sgEdit != null )
+                msgs = ( ( InternalEObject ) sgEdit ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SETTING_GROUPS__SG_EDIT, null, msgs );
+            return basicSetSGEdit( ( SGEdit ) otherEnd, msgs );
+        case SclPackage.SETTING_GROUPS__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -378,15 +411,15 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SETTING_GROUPS__CONF_SG:
-                return basicUnsetConfSG(msgs);
-            case SclPackage.SETTING_GROUPS__SG_EDIT:
-                return basicUnsetSGEdit(msgs);
-            case SclPackage.SETTING_GROUPS__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.SETTING_GROUPS__CONF_SG:
+            return basicUnsetConfSG( msgs );
+        case SclPackage.SETTING_GROUPS__SG_EDIT:
+            return basicUnsetSGEdit( msgs );
+        case SclPackage.SETTING_GROUPS__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -396,11 +429,12 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SETTING_GROUPS__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__SETTING_GROUPS, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SETTING_GROUPS__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__SETTING_GROUPS, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -410,15 +444,15 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SETTING_GROUPS__CONF_SG:
-                return getConfSG();
-            case SclPackage.SETTING_GROUPS__SG_EDIT:
-                return getSGEdit();
-            case SclPackage.SETTING_GROUPS__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.SETTING_GROUPS__CONF_SG:
+            return getConfSG();
+        case SclPackage.SETTING_GROUPS__SG_EDIT:
+            return getSGEdit();
+        case SclPackage.SETTING_GROUPS__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -428,18 +462,18 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SETTING_GROUPS__CONF_SG:
-                setConfSG((ConfSG)newValue);
-                return;
-            case SclPackage.SETTING_GROUPS__SG_EDIT:
-                setSGEdit((SGEdit)newValue);
-                return;
-            case SclPackage.SETTING_GROUPS__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SETTING_GROUPS__CONF_SG:
+            setConfSG( ( ConfSG ) newValue );
+            return;
+        case SclPackage.SETTING_GROUPS__SG_EDIT:
+            setSGEdit( ( SGEdit ) newValue );
+            return;
+        case SclPackage.SETTING_GROUPS__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -449,18 +483,18 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SETTING_GROUPS__CONF_SG:
-                unsetConfSG();
-                return;
-            case SclPackage.SETTING_GROUPS__SG_EDIT:
-                unsetSGEdit();
-                return;
-            case SclPackage.SETTING_GROUPS__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.SETTING_GROUPS__CONF_SG:
+            unsetConfSG();
+            return;
+        case SclPackage.SETTING_GROUPS__SG_EDIT:
+            unsetSGEdit();
+            return;
+        case SclPackage.SETTING_GROUPS__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -470,15 +504,15 @@ public class SettingGroupsImpl extends SclObjectImpl implements SettingGroups {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SETTING_GROUPS__CONF_SG:
-                return isSetConfSG();
-            case SclPackage.SETTING_GROUPS__SG_EDIT:
-                return isSetSGEdit();
-            case SclPackage.SETTING_GROUPS__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.SETTING_GROUPS__CONF_SG:
+            return isSetConfSG();
+        case SclPackage.SETTING_GROUPS__SG_EDIT:
+            return isSetSGEdit();
+        case SclPackage.SETTING_GROUPS__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //SettingGroupsImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SmpRateImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SmpRateImpl.java
index c67e317..ad59293 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SmpRateImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SmpRateImpl.java
@@ -103,11 +103,11 @@ public class SmpRateImpl extends SclObjectImpl implements SmpRate {
      * @generated
      */
     @Override
-    public void setValue(Integer newValue) {
+    public void setValue( Integer newValue ) {
         Integer oldValue = value;
         value = newValue;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMP_RATE__VALUE, oldValue, value));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMP_RATE__VALUE, oldValue, value ) );
     }
 
     /**
@@ -117,8 +117,8 @@ public class SmpRateImpl extends SclObjectImpl implements SmpRate {
      */
     @Override
     public SMVSettings getParentSMVSettings() {
-        if (eContainerFeatureID() != SclPackage.SMP_RATE__PARENT_SMV_SETTINGS) return null;
-        return (SMVSettings)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SMP_RATE__PARENT_SMV_SETTINGS ) return null;
+        return ( SMVSettings ) eInternalContainer();
     }
 
     /**
@@ -126,8 +126,9 @@ public class SmpRateImpl extends SclObjectImpl implements SmpRate {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSMVSettings(SMVSettings newParentSMVSettings, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSMVSettings, SclPackage.SMP_RATE__PARENT_SMV_SETTINGS, msgs);
+    public NotificationChain basicSetParentSMVSettings( SMVSettings newParentSMVSettings, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSMVSettings, SclPackage.SMP_RATE__PARENT_SMV_SETTINGS,
+                msgs );
         return msgs;
     }
 
@@ -137,20 +138,24 @@ public class SmpRateImpl extends SclObjectImpl implements SmpRate {
      * @generated
      */
     @Override
-    public void setParentSMVSettings(SMVSettings newParentSMVSettings) {
-        if (newParentSMVSettings != eInternalContainer() || (eContainerFeatureID() != SclPackage.SMP_RATE__PARENT_SMV_SETTINGS && newParentSMVSettings != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSMVSettings))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSMVSettings( SMVSettings newParentSMVSettings ) {
+        if( newParentSMVSettings != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SMP_RATE__PARENT_SMV_SETTINGS
+                        && newParentSMVSettings != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSMVSettings ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSMVSettings != null)
-                msgs = ((InternalEObject)newParentSMVSettings).eInverseAdd(this, SclPackage.SMV_SETTINGS__SMP_RATE, SMVSettings.class, msgs);
-            msgs = basicSetParentSMVSettings(newParentSMVSettings, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSMVSettings != null )
+                msgs = ( ( InternalEObject ) newParentSMVSettings ).eInverseAdd( this,
+                        SclPackage.SMV_SETTINGS__SMP_RATE, SMVSettings.class, msgs );
+            msgs = basicSetParentSMVSettings( newParentSMVSettings, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMP_RATE__PARENT_SMV_SETTINGS, newParentSMVSettings, newParentSMVSettings));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMP_RATE__PARENT_SMV_SETTINGS,
+                    newParentSMVSettings, newParentSMVSettings ) );
     }
 
     /**
@@ -159,14 +164,14 @@ public class SmpRateImpl extends SclObjectImpl implements SmpRate {
      * @generated
      */
     @Override
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.SMP_RATE__PARENT_SMV_SETTINGS:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSMVSettings((SMVSettings)otherEnd, msgs);
+    public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.SMP_RATE__PARENT_SMV_SETTINGS:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSMVSettings( ( SMVSettings ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -175,12 +180,12 @@ public class SmpRateImpl extends SclObjectImpl implements SmpRate {
      * @generated
      */
     @Override
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.SMP_RATE__PARENT_SMV_SETTINGS:
-                return basicSetParentSMVSettings(null, msgs);
+    public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.SMP_RATE__PARENT_SMV_SETTINGS:
+            return basicSetParentSMVSettings( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -189,12 +194,13 @@ public class SmpRateImpl extends SclObjectImpl implements SmpRate {
      * @generated
      */
     @Override
-    public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SMP_RATE__PARENT_SMV_SETTINGS:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SMV_SETTINGS__SMP_RATE, SMVSettings.class, msgs);
+    public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SMP_RATE__PARENT_SMV_SETTINGS:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SMV_SETTINGS__SMP_RATE, SMVSettings.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -203,14 +209,14 @@ public class SmpRateImpl extends SclObjectImpl implements SmpRate {
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.SMP_RATE__VALUE:
-                return getValue();
-            case SclPackage.SMP_RATE__PARENT_SMV_SETTINGS:
-                return getParentSMVSettings();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.SMP_RATE__VALUE:
+            return getValue();
+        case SclPackage.SMP_RATE__PARENT_SMV_SETTINGS:
+            return getParentSMVSettings();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -219,16 +225,16 @@ public class SmpRateImpl extends SclObjectImpl implements SmpRate {
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.SMP_RATE__VALUE:
-                setValue((Integer)newValue);
-                return;
-            case SclPackage.SMP_RATE__PARENT_SMV_SETTINGS:
-                setParentSMVSettings((SMVSettings)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.SMP_RATE__VALUE:
+            setValue( ( Integer ) newValue );
+            return;
+        case SclPackage.SMP_RATE__PARENT_SMV_SETTINGS:
+            setParentSMVSettings( ( SMVSettings ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -237,16 +243,16 @@ public class SmpRateImpl extends SclObjectImpl implements SmpRate {
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.SMP_RATE__VALUE:
-                setValue(VALUE_EDEFAULT);
-                return;
-            case SclPackage.SMP_RATE__PARENT_SMV_SETTINGS:
-                setParentSMVSettings((SMVSettings)null);
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SMP_RATE__VALUE:
+            setValue( VALUE_EDEFAULT );
+            return;
+        case SclPackage.SMP_RATE__PARENT_SMV_SETTINGS:
+            setParentSMVSettings( ( SMVSettings ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -255,14 +261,14 @@ public class SmpRateImpl extends SclObjectImpl implements SmpRate {
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.SMP_RATE__VALUE:
-                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-            case SclPackage.SMP_RATE__PARENT_SMV_SETTINGS:
-                return getParentSMVSettings() != null;
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.SMP_RATE__VALUE:
+            return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals( value );
+        case SclPackage.SMP_RATE__PARENT_SMV_SETTINGS:
+            return getParentSMVSettings() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -272,12 +278,12 @@ public class SmpRateImpl extends SclObjectImpl implements SmpRate {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (value: ");
-        result.append(value);
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (value: " );
+        result.append( value );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SmvOptsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SmvOptsImpl.java
index 5b4d63e..69b71b1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SmvOptsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SmvOptsImpl.java
@@ -326,8 +326,9 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
         dataSet = newDataSet;
         boolean oldDataSetESet = dataSetESet;
         dataSetESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_OPTS__DATA_SET, oldDataSet, dataSet, !oldDataSetESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_OPTS__DATA_SET, oldDataSet, dataSet,
+                    !oldDataSetESet ) );
     }
 
     /**
@@ -341,8 +342,9 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
         boolean oldDataSetESet = dataSetESet;
         dataSet = DATA_SET_EDEFAULT;
         dataSetESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_OPTS__DATA_SET, oldDataSet, DATA_SET_EDEFAULT, oldDataSetESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_OPTS__DATA_SET, oldDataSet,
+                    DATA_SET_EDEFAULT, oldDataSetESet ) );
     }
 
     /**
@@ -376,8 +378,9 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
         refreshTime = newRefreshTime;
         boolean oldRefreshTimeESet = refreshTimeESet;
         refreshTimeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_OPTS__REFRESH_TIME, oldRefreshTime, refreshTime, !oldRefreshTimeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_OPTS__REFRESH_TIME, oldRefreshTime,
+                    refreshTime, !oldRefreshTimeESet ) );
     }
 
     /**
@@ -391,8 +394,9 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
         boolean oldRefreshTimeESet = refreshTimeESet;
         refreshTime = REFRESH_TIME_EDEFAULT;
         refreshTimeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_OPTS__REFRESH_TIME, oldRefreshTime, REFRESH_TIME_EDEFAULT, oldRefreshTimeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_OPTS__REFRESH_TIME, oldRefreshTime,
+                    REFRESH_TIME_EDEFAULT, oldRefreshTimeESet ) );
     }
 
     /**
@@ -426,8 +430,9 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
         sampleRate = newSampleRate;
         boolean oldSampleRateESet = sampleRateESet;
         sampleRateESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_OPTS__SAMPLE_RATE, oldSampleRate, sampleRate, !oldSampleRateESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_OPTS__SAMPLE_RATE, oldSampleRate,
+                    sampleRate, !oldSampleRateESet ) );
     }
 
     /**
@@ -441,8 +446,9 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
         boolean oldSampleRateESet = sampleRateESet;
         sampleRate = SAMPLE_RATE_EDEFAULT;
         sampleRateESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_OPTS__SAMPLE_RATE, oldSampleRate, SAMPLE_RATE_EDEFAULT, oldSampleRateESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_OPTS__SAMPLE_RATE, oldSampleRate,
+                    SAMPLE_RATE_EDEFAULT, oldSampleRateESet ) );
     }
 
     /**
@@ -476,8 +482,9 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
         sampleSynchronized = newSampleSynchronized;
         boolean oldSampleSynchronizedESet = sampleSynchronizedESet;
         sampleSynchronizedESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED, oldSampleSynchronized, sampleSynchronized, !oldSampleSynchronizedESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED,
+                    oldSampleSynchronized, sampleSynchronized, !oldSampleSynchronizedESet ) );
     }
 
     /**
@@ -491,8 +498,9 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
         boolean oldSampleSynchronizedESet = sampleSynchronizedESet;
         sampleSynchronized = SAMPLE_SYNCHRONIZED_EDEFAULT;
         sampleSynchronizedESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED, oldSampleSynchronized, SAMPLE_SYNCHRONIZED_EDEFAULT, oldSampleSynchronizedESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED,
+                    oldSampleSynchronized, SAMPLE_SYNCHRONIZED_EDEFAULT, oldSampleSynchronizedESet ) );
     }
 
     /**
@@ -526,8 +534,9 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
         security = newSecurity;
         boolean oldSecurityESet = securityESet;
         securityESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_OPTS__SECURITY, oldSecurity, security, !oldSecurityESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_OPTS__SECURITY, oldSecurity,
+                    security, !oldSecurityESet ) );
     }
 
     /**
@@ -541,8 +550,9 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
         boolean oldSecurityESet = securityESet;
         security = SECURITY_EDEFAULT;
         securityESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_OPTS__SECURITY, oldSecurity, SECURITY_EDEFAULT, oldSecurityESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_OPTS__SECURITY, oldSecurity,
+                    SECURITY_EDEFAULT, oldSecurityESet ) );
     }
 
     /**
@@ -576,8 +586,9 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
         timestamp = newTimestamp;
         boolean oldTimestampESet = timestampESet;
         timestampESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_OPTS__TIMESTAMP, oldTimestamp, timestamp, !oldTimestampESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_OPTS__TIMESTAMP, oldTimestamp,
+                    timestamp, !oldTimestampESet ) );
     }
 
     /**
@@ -591,8 +602,9 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
         boolean oldTimestampESet = timestampESet;
         timestamp = TIMESTAMP_EDEFAULT;
         timestampESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_OPTS__TIMESTAMP, oldTimestamp, TIMESTAMP_EDEFAULT, oldTimestampESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_OPTS__TIMESTAMP, oldTimestamp,
+                    TIMESTAMP_EDEFAULT, oldTimestampESet ) );
     }
 
     /**
@@ -621,13 +633,14 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      * @generated
      */
     @Override
-    public void setSynchSourceId(Boolean newSynchSourceId) {
+    public void setSynchSourceId( Boolean newSynchSourceId ) {
         Boolean oldSynchSourceId = synchSourceId;
         synchSourceId = newSynchSourceId;
         boolean oldSynchSourceIdESet = synchSourceIdESet;
         synchSourceIdESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_OPTS__SYNCH_SOURCE_ID, oldSynchSourceId, synchSourceId, !oldSynchSourceIdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_OPTS__SYNCH_SOURCE_ID,
+                    oldSynchSourceId, synchSourceId, !oldSynchSourceIdESet ) );
     }
 
     /**
@@ -641,8 +654,9 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
         boolean oldSynchSourceIdESet = synchSourceIdESet;
         synchSourceId = SYNCH_SOURCE_ID_EDEFAULT;
         synchSourceIdESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_OPTS__SYNCH_SOURCE_ID, oldSynchSourceId, SYNCH_SOURCE_ID_EDEFAULT, oldSynchSourceIdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_OPTS__SYNCH_SOURCE_ID,
+                    oldSynchSourceId, SYNCH_SOURCE_ID_EDEFAULT, oldSynchSourceIdESet ) );
     }
 
     /**
@@ -671,13 +685,14 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      * @generated
      */
     @Override
-    public void setDataRef(Boolean newDataRef) {
+    public void setDataRef( Boolean newDataRef ) {
         Boolean oldDataRef = dataRef;
         dataRef = newDataRef;
         boolean oldDataRefESet = dataRefESet;
         dataRefESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_OPTS__DATA_REF, oldDataRef, dataRef, !oldDataRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_OPTS__DATA_REF, oldDataRef, dataRef,
+                    !oldDataRefESet ) );
     }
 
     /**
@@ -691,8 +706,9 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
         boolean oldDataRefESet = dataRefESet;
         dataRef = DATA_REF_EDEFAULT;
         dataRefESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SMV_OPTS__DATA_REF, oldDataRef, DATA_REF_EDEFAULT, oldDataRefESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SMV_OPTS__DATA_REF, oldDataRef,
+                    DATA_REF_EDEFAULT, oldDataRefESet ) );
     }
 
     /**
@@ -712,8 +728,8 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      */
     @Override
     public SampledValueControl getParentSampledValueControl() {
-        if (eContainerFeatureID() != SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL) return null;
-        return (SampledValueControl)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL ) return null;
+        return ( SampledValueControl ) eInternalContainer();
     }
 
     /**
@@ -721,8 +737,10 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSampledValueControl(SampledValueControl newParentSampledValueControl, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSampledValueControl, SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL, msgs);
+    public NotificationChain basicSetParentSampledValueControl( SampledValueControl newParentSampledValueControl,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSampledValueControl,
+                SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL, msgs );
         return msgs;
     }
 
@@ -732,20 +750,24 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      * @generated
      */
     @Override
-    public void setParentSampledValueControl(SampledValueControl newParentSampledValueControl) {
-        if (newParentSampledValueControl != eInternalContainer() || (eContainerFeatureID() != SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL && newParentSampledValueControl != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSampledValueControl))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSampledValueControl( SampledValueControl newParentSampledValueControl ) {
+        if( newParentSampledValueControl != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL
+                        && newParentSampledValueControl != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSampledValueControl ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSampledValueControl != null)
-                msgs = ((InternalEObject)newParentSampledValueControl).eInverseAdd(this, SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS, SampledValueControl.class, msgs);
-            msgs = basicSetParentSampledValueControl(newParentSampledValueControl, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSampledValueControl != null )
+                msgs = ( ( InternalEObject ) newParentSampledValueControl ).eInverseAdd( this,
+                        SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS, SampledValueControl.class, msgs );
+            msgs = basicSetParentSampledValueControl( newParentSampledValueControl, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL, newParentSampledValueControl, newParentSampledValueControl));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL,
+                    newParentSampledValueControl, newParentSampledValueControl ) );
     }
 
     /**
@@ -755,13 +777,13 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSampledValueControl((SampledValueControl)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSampledValueControl( ( SampledValueControl ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -771,11 +793,11 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL:
-                return basicSetParentSampledValueControl(null, msgs);
+        switch( featureID ) {
+        case SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL:
+            return basicSetParentSampledValueControl( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -785,11 +807,12 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS, SampledValueControl.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SAMPLED_VALUE_CONTROL__SMV_OPTS,
+                    SampledValueControl.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -799,27 +822,27 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SMV_OPTS__DATA_SET:
-                return getDataSet();
-            case SclPackage.SMV_OPTS__REFRESH_TIME:
-                return getRefreshTime();
-            case SclPackage.SMV_OPTS__SAMPLE_RATE:
-                return getSampleRate();
-            case SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED:
-                return getSampleSynchronized();
-            case SclPackage.SMV_OPTS__SECURITY:
-                return getSecurity();
-            case SclPackage.SMV_OPTS__TIMESTAMP:
-                return getTimestamp();
-            case SclPackage.SMV_OPTS__SYNCH_SOURCE_ID:
-                return getSynchSourceId();
-            case SclPackage.SMV_OPTS__DATA_REF:
-                return getDataRef();
-            case SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL:
-                return getParentSampledValueControl();
+        switch( featureID ) {
+        case SclPackage.SMV_OPTS__DATA_SET:
+            return getDataSet();
+        case SclPackage.SMV_OPTS__REFRESH_TIME:
+            return getRefreshTime();
+        case SclPackage.SMV_OPTS__SAMPLE_RATE:
+            return getSampleRate();
+        case SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED:
+            return getSampleSynchronized();
+        case SclPackage.SMV_OPTS__SECURITY:
+            return getSecurity();
+        case SclPackage.SMV_OPTS__TIMESTAMP:
+            return getTimestamp();
+        case SclPackage.SMV_OPTS__SYNCH_SOURCE_ID:
+            return getSynchSourceId();
+        case SclPackage.SMV_OPTS__DATA_REF:
+            return getDataRef();
+        case SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL:
+            return getParentSampledValueControl();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -829,36 +852,36 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SMV_OPTS__DATA_SET:
-                setDataSet((Boolean)newValue);
-                return;
-            case SclPackage.SMV_OPTS__REFRESH_TIME:
-                setRefreshTime((Boolean)newValue);
-                return;
-            case SclPackage.SMV_OPTS__SAMPLE_RATE:
-                setSampleRate((Boolean)newValue);
-                return;
-            case SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED:
-                setSampleSynchronized((Boolean)newValue);
-                return;
-            case SclPackage.SMV_OPTS__SECURITY:
-                setSecurity((Boolean)newValue);
-                return;
-            case SclPackage.SMV_OPTS__TIMESTAMP:
-                setTimestamp((Boolean)newValue);
-                return;
-            case SclPackage.SMV_OPTS__SYNCH_SOURCE_ID:
-                setSynchSourceId((Boolean)newValue);
-                return;
-            case SclPackage.SMV_OPTS__DATA_REF:
-                setDataRef((Boolean)newValue);
-                return;
-            case SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL:
-                setParentSampledValueControl((SampledValueControl)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SMV_OPTS__DATA_SET:
+            setDataSet( ( Boolean ) newValue );
+            return;
+        case SclPackage.SMV_OPTS__REFRESH_TIME:
+            setRefreshTime( ( Boolean ) newValue );
+            return;
+        case SclPackage.SMV_OPTS__SAMPLE_RATE:
+            setSampleRate( ( Boolean ) newValue );
+            return;
+        case SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED:
+            setSampleSynchronized( ( Boolean ) newValue );
+            return;
+        case SclPackage.SMV_OPTS__SECURITY:
+            setSecurity( ( Boolean ) newValue );
+            return;
+        case SclPackage.SMV_OPTS__TIMESTAMP:
+            setTimestamp( ( Boolean ) newValue );
+            return;
+        case SclPackage.SMV_OPTS__SYNCH_SOURCE_ID:
+            setSynchSourceId( ( Boolean ) newValue );
+            return;
+        case SclPackage.SMV_OPTS__DATA_REF:
+            setDataRef( ( Boolean ) newValue );
+            return;
+        case SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL:
+            setParentSampledValueControl( ( SampledValueControl ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -868,36 +891,36 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SMV_OPTS__DATA_SET:
-                unsetDataSet();
-                return;
-            case SclPackage.SMV_OPTS__REFRESH_TIME:
-                unsetRefreshTime();
-                return;
-            case SclPackage.SMV_OPTS__SAMPLE_RATE:
-                unsetSampleRate();
-                return;
-            case SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED:
-                unsetSampleSynchronized();
-                return;
-            case SclPackage.SMV_OPTS__SECURITY:
-                unsetSecurity();
-                return;
-            case SclPackage.SMV_OPTS__TIMESTAMP:
-                unsetTimestamp();
-                return;
-            case SclPackage.SMV_OPTS__SYNCH_SOURCE_ID:
-                unsetSynchSourceId();
-                return;
-            case SclPackage.SMV_OPTS__DATA_REF:
-                unsetDataRef();
-                return;
-            case SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL:
-                setParentSampledValueControl((SampledValueControl)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.SMV_OPTS__DATA_SET:
+            unsetDataSet();
+            return;
+        case SclPackage.SMV_OPTS__REFRESH_TIME:
+            unsetRefreshTime();
+            return;
+        case SclPackage.SMV_OPTS__SAMPLE_RATE:
+            unsetSampleRate();
+            return;
+        case SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED:
+            unsetSampleSynchronized();
+            return;
+        case SclPackage.SMV_OPTS__SECURITY:
+            unsetSecurity();
+            return;
+        case SclPackage.SMV_OPTS__TIMESTAMP:
+            unsetTimestamp();
+            return;
+        case SclPackage.SMV_OPTS__SYNCH_SOURCE_ID:
+            unsetSynchSourceId();
+            return;
+        case SclPackage.SMV_OPTS__DATA_REF:
+            unsetDataRef();
+            return;
+        case SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL:
+            setParentSampledValueControl( ( SampledValueControl ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -907,27 +930,27 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SMV_OPTS__DATA_SET:
-                return isSetDataSet();
-            case SclPackage.SMV_OPTS__REFRESH_TIME:
-                return isSetRefreshTime();
-            case SclPackage.SMV_OPTS__SAMPLE_RATE:
-                return isSetSampleRate();
-            case SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED:
-                return isSetSampleSynchronized();
-            case SclPackage.SMV_OPTS__SECURITY:
-                return isSetSecurity();
-            case SclPackage.SMV_OPTS__TIMESTAMP:
-                return isSetTimestamp();
-            case SclPackage.SMV_OPTS__SYNCH_SOURCE_ID:
-                return isSetSynchSourceId();
-            case SclPackage.SMV_OPTS__DATA_REF:
-                return isSetDataRef();
-            case SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL:
-                return getParentSampledValueControl() != null;
+        switch( featureID ) {
+        case SclPackage.SMV_OPTS__DATA_SET:
+            return isSetDataSet();
+        case SclPackage.SMV_OPTS__REFRESH_TIME:
+            return isSetRefreshTime();
+        case SclPackage.SMV_OPTS__SAMPLE_RATE:
+            return isSetSampleRate();
+        case SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED:
+            return isSetSampleSynchronized();
+        case SclPackage.SMV_OPTS__SECURITY:
+            return isSetSecurity();
+        case SclPackage.SMV_OPTS__TIMESTAMP:
+            return isSetTimestamp();
+        case SclPackage.SMV_OPTS__SYNCH_SOURCE_ID:
+            return isSetSynchSourceId();
+        case SclPackage.SMV_OPTS__DATA_REF:
+            return isSetDataRef();
+        case SclPackage.SMV_OPTS__PARENT_SAMPLED_VALUE_CONTROL:
+            return getParentSampledValueControl() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -936,21 +959,30 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      * @generated
      */
     @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == AgSmvOpts.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.SMV_OPTS__DATA_SET: return SclPackage.AG_SMV_OPTS__DATA_SET;
-                case SclPackage.SMV_OPTS__REFRESH_TIME: return SclPackage.AG_SMV_OPTS__REFRESH_TIME;
-                case SclPackage.SMV_OPTS__SAMPLE_RATE: return SclPackage.AG_SMV_OPTS__SAMPLE_RATE;
-                case SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED: return SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED;
-                case SclPackage.SMV_OPTS__SECURITY: return SclPackage.AG_SMV_OPTS__SECURITY;
-                case SclPackage.SMV_OPTS__TIMESTAMP: return SclPackage.AG_SMV_OPTS__TIMESTAMP;
-                case SclPackage.SMV_OPTS__SYNCH_SOURCE_ID: return SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID;
-                case SclPackage.SMV_OPTS__DATA_REF: return SclPackage.AG_SMV_OPTS__DATA_REF;
-                default: return -1;
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgSmvOpts.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.SMV_OPTS__DATA_SET:
+                return SclPackage.AG_SMV_OPTS__DATA_SET;
+            case SclPackage.SMV_OPTS__REFRESH_TIME:
+                return SclPackage.AG_SMV_OPTS__REFRESH_TIME;
+            case SclPackage.SMV_OPTS__SAMPLE_RATE:
+                return SclPackage.AG_SMV_OPTS__SAMPLE_RATE;
+            case SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED:
+                return SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED;
+            case SclPackage.SMV_OPTS__SECURITY:
+                return SclPackage.AG_SMV_OPTS__SECURITY;
+            case SclPackage.SMV_OPTS__TIMESTAMP:
+                return SclPackage.AG_SMV_OPTS__TIMESTAMP;
+            case SclPackage.SMV_OPTS__SYNCH_SOURCE_ID:
+                return SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID;
+            case SclPackage.SMV_OPTS__DATA_REF:
+                return SclPackage.AG_SMV_OPTS__DATA_REF;
+            default:
+                return -1;
             }
         }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
     }
 
     /**
@@ -959,21 +991,30 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      * @generated
      */
     @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == AgSmvOpts.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_SMV_OPTS__DATA_SET: return SclPackage.SMV_OPTS__DATA_SET;
-                case SclPackage.AG_SMV_OPTS__REFRESH_TIME: return SclPackage.SMV_OPTS__REFRESH_TIME;
-                case SclPackage.AG_SMV_OPTS__SAMPLE_RATE: return SclPackage.SMV_OPTS__SAMPLE_RATE;
-                case SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED: return SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED;
-                case SclPackage.AG_SMV_OPTS__SECURITY: return SclPackage.SMV_OPTS__SECURITY;
-                case SclPackage.AG_SMV_OPTS__TIMESTAMP: return SclPackage.SMV_OPTS__TIMESTAMP;
-                case SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID: return SclPackage.SMV_OPTS__SYNCH_SOURCE_ID;
-                case SclPackage.AG_SMV_OPTS__DATA_REF: return SclPackage.SMV_OPTS__DATA_REF;
-                default: return -1;
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgSmvOpts.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_SMV_OPTS__DATA_SET:
+                return SclPackage.SMV_OPTS__DATA_SET;
+            case SclPackage.AG_SMV_OPTS__REFRESH_TIME:
+                return SclPackage.SMV_OPTS__REFRESH_TIME;
+            case SclPackage.AG_SMV_OPTS__SAMPLE_RATE:
+                return SclPackage.SMV_OPTS__SAMPLE_RATE;
+            case SclPackage.AG_SMV_OPTS__SAMPLE_SYNCHRONIZED:
+                return SclPackage.SMV_OPTS__SAMPLE_SYNCHRONIZED;
+            case SclPackage.AG_SMV_OPTS__SECURITY:
+                return SclPackage.SMV_OPTS__SECURITY;
+            case SclPackage.AG_SMV_OPTS__TIMESTAMP:
+                return SclPackage.SMV_OPTS__TIMESTAMP;
+            case SclPackage.AG_SMV_OPTS__SYNCH_SOURCE_ID:
+                return SclPackage.SMV_OPTS__SYNCH_SOURCE_ID;
+            case SclPackage.AG_SMV_OPTS__DATA_REF:
+                return SclPackage.SMV_OPTS__DATA_REF;
+            default:
+                return -1;
             }
         }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
     }
 
     /**
@@ -983,26 +1024,50 @@ public class SmvOptsImpl extends SclObjectImpl implements SmvOpts {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (dataSet: ");
-        if (dataSetESet) result.append(dataSet); else result.append("<unset>");
-        result.append(", refreshTime: ");
-        if (refreshTimeESet) result.append(refreshTime); else result.append("<unset>");
-        result.append(", sampleRate: ");
-        if (sampleRateESet) result.append(sampleRate); else result.append("<unset>");
-        result.append(", sampleSynchronized: ");
-        if (sampleSynchronizedESet) result.append(sampleSynchronized); else result.append("<unset>");
-        result.append(", security: ");
-        if (securityESet) result.append(security); else result.append("<unset>");
-        result.append(", timestamp: ");
-        if (timestampESet) result.append(timestamp); else result.append("<unset>");
-        result.append(", synchSourceId: ");
-        if (synchSourceIdESet) result.append(synchSourceId); else result.append("<unset>");
-        result.append(", dataRef: ");
-        if (dataRefESet) result.append(dataRef); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (dataSet: " );
+        if( dataSetESet )
+            result.append( dataSet );
+        else
+            result.append( "<unset>" );
+        result.append( ", refreshTime: " );
+        if( refreshTimeESet )
+            result.append( refreshTime );
+        else
+            result.append( "<unset>" );
+        result.append( ", sampleRate: " );
+        if( sampleRateESet )
+            result.append( sampleRate );
+        else
+            result.append( "<unset>" );
+        result.append( ", sampleSynchronized: " );
+        if( sampleSynchronizedESet )
+            result.append( sampleSynchronized );
+        else
+            result.append( "<unset>" );
+        result.append( ", security: " );
+        if( securityESet )
+            result.append( security );
+        else
+            result.append( "<unset>" );
+        result.append( ", timestamp: " );
+        if( timestampESet )
+            result.append( timestamp );
+        else
+            result.append( "<unset>" );
+        result.append( ", synchSourceId: " );
+        if( synchSourceIdESet )
+            result.append( synchSourceId );
+        else
+            result.append( "<unset>" );
+        result.append( ", dataRef: " );
+        if( dataRefESet )
+            result.append( dataRef );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubEquipmentImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubEquipmentImpl.java
index 1f8592d..29c80c3 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubEquipmentImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubEquipmentImpl.java
@@ -125,7 +125,7 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      * @generated
      * @ordered
      */
-    protected EList<EqFunction> eqFunction;
+    protected EList< EqFunction > eqFunction;
 
     /**
      * <!-- begin-user-doc -->
@@ -167,8 +167,9 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
         phase = newPhase == null ? PHASE_EDEFAULT : newPhase;
         boolean oldPhaseESet = phaseESet;
         phaseESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUB_EQUIPMENT__PHASE, oldPhase, phase, !oldPhaseESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUB_EQUIPMENT__PHASE, oldPhase, phase,
+                    !oldPhaseESet ) );
     }
 
     /**
@@ -182,8 +183,9 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
         boolean oldPhaseESet = phaseESet;
         phase = PHASE_EDEFAULT;
         phaseESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SUB_EQUIPMENT__PHASE, oldPhase, PHASE_EDEFAULT, oldPhaseESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SUB_EQUIPMENT__PHASE, oldPhase,
+                    PHASE_EDEFAULT, oldPhaseESet ) );
     }
 
     /**
@@ -203,8 +205,8 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      */
     @Override
     public AbstractConductingEquipment getParentAbstractConductingEquipment() {
-        if (eContainerFeatureID() != SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT) return null;
-        return (AbstractConductingEquipment)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT ) return null;
+        return ( AbstractConductingEquipment ) eInternalContainer();
     }
 
     /**
@@ -212,8 +214,10 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAbstractConductingEquipment(AbstractConductingEquipment newParentAbstractConductingEquipment, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAbstractConductingEquipment, SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT, msgs);
+    public NotificationChain basicSetParentAbstractConductingEquipment(
+            AbstractConductingEquipment newParentAbstractConductingEquipment, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAbstractConductingEquipment,
+                SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT, msgs );
         return msgs;
     }
 
@@ -223,20 +227,27 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      * @generated
      */
     @Override
-    public void setParentAbstractConductingEquipment(AbstractConductingEquipment newParentAbstractConductingEquipment) {
-        if (newParentAbstractConductingEquipment != eInternalContainer() || (eContainerFeatureID() != SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT && newParentAbstractConductingEquipment != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAbstractConductingEquipment))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAbstractConductingEquipment(
+            AbstractConductingEquipment newParentAbstractConductingEquipment ) {
+        if( newParentAbstractConductingEquipment != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT
+                        && newParentAbstractConductingEquipment != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAbstractConductingEquipment ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAbstractConductingEquipment != null)
-                msgs = ((InternalEObject)newParentAbstractConductingEquipment).eInverseAdd(this, SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT, AbstractConductingEquipment.class, msgs);
-            msgs = basicSetParentAbstractConductingEquipment(newParentAbstractConductingEquipment, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAbstractConductingEquipment != null )
+                msgs = ( ( InternalEObject ) newParentAbstractConductingEquipment ).eInverseAdd( this,
+                        SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT, AbstractConductingEquipment.class,
+                        msgs );
+            msgs = basicSetParentAbstractConductingEquipment( newParentAbstractConductingEquipment, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT, newParentAbstractConductingEquipment, newParentAbstractConductingEquipment));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT,
+                    newParentAbstractConductingEquipment, newParentAbstractConductingEquipment ) );
     }
 
     /**
@@ -260,8 +271,9 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
         virtual = newVirtual;
         boolean oldVirtualESet = virtualESet;
         virtualESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUB_EQUIPMENT__VIRTUAL, oldVirtual, virtual, !oldVirtualESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUB_EQUIPMENT__VIRTUAL, oldVirtual,
+                    virtual, !oldVirtualESet ) );
     }
 
     /**
@@ -275,8 +287,9 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
         boolean oldVirtualESet = virtualESet;
         virtual = VIRTUAL_EDEFAULT;
         virtualESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SUB_EQUIPMENT__VIRTUAL, oldVirtual, VIRTUAL_EDEFAULT, oldVirtualESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SUB_EQUIPMENT__VIRTUAL, oldVirtual,
+                    VIRTUAL_EDEFAULT, oldVirtualESet ) );
     }
 
     /**
@@ -295,9 +308,10 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      * @generated
      */
     @Override
-    public EList<EqFunction> getEqFunction() {
-        if (eqFunction == null) {
-            eqFunction = new EObjectContainmentWithInverseEList.Unsettable<EqFunction>(EqFunction.class, this, SclPackage.SUB_EQUIPMENT__EQ_FUNCTION, SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT);
+    public EList< EqFunction > getEqFunction() {
+        if( eqFunction == null ) {
+            eqFunction = new EObjectContainmentWithInverseEList.Unsettable< EqFunction >( EqFunction.class, this,
+                    SclPackage.SUB_EQUIPMENT__EQ_FUNCTION, SclPackage.EQ_FUNCTION__PARENT_SUB_EQUIPMENT );
         }
         return eqFunction;
     }
@@ -309,7 +323,7 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      */
     @Override
     public void unsetEqFunction() {
-        if (eqFunction != null) ((InternalEList.Unsettable<?>)eqFunction).unset();
+        if( eqFunction != null ) ( ( InternalEList.Unsettable< ? > ) eqFunction ).unset();
     }
 
     /**
@@ -319,7 +333,7 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      */
     @Override
     public boolean isSetEqFunction() {
-        return eqFunction != null && ((InternalEList.Unsettable<?>)eqFunction).isSet();
+        return eqFunction != null && ( ( InternalEList.Unsettable< ? > ) eqFunction ).isSet();
     }
 
     /**
@@ -329,8 +343,8 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      */
     @Override
     public PowerTransformer getParentPowerTransformer() {
-        if (eContainerFeatureID() != SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER) return null;
-        return (PowerTransformer)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER ) return null;
+        return ( PowerTransformer ) eInternalContainer();
     }
 
     /**
@@ -338,8 +352,10 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentPowerTransformer(PowerTransformer newParentPowerTransformer, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentPowerTransformer, SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER, msgs);
+    public NotificationChain basicSetParentPowerTransformer( PowerTransformer newParentPowerTransformer,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentPowerTransformer,
+                SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER, msgs );
         return msgs;
     }
 
@@ -349,20 +365,24 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      * @generated
      */
     @Override
-    public void setParentPowerTransformer(PowerTransformer newParentPowerTransformer) {
-        if (newParentPowerTransformer != eInternalContainer() || (eContainerFeatureID() != SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER && newParentPowerTransformer != null)) {
-            if (EcoreUtil.isAncestor(this, newParentPowerTransformer))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentPowerTransformer( PowerTransformer newParentPowerTransformer ) {
+        if( newParentPowerTransformer != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER
+                        && newParentPowerTransformer != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentPowerTransformer ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentPowerTransformer != null)
-                msgs = ((InternalEObject)newParentPowerTransformer).eInverseAdd(this, SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT, PowerTransformer.class, msgs);
-            msgs = basicSetParentPowerTransformer(newParentPowerTransformer, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentPowerTransformer != null )
+                msgs = ( ( InternalEObject ) newParentPowerTransformer ).eInverseAdd( this,
+                        SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT, PowerTransformer.class, msgs );
+            msgs = basicSetParentPowerTransformer( newParentPowerTransformer, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER, newParentPowerTransformer, newParentPowerTransformer));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER,
+                    newParentPowerTransformer, newParentPowerTransformer ) );
     }
 
     /**
@@ -372,8 +392,8 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      */
     @Override
     public TapChanger getParentTapChanger() {
-        if (eContainerFeatureID() != SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER) return null;
-        return (TapChanger)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER ) return null;
+        return ( TapChanger ) eInternalContainer();
     }
 
     /**
@@ -381,8 +401,9 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentTapChanger(TapChanger newParentTapChanger, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentTapChanger, SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER, msgs);
+    public NotificationChain basicSetParentTapChanger( TapChanger newParentTapChanger, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentTapChanger,
+                SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER, msgs );
         return msgs;
     }
 
@@ -392,20 +413,24 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      * @generated
      */
     @Override
-    public void setParentTapChanger(TapChanger newParentTapChanger) {
-        if (newParentTapChanger != eInternalContainer() || (eContainerFeatureID() != SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER && newParentTapChanger != null)) {
-            if (EcoreUtil.isAncestor(this, newParentTapChanger))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentTapChanger( TapChanger newParentTapChanger ) {
+        if( newParentTapChanger != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER
+                        && newParentTapChanger != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentTapChanger ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentTapChanger != null)
-                msgs = ((InternalEObject)newParentTapChanger).eInverseAdd(this, SclPackage.TAP_CHANGER__SUB_EQUIPMENT, TapChanger.class, msgs);
-            msgs = basicSetParentTapChanger(newParentTapChanger, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentTapChanger != null )
+                msgs = ( ( InternalEObject ) newParentTapChanger ).eInverseAdd( this,
+                        SclPackage.TAP_CHANGER__SUB_EQUIPMENT, TapChanger.class, msgs );
+            msgs = basicSetParentTapChanger( newParentTapChanger, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER, newParentTapChanger, newParentTapChanger));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER,
+                    newParentTapChanger, newParentTapChanger ) );
     }
 
     /**
@@ -416,23 +441,24 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAbstractConductingEquipment((AbstractConductingEquipment)otherEnd, msgs);
-            case SclPackage.SUB_EQUIPMENT__EQ_FUNCTION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getEqFunction()).basicAdd(otherEnd, msgs);
-            case SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentPowerTransformer((PowerTransformer)otherEnd, msgs);
-            case SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentTapChanger((TapChanger)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAbstractConductingEquipment( ( AbstractConductingEquipment ) otherEnd, msgs );
+        case SclPackage.SUB_EQUIPMENT__EQ_FUNCTION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getEqFunction() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentPowerTransformer( ( PowerTransformer ) otherEnd, msgs );
+        case SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentTapChanger( ( TapChanger ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -442,17 +468,17 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
-                return basicSetParentAbstractConductingEquipment(null, msgs);
-            case SclPackage.SUB_EQUIPMENT__EQ_FUNCTION:
-                return ((InternalEList<?>)getEqFunction()).basicRemove(otherEnd, msgs);
-            case SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER:
-                return basicSetParentPowerTransformer(null, msgs);
-            case SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER:
-                return basicSetParentTapChanger(null, msgs);
+        switch( featureID ) {
+        case SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
+            return basicSetParentAbstractConductingEquipment( null, msgs );
+        case SclPackage.SUB_EQUIPMENT__EQ_FUNCTION:
+            return ( ( InternalEList< ? > ) getEqFunction() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER:
+            return basicSetParentPowerTransformer( null, msgs );
+        case SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER:
+            return basicSetParentTapChanger( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -462,15 +488,18 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT, AbstractConductingEquipment.class, msgs);
-            case SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT, PowerTransformer.class, msgs);
-            case SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.TAP_CHANGER__SUB_EQUIPMENT, TapChanger.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__SUB_EQUIPMENT,
+                    AbstractConductingEquipment.class, msgs );
+        case SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.POWER_TRANSFORMER__SUB_EQUIPMENT,
+                    PowerTransformer.class, msgs );
+        case SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.TAP_CHANGER__SUB_EQUIPMENT, TapChanger.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -480,21 +509,21 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SUB_EQUIPMENT__VIRTUAL:
-                return getVirtual();
-            case SclPackage.SUB_EQUIPMENT__PHASE:
-                return getPhase();
-            case SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
-                return getParentAbstractConductingEquipment();
-            case SclPackage.SUB_EQUIPMENT__EQ_FUNCTION:
-                return getEqFunction();
-            case SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER:
-                return getParentPowerTransformer();
-            case SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER:
-                return getParentTapChanger();
+        switch( featureID ) {
+        case SclPackage.SUB_EQUIPMENT__VIRTUAL:
+            return getVirtual();
+        case SclPackage.SUB_EQUIPMENT__PHASE:
+            return getPhase();
+        case SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
+            return getParentAbstractConductingEquipment();
+        case SclPackage.SUB_EQUIPMENT__EQ_FUNCTION:
+            return getEqFunction();
+        case SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER:
+            return getParentPowerTransformer();
+        case SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER:
+            return getParentTapChanger();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -505,28 +534,28 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SUB_EQUIPMENT__VIRTUAL:
-                setVirtual((Boolean)newValue);
-                return;
-            case SclPackage.SUB_EQUIPMENT__PHASE:
-                setPhase((PhaseEnum)newValue);
-                return;
-            case SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
-                setParentAbstractConductingEquipment((AbstractConductingEquipment)newValue);
-                return;
-            case SclPackage.SUB_EQUIPMENT__EQ_FUNCTION:
-                getEqFunction().clear();
-                getEqFunction().addAll((Collection<? extends EqFunction>)newValue);
-                return;
-            case SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER:
-                setParentPowerTransformer((PowerTransformer)newValue);
-                return;
-            case SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER:
-                setParentTapChanger((TapChanger)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SUB_EQUIPMENT__VIRTUAL:
+            setVirtual( ( Boolean ) newValue );
+            return;
+        case SclPackage.SUB_EQUIPMENT__PHASE:
+            setPhase( ( PhaseEnum ) newValue );
+            return;
+        case SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
+            setParentAbstractConductingEquipment( ( AbstractConductingEquipment ) newValue );
+            return;
+        case SclPackage.SUB_EQUIPMENT__EQ_FUNCTION:
+            getEqFunction().clear();
+            getEqFunction().addAll( ( Collection< ? extends EqFunction > ) newValue );
+            return;
+        case SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER:
+            setParentPowerTransformer( ( PowerTransformer ) newValue );
+            return;
+        case SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER:
+            setParentTapChanger( ( TapChanger ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -536,27 +565,27 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SUB_EQUIPMENT__VIRTUAL:
-                unsetVirtual();
-                return;
-            case SclPackage.SUB_EQUIPMENT__PHASE:
-                unsetPhase();
-                return;
-            case SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
-                setParentAbstractConductingEquipment((AbstractConductingEquipment)null);
-                return;
-            case SclPackage.SUB_EQUIPMENT__EQ_FUNCTION:
-                unsetEqFunction();
-                return;
-            case SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER:
-                setParentPowerTransformer((PowerTransformer)null);
-                return;
-            case SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER:
-                setParentTapChanger((TapChanger)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.SUB_EQUIPMENT__VIRTUAL:
+            unsetVirtual();
+            return;
+        case SclPackage.SUB_EQUIPMENT__PHASE:
+            unsetPhase();
+            return;
+        case SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
+            setParentAbstractConductingEquipment( ( AbstractConductingEquipment ) null );
+            return;
+        case SclPackage.SUB_EQUIPMENT__EQ_FUNCTION:
+            unsetEqFunction();
+            return;
+        case SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER:
+            setParentPowerTransformer( ( PowerTransformer ) null );
+            return;
+        case SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER:
+            setParentTapChanger( ( TapChanger ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -566,21 +595,21 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SUB_EQUIPMENT__VIRTUAL:
-                return isSetVirtual();
-            case SclPackage.SUB_EQUIPMENT__PHASE:
-                return isSetPhase();
-            case SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
-                return getParentAbstractConductingEquipment() != null;
-            case SclPackage.SUB_EQUIPMENT__EQ_FUNCTION:
-                return isSetEqFunction();
-            case SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER:
-                return getParentPowerTransformer() != null;
-            case SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER:
-                return getParentTapChanger() != null;
+        switch( featureID ) {
+        case SclPackage.SUB_EQUIPMENT__VIRTUAL:
+            return isSetVirtual();
+        case SclPackage.SUB_EQUIPMENT__PHASE:
+            return isSetPhase();
+        case SclPackage.SUB_EQUIPMENT__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
+            return getParentAbstractConductingEquipment() != null;
+        case SclPackage.SUB_EQUIPMENT__EQ_FUNCTION:
+            return isSetEqFunction();
+        case SclPackage.SUB_EQUIPMENT__PARENT_POWER_TRANSFORMER:
+            return getParentPowerTransformer() != null;
+        case SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER:
+            return getParentTapChanger() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -589,14 +618,16 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      * @generated
      */
     @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == AgVirtual.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.SUB_EQUIPMENT__VIRTUAL: return SclPackage.AG_VIRTUAL__VIRTUAL;
-                default: return -1;
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgVirtual.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.SUB_EQUIPMENT__VIRTUAL:
+                return SclPackage.AG_VIRTUAL__VIRTUAL;
+            default:
+                return -1;
             }
         }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
     }
 
     /**
@@ -605,14 +636,16 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      * @generated
      */
     @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == AgVirtual.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_VIRTUAL__VIRTUAL: return SclPackage.SUB_EQUIPMENT__VIRTUAL;
-                default: return -1;
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgVirtual.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_VIRTUAL__VIRTUAL:
+                return SclPackage.SUB_EQUIPMENT__VIRTUAL;
+            default:
+                return -1;
             }
         }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
     }
 
     /**
@@ -622,14 +655,20 @@ public class SubEquipmentImpl extends PowerSystemResourceImpl implements SubEqui
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (virtual: ");
-        if (virtualESet) result.append(virtual); else result.append("<unset>");
-        result.append(", phase: ");
-        if (phaseESet) result.append(phase); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (virtual: " );
+        if( virtualESet )
+            result.append( virtual );
+        else
+            result.append( "<unset>" );
+        result.append( ", phase: " );
+        if( phaseESet )
+            result.append( phase );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubFunctionImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubFunctionImpl.java
index a92be90..aeba235 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubFunctionImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubFunctionImpl.java
@@ -93,7 +93,7 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      * @generated
      * @ordered
      */
-    protected EList<ConductingEquipment> conductingEquipment;
+    protected EList< ConductingEquipment > conductingEquipment;
 
     /**
      * The cached value of the '{@link #getGeneralEquipment() <em>General Equipment</em>}' containment reference list.
@@ -103,7 +103,7 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      * @generated
      * @ordered
      */
-    protected EList<GeneralEquipment> generalEquipment;
+    protected EList< GeneralEquipment > generalEquipment;
 
     /**
      * The cached value of the '{@link #getSubSubFunctions() <em>Sub Sub Functions</em>}' containment reference list.
@@ -113,7 +113,7 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      * @generated
      * @ordered
      */
-    protected EList<SubFunction> subSubFunctions;
+    protected EList< SubFunction > subSubFunctions;
 
     /**
      * <!-- begin-user-doc -->
@@ -155,8 +155,9 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUB_FUNCTION__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUB_FUNCTION__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -170,8 +171,9 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SUB_FUNCTION__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SUB_FUNCTION__TYPE, oldType,
+                    TYPE_EDEFAULT, oldTypeESet ) );
     }
 
     /**
@@ -190,9 +192,11 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      * @generated
      */
     @Override
-    public EList<ConductingEquipment> getConductingEquipment() {
-        if (conductingEquipment == null) {
-            conductingEquipment = new EObjectContainmentWithInverseEList.Unsettable<ConductingEquipment>(ConductingEquipment.class, this, SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT, SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION);
+    public EList< ConductingEquipment > getConductingEquipment() {
+        if( conductingEquipment == null ) {
+            conductingEquipment = new EObjectContainmentWithInverseEList.Unsettable< ConductingEquipment >(
+                    ConductingEquipment.class, this, SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT,
+                    SclPackage.CONDUCTING_EQUIPMENT__PARENT_SUB_FUNCTION );
         }
         return conductingEquipment;
     }
@@ -204,7 +208,7 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      */
     @Override
     public void unsetConductingEquipment() {
-        if (conductingEquipment != null) ((InternalEList.Unsettable<?>)conductingEquipment).unset();
+        if( conductingEquipment != null ) ( ( InternalEList.Unsettable< ? > ) conductingEquipment ).unset();
     }
 
     /**
@@ -214,7 +218,7 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      */
     @Override
     public boolean isSetConductingEquipment() {
-        return conductingEquipment != null && ((InternalEList.Unsettable<?>)conductingEquipment).isSet();
+        return conductingEquipment != null && ( ( InternalEList.Unsettable< ? > ) conductingEquipment ).isSet();
     }
 
     /**
@@ -224,8 +228,8 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      */
     @Override
     public Function getParentFunction() {
-        if (eContainerFeatureID() != SclPackage.SUB_FUNCTION__PARENT_FUNCTION) return null;
-        return (Function)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SUB_FUNCTION__PARENT_FUNCTION ) return null;
+        return ( Function ) eInternalContainer();
     }
 
     /**
@@ -233,8 +237,9 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentFunction(Function newParentFunction, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentFunction, SclPackage.SUB_FUNCTION__PARENT_FUNCTION, msgs);
+    public NotificationChain basicSetParentFunction( Function newParentFunction, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentFunction, SclPackage.SUB_FUNCTION__PARENT_FUNCTION,
+                msgs );
         return msgs;
     }
 
@@ -244,20 +249,24 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      * @generated
      */
     @Override
-    public void setParentFunction(Function newParentFunction) {
-        if (newParentFunction != eInternalContainer() || (eContainerFeatureID() != SclPackage.SUB_FUNCTION__PARENT_FUNCTION && newParentFunction != null)) {
-            if (EcoreUtil.isAncestor(this, newParentFunction))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentFunction( Function newParentFunction ) {
+        if( newParentFunction != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SUB_FUNCTION__PARENT_FUNCTION
+                        && newParentFunction != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentFunction ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentFunction != null)
-                msgs = ((InternalEObject)newParentFunction).eInverseAdd(this, SclPackage.FUNCTION__SUB_FUNCTION, Function.class, msgs);
-            msgs = basicSetParentFunction(newParentFunction, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentFunction != null )
+                msgs = ( ( InternalEObject ) newParentFunction ).eInverseAdd( this, SclPackage.FUNCTION__SUB_FUNCTION,
+                        Function.class, msgs );
+            msgs = basicSetParentFunction( newParentFunction, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUB_FUNCTION__PARENT_FUNCTION, newParentFunction, newParentFunction));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUB_FUNCTION__PARENT_FUNCTION,
+                    newParentFunction, newParentFunction ) );
     }
 
     /**
@@ -266,9 +275,11 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      * @generated
      */
     @Override
-    public EList<GeneralEquipment> getGeneralEquipment() {
-        if (generalEquipment == null) {
-            generalEquipment = new EObjectContainmentWithInverseEList.Unsettable<GeneralEquipment>(GeneralEquipment.class, this, SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT, SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION);
+    public EList< GeneralEquipment > getGeneralEquipment() {
+        if( generalEquipment == null ) {
+            generalEquipment = new EObjectContainmentWithInverseEList.Unsettable< GeneralEquipment >(
+                    GeneralEquipment.class, this, SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT,
+                    SclPackage.GENERAL_EQUIPMENT__PARENT_SUB_FUNCTION );
         }
         return generalEquipment;
     }
@@ -280,7 +291,7 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      */
     @Override
     public void unsetGeneralEquipment() {
-        if (generalEquipment != null) ((InternalEList.Unsettable<?>)generalEquipment).unset();
+        if( generalEquipment != null ) ( ( InternalEList.Unsettable< ? > ) generalEquipment ).unset();
     }
 
     /**
@@ -290,7 +301,7 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      */
     @Override
     public boolean isSetGeneralEquipment() {
-        return generalEquipment != null && ((InternalEList.Unsettable<?>)generalEquipment).isSet();
+        return generalEquipment != null && ( ( InternalEList.Unsettable< ? > ) generalEquipment ).isSet();
     }
 
     /**
@@ -299,9 +310,10 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      * @generated
      */
     @Override
-    public EList<SubFunction> getSubSubFunctions() {
-        if (subSubFunctions == null) {
-            subSubFunctions = new EObjectContainmentWithInverseEList.Unsettable<SubFunction>(SubFunction.class, this, SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS, SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION);
+    public EList< SubFunction > getSubSubFunctions() {
+        if( subSubFunctions == null ) {
+            subSubFunctions = new EObjectContainmentWithInverseEList.Unsettable< SubFunction >( SubFunction.class, this,
+                    SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS, SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION );
         }
         return subSubFunctions;
     }
@@ -313,7 +325,7 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      */
     @Override
     public void unsetSubSubFunctions() {
-        if (subSubFunctions != null) ((InternalEList.Unsettable<?>)subSubFunctions).unset();
+        if( subSubFunctions != null ) ( ( InternalEList.Unsettable< ? > ) subSubFunctions ).unset();
     }
 
     /**
@@ -323,7 +335,7 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      */
     @Override
     public boolean isSetSubSubFunctions() {
-        return subSubFunctions != null && ((InternalEList.Unsettable<?>)subSubFunctions).isSet();
+        return subSubFunctions != null && ( ( InternalEList.Unsettable< ? > ) subSubFunctions ).isSet();
     }
 
     /**
@@ -333,8 +345,8 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      */
     @Override
     public SubFunction getParentSubFunction() {
-        if (eContainerFeatureID() != SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION) return null;
-        return (SubFunction)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION ) return null;
+        return ( SubFunction ) eInternalContainer();
     }
 
     /**
@@ -342,8 +354,9 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSubFunction(SubFunction newParentSubFunction, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSubFunction, SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION, msgs);
+    public NotificationChain basicSetParentSubFunction( SubFunction newParentSubFunction, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSubFunction,
+                SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION, msgs );
         return msgs;
     }
 
@@ -353,20 +366,24 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      * @generated
      */
     @Override
-    public void setParentSubFunction(SubFunction newParentSubFunction) {
-        if (newParentSubFunction != eInternalContainer() || (eContainerFeatureID() != SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION && newParentSubFunction != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSubFunction))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSubFunction( SubFunction newParentSubFunction ) {
+        if( newParentSubFunction != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION
+                        && newParentSubFunction != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSubFunction ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSubFunction != null)
-                msgs = ((InternalEObject)newParentSubFunction).eInverseAdd(this, SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS, SubFunction.class, msgs);
-            msgs = basicSetParentSubFunction(newParentSubFunction, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSubFunction != null )
+                msgs = ( ( InternalEObject ) newParentSubFunction ).eInverseAdd( this,
+                        SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS, SubFunction.class, msgs );
+            msgs = basicSetParentSubFunction( newParentSubFunction, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION, newParentSubFunction, newParentSubFunction));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION,
+                    newParentSubFunction, newParentSubFunction ) );
     }
 
     /**
@@ -377,23 +394,26 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getConductingEquipment()).basicAdd(otherEnd, msgs);
-            case SclPackage.SUB_FUNCTION__PARENT_FUNCTION:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentFunction((Function)otherEnd, msgs);
-            case SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getGeneralEquipment()).basicAdd(otherEnd, msgs);
-            case SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSubSubFunctions()).basicAdd(otherEnd, msgs);
-            case SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSubFunction((SubFunction)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getConductingEquipment() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.SUB_FUNCTION__PARENT_FUNCTION:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentFunction( ( Function ) otherEnd, msgs );
+        case SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getGeneralEquipment() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSubSubFunctions() )
+                    .basicAdd( otherEnd, msgs );
+        case SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSubFunction( ( SubFunction ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -403,19 +423,19 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT:
-                return ((InternalEList<?>)getConductingEquipment()).basicRemove(otherEnd, msgs);
-            case SclPackage.SUB_FUNCTION__PARENT_FUNCTION:
-                return basicSetParentFunction(null, msgs);
-            case SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT:
-                return ((InternalEList<?>)getGeneralEquipment()).basicRemove(otherEnd, msgs);
-            case SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS:
-                return ((InternalEList<?>)getSubSubFunctions()).basicRemove(otherEnd, msgs);
-            case SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION:
-                return basicSetParentSubFunction(null, msgs);
+        switch( featureID ) {
+        case SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT:
+            return ( ( InternalEList< ? > ) getConductingEquipment() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SUB_FUNCTION__PARENT_FUNCTION:
+            return basicSetParentFunction( null, msgs );
+        case SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT:
+            return ( ( InternalEList< ? > ) getGeneralEquipment() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS:
+            return ( ( InternalEList< ? > ) getSubSubFunctions() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION:
+            return basicSetParentSubFunction( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -425,13 +445,14 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SUB_FUNCTION__PARENT_FUNCTION:
-                return eInternalContainer().eInverseRemove(this, SclPackage.FUNCTION__SUB_FUNCTION, Function.class, msgs);
-            case SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS, SubFunction.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SUB_FUNCTION__PARENT_FUNCTION:
+            return eInternalContainer().eInverseRemove( this, SclPackage.FUNCTION__SUB_FUNCTION, Function.class, msgs );
+        case SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS,
+                    SubFunction.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -441,21 +462,21 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SUB_FUNCTION__TYPE:
-                return getType();
-            case SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT:
-                return getConductingEquipment();
-            case SclPackage.SUB_FUNCTION__PARENT_FUNCTION:
-                return getParentFunction();
-            case SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT:
-                return getGeneralEquipment();
-            case SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS:
-                return getSubSubFunctions();
-            case SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION:
-                return getParentSubFunction();
+        switch( featureID ) {
+        case SclPackage.SUB_FUNCTION__TYPE:
+            return getType();
+        case SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT:
+            return getConductingEquipment();
+        case SclPackage.SUB_FUNCTION__PARENT_FUNCTION:
+            return getParentFunction();
+        case SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT:
+            return getGeneralEquipment();
+        case SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS:
+            return getSubSubFunctions();
+        case SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION:
+            return getParentSubFunction();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -466,30 +487,30 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SUB_FUNCTION__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT:
-                getConductingEquipment().clear();
-                getConductingEquipment().addAll((Collection<? extends ConductingEquipment>)newValue);
-                return;
-            case SclPackage.SUB_FUNCTION__PARENT_FUNCTION:
-                setParentFunction((Function)newValue);
-                return;
-            case SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT:
-                getGeneralEquipment().clear();
-                getGeneralEquipment().addAll((Collection<? extends GeneralEquipment>)newValue);
-                return;
-            case SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS:
-                getSubSubFunctions().clear();
-                getSubSubFunctions().addAll((Collection<? extends SubFunction>)newValue);
-                return;
-            case SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION:
-                setParentSubFunction((SubFunction)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SUB_FUNCTION__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT:
+            getConductingEquipment().clear();
+            getConductingEquipment().addAll( ( Collection< ? extends ConductingEquipment > ) newValue );
+            return;
+        case SclPackage.SUB_FUNCTION__PARENT_FUNCTION:
+            setParentFunction( ( Function ) newValue );
+            return;
+        case SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT:
+            getGeneralEquipment().clear();
+            getGeneralEquipment().addAll( ( Collection< ? extends GeneralEquipment > ) newValue );
+            return;
+        case SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS:
+            getSubSubFunctions().clear();
+            getSubSubFunctions().addAll( ( Collection< ? extends SubFunction > ) newValue );
+            return;
+        case SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION:
+            setParentSubFunction( ( SubFunction ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -499,27 +520,27 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SUB_FUNCTION__TYPE:
-                unsetType();
-                return;
-            case SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT:
-                unsetConductingEquipment();
-                return;
-            case SclPackage.SUB_FUNCTION__PARENT_FUNCTION:
-                setParentFunction((Function)null);
-                return;
-            case SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT:
-                unsetGeneralEquipment();
-                return;
-            case SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS:
-                unsetSubSubFunctions();
-                return;
-            case SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION:
-                setParentSubFunction((SubFunction)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.SUB_FUNCTION__TYPE:
+            unsetType();
+            return;
+        case SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT:
+            unsetConductingEquipment();
+            return;
+        case SclPackage.SUB_FUNCTION__PARENT_FUNCTION:
+            setParentFunction( ( Function ) null );
+            return;
+        case SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT:
+            unsetGeneralEquipment();
+            return;
+        case SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS:
+            unsetSubSubFunctions();
+            return;
+        case SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION:
+            setParentSubFunction( ( SubFunction ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -529,21 +550,21 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SUB_FUNCTION__TYPE:
-                return isSetType();
-            case SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT:
-                return isSetConductingEquipment();
-            case SclPackage.SUB_FUNCTION__PARENT_FUNCTION:
-                return getParentFunction() != null;
-            case SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT:
-                return isSetGeneralEquipment();
-            case SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS:
-                return isSetSubSubFunctions();
-            case SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION:
-                return getParentSubFunction() != null;
+        switch( featureID ) {
+        case SclPackage.SUB_FUNCTION__TYPE:
+            return isSetType();
+        case SclPackage.SUB_FUNCTION__CONDUCTING_EQUIPMENT:
+            return isSetConductingEquipment();
+        case SclPackage.SUB_FUNCTION__PARENT_FUNCTION:
+            return getParentFunction() != null;
+        case SclPackage.SUB_FUNCTION__GENERAL_EQUIPMENT:
+            return isSetGeneralEquipment();
+        case SclPackage.SUB_FUNCTION__SUB_SUB_FUNCTIONS:
+            return isSetSubSubFunctions();
+        case SclPackage.SUB_FUNCTION__PARENT_SUB_FUNCTION:
+            return getParentSubFunction() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -553,12 +574,15 @@ public class SubFunctionImpl extends PowerSystemResourceImpl implements SubFunct
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubNetworkImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubNetworkImpl.java
index 598bd26..06b3c5f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubNetworkImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubNetworkImpl.java
@@ -110,7 +110,7 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      * @generated
      * @ordered
      */
-    protected EList<ConnectedAP> connectedAP;
+    protected EList< ConnectedAP > connectedAP;
 
     /**
      * <!-- begin-user-doc -->
@@ -152,8 +152,9 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUB_NETWORK__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUB_NETWORK__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -167,8 +168,9 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SUB_NETWORK__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SUB_NETWORK__TYPE, oldType,
+                    TYPE_EDEFAULT, oldTypeESet ) );
     }
 
     /**
@@ -196,14 +198,18 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetBitRate(BitRate newBitRate, NotificationChain msgs) {
+    public NotificationChain basicSetBitRate( BitRate newBitRate, NotificationChain msgs ) {
         BitRate oldBitRate = bitRate;
         bitRate = newBitRate;
         boolean oldBitRateESet = bitRateESet;
         bitRateESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.SUB_NETWORK__BIT_RATE, oldBitRate, newBitRate, !oldBitRateESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.SUB_NETWORK__BIT_RATE, oldBitRate, newBitRate, !oldBitRateESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -214,21 +220,24 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      * @generated
      */
     @Override
-    public void setBitRate(BitRate newBitRate) {
-        if (newBitRate != bitRate) {
+    public void setBitRate( BitRate newBitRate ) {
+        if( newBitRate != bitRate ) {
             NotificationChain msgs = null;
-            if (bitRate != null)
-                msgs = ((InternalEObject)bitRate).eInverseRemove(this, SclPackage.BIT_RATE__PARENT_SUB_NETWORK, BitRate.class, msgs);
-            if (newBitRate != null)
-                msgs = ((InternalEObject)newBitRate).eInverseAdd(this, SclPackage.BIT_RATE__PARENT_SUB_NETWORK, BitRate.class, msgs);
-            msgs = basicSetBitRate(newBitRate, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( bitRate != null )
+                msgs = ( ( InternalEObject ) bitRate ).eInverseRemove( this, SclPackage.BIT_RATE__PARENT_SUB_NETWORK,
+                        BitRate.class, msgs );
+            if( newBitRate != null )
+                msgs = ( ( InternalEObject ) newBitRate ).eInverseAdd( this, SclPackage.BIT_RATE__PARENT_SUB_NETWORK,
+                        BitRate.class, msgs );
+            msgs = basicSetBitRate( newBitRate, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldBitRateESet = bitRateESet;
             bitRateESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUB_NETWORK__BIT_RATE, newBitRate, newBitRate, !oldBitRateESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUB_NETWORK__BIT_RATE, newBitRate,
+                        newBitRate, !oldBitRateESet ) );
         }
     }
 
@@ -242,9 +251,13 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
         bitRate = null;
         boolean oldBitRateESet = bitRateESet;
         bitRateESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.SUB_NETWORK__BIT_RATE, oldBitRate, null, oldBitRateESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.SUB_NETWORK__BIT_RATE, oldBitRate, null, oldBitRateESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -256,17 +269,19 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      */
     @Override
     public void unsetBitRate() {
-        if (bitRate != null) {
+        if( bitRate != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)bitRate).eInverseRemove(this, SclPackage.BIT_RATE__PARENT_SUB_NETWORK, BitRate.class, msgs);
-            msgs = basicUnsetBitRate(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) bitRate ).eInverseRemove( this, SclPackage.BIT_RATE__PARENT_SUB_NETWORK,
+                    BitRate.class, msgs );
+            msgs = basicUnsetBitRate( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldBitRateESet = bitRateESet;
             bitRateESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SUB_NETWORK__BIT_RATE, null, null, oldBitRateESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SUB_NETWORK__BIT_RATE, null, null,
+                        oldBitRateESet ) );
         }
     }
 
@@ -287,8 +302,8 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      */
     @Override
     public Communication getParentCommunication() {
-        if (eContainerFeatureID() != SclPackage.SUB_NETWORK__PARENT_COMMUNICATION) return null;
-        return (Communication)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SUB_NETWORK__PARENT_COMMUNICATION ) return null;
+        return ( Communication ) eInternalContainer();
     }
 
     /**
@@ -296,8 +311,10 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentCommunication(Communication newParentCommunication, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentCommunication, SclPackage.SUB_NETWORK__PARENT_COMMUNICATION, msgs);
+    public NotificationChain basicSetParentCommunication( Communication newParentCommunication,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentCommunication,
+                SclPackage.SUB_NETWORK__PARENT_COMMUNICATION, msgs );
         return msgs;
     }
 
@@ -307,20 +324,24 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      * @generated
      */
     @Override
-    public void setParentCommunication(Communication newParentCommunication) {
-        if (newParentCommunication != eInternalContainer() || (eContainerFeatureID() != SclPackage.SUB_NETWORK__PARENT_COMMUNICATION && newParentCommunication != null)) {
-            if (EcoreUtil.isAncestor(this, newParentCommunication))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentCommunication( Communication newParentCommunication ) {
+        if( newParentCommunication != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SUB_NETWORK__PARENT_COMMUNICATION
+                        && newParentCommunication != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentCommunication ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentCommunication != null)
-                msgs = ((InternalEObject)newParentCommunication).eInverseAdd(this, SclPackage.COMMUNICATION__SUB_NETWORK, Communication.class, msgs);
-            msgs = basicSetParentCommunication(newParentCommunication, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentCommunication != null )
+                msgs = ( ( InternalEObject ) newParentCommunication ).eInverseAdd( this,
+                        SclPackage.COMMUNICATION__SUB_NETWORK, Communication.class, msgs );
+            msgs = basicSetParentCommunication( newParentCommunication, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUB_NETWORK__PARENT_COMMUNICATION, newParentCommunication, newParentCommunication));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUB_NETWORK__PARENT_COMMUNICATION,
+                    newParentCommunication, newParentCommunication ) );
     }
 
     /**
@@ -329,9 +350,10 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      * @generated
      */
     @Override
-    public EList<ConnectedAP> getConnectedAP() {
-        if (connectedAP == null) {
-            connectedAP = new EObjectContainmentWithInverseEList.Unsettable<ConnectedAP>(ConnectedAP.class, this, SclPackage.SUB_NETWORK__CONNECTED_AP, SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK);
+    public EList< ConnectedAP > getConnectedAP() {
+        if( connectedAP == null ) {
+            connectedAP = new EObjectContainmentWithInverseEList.Unsettable< ConnectedAP >( ConnectedAP.class, this,
+                    SclPackage.SUB_NETWORK__CONNECTED_AP, SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK );
         }
         return connectedAP;
     }
@@ -343,7 +365,7 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      */
     @Override
     public void unsetConnectedAP() {
-        if (connectedAP != null) ((InternalEList.Unsettable<?>)connectedAP).unset();
+        if( connectedAP != null ) ( ( InternalEList.Unsettable< ? > ) connectedAP ).unset();
     }
 
     /**
@@ -353,7 +375,7 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      */
     @Override
     public boolean isSetConnectedAP() {
-        return connectedAP != null && ((InternalEList.Unsettable<?>)connectedAP).isSet();
+        return connectedAP != null && ( ( InternalEList.Unsettable< ? > ) connectedAP ).isSet();
     }
 
     /**
@@ -364,19 +386,21 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SUB_NETWORK__BIT_RATE:
-                if (bitRate != null)
-                    msgs = ((InternalEObject)bitRate).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.SUB_NETWORK__BIT_RATE, null, msgs);
-                return basicSetBitRate((BitRate)otherEnd, msgs);
-            case SclPackage.SUB_NETWORK__PARENT_COMMUNICATION:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentCommunication((Communication)otherEnd, msgs);
-            case SclPackage.SUB_NETWORK__CONNECTED_AP:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getConnectedAP()).basicAdd(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SUB_NETWORK__BIT_RATE:
+            if( bitRate != null )
+                msgs = ( ( InternalEObject ) bitRate ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.SUB_NETWORK__BIT_RATE, null, msgs );
+            return basicSetBitRate( ( BitRate ) otherEnd, msgs );
+        case SclPackage.SUB_NETWORK__PARENT_COMMUNICATION:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentCommunication( ( Communication ) otherEnd, msgs );
+        case SclPackage.SUB_NETWORK__CONNECTED_AP:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getConnectedAP() ).basicAdd( otherEnd,
+                    msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -386,15 +410,15 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SUB_NETWORK__BIT_RATE:
-                return basicUnsetBitRate(msgs);
-            case SclPackage.SUB_NETWORK__PARENT_COMMUNICATION:
-                return basicSetParentCommunication(null, msgs);
-            case SclPackage.SUB_NETWORK__CONNECTED_AP:
-                return ((InternalEList<?>)getConnectedAP()).basicRemove(otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SUB_NETWORK__BIT_RATE:
+            return basicUnsetBitRate( msgs );
+        case SclPackage.SUB_NETWORK__PARENT_COMMUNICATION:
+            return basicSetParentCommunication( null, msgs );
+        case SclPackage.SUB_NETWORK__CONNECTED_AP:
+            return ( ( InternalEList< ? > ) getConnectedAP() ).basicRemove( otherEnd, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -404,11 +428,12 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SUB_NETWORK__PARENT_COMMUNICATION:
-                return eInternalContainer().eInverseRemove(this, SclPackage.COMMUNICATION__SUB_NETWORK, Communication.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SUB_NETWORK__PARENT_COMMUNICATION:
+            return eInternalContainer().eInverseRemove( this, SclPackage.COMMUNICATION__SUB_NETWORK,
+                    Communication.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -418,17 +443,17 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SUB_NETWORK__TYPE:
-                return getType();
-            case SclPackage.SUB_NETWORK__BIT_RATE:
-                return getBitRate();
-            case SclPackage.SUB_NETWORK__PARENT_COMMUNICATION:
-                return getParentCommunication();
-            case SclPackage.SUB_NETWORK__CONNECTED_AP:
-                return getConnectedAP();
+        switch( featureID ) {
+        case SclPackage.SUB_NETWORK__TYPE:
+            return getType();
+        case SclPackage.SUB_NETWORK__BIT_RATE:
+            return getBitRate();
+        case SclPackage.SUB_NETWORK__PARENT_COMMUNICATION:
+            return getParentCommunication();
+        case SclPackage.SUB_NETWORK__CONNECTED_AP:
+            return getConnectedAP();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -439,22 +464,22 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SUB_NETWORK__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.SUB_NETWORK__BIT_RATE:
-                setBitRate((BitRate)newValue);
-                return;
-            case SclPackage.SUB_NETWORK__PARENT_COMMUNICATION:
-                setParentCommunication((Communication)newValue);
-                return;
-            case SclPackage.SUB_NETWORK__CONNECTED_AP:
-                getConnectedAP().clear();
-                getConnectedAP().addAll((Collection<? extends ConnectedAP>)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SUB_NETWORK__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.SUB_NETWORK__BIT_RATE:
+            setBitRate( ( BitRate ) newValue );
+            return;
+        case SclPackage.SUB_NETWORK__PARENT_COMMUNICATION:
+            setParentCommunication( ( Communication ) newValue );
+            return;
+        case SclPackage.SUB_NETWORK__CONNECTED_AP:
+            getConnectedAP().clear();
+            getConnectedAP().addAll( ( Collection< ? extends ConnectedAP > ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -464,21 +489,21 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SUB_NETWORK__TYPE:
-                unsetType();
-                return;
-            case SclPackage.SUB_NETWORK__BIT_RATE:
-                unsetBitRate();
-                return;
-            case SclPackage.SUB_NETWORK__PARENT_COMMUNICATION:
-                setParentCommunication((Communication)null);
-                return;
-            case SclPackage.SUB_NETWORK__CONNECTED_AP:
-                unsetConnectedAP();
-                return;
+        switch( featureID ) {
+        case SclPackage.SUB_NETWORK__TYPE:
+            unsetType();
+            return;
+        case SclPackage.SUB_NETWORK__BIT_RATE:
+            unsetBitRate();
+            return;
+        case SclPackage.SUB_NETWORK__PARENT_COMMUNICATION:
+            setParentCommunication( ( Communication ) null );
+            return;
+        case SclPackage.SUB_NETWORK__CONNECTED_AP:
+            unsetConnectedAP();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -488,17 +513,17 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SUB_NETWORK__TYPE:
-                return isSetType();
-            case SclPackage.SUB_NETWORK__BIT_RATE:
-                return isSetBitRate();
-            case SclPackage.SUB_NETWORK__PARENT_COMMUNICATION:
-                return getParentCommunication() != null;
-            case SclPackage.SUB_NETWORK__CONNECTED_AP:
-                return isSetConnectedAP();
+        switch( featureID ) {
+        case SclPackage.SUB_NETWORK__TYPE:
+            return isSetType();
+        case SclPackage.SUB_NETWORK__BIT_RATE:
+            return isSetBitRate();
+        case SclPackage.SUB_NETWORK__PARENT_COMMUNICATION:
+            return getParentCommunication() != null;
+        case SclPackage.SUB_NETWORK__CONNECTED_AP:
+            return isSetConnectedAP();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -508,12 +533,15 @@ public class SubNetworkImpl extends NamingImpl implements SubNetwork {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubjectImpl.java
index e8014dd..cb00152 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubjectImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubjectImpl.java
@@ -71,8 +71,8 @@ public class SubjectImpl extends CertImpl implements Subject {
      */
     @Override
     public Certificate getParentCertificate() {
-        if (eContainerFeatureID() != SclPackage.SUBJECT__PARENT_CERTIFICATE) return null;
-        return (Certificate)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SUBJECT__PARENT_CERTIFICATE ) return null;
+        return ( Certificate ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class SubjectImpl extends CertImpl implements Subject {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentCertificate(Certificate newParentCertificate, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentCertificate, SclPackage.SUBJECT__PARENT_CERTIFICATE, msgs);
+    public NotificationChain basicSetParentCertificate( Certificate newParentCertificate, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentCertificate, SclPackage.SUBJECT__PARENT_CERTIFICATE,
+                msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class SubjectImpl extends CertImpl implements Subject {
      * @generated
      */
     @Override
-    public void setParentCertificate(Certificate newParentCertificate) {
-        if (newParentCertificate != eInternalContainer() || (eContainerFeatureID() != SclPackage.SUBJECT__PARENT_CERTIFICATE && newParentCertificate != null)) {
-            if (EcoreUtil.isAncestor(this, newParentCertificate))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentCertificate( Certificate newParentCertificate ) {
+        if( newParentCertificate != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SUBJECT__PARENT_CERTIFICATE
+                        && newParentCertificate != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentCertificate ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentCertificate != null)
-                msgs = ((InternalEObject)newParentCertificate).eInverseAdd(this, SclPackage.CERTIFICATE__SUBJECT, Certificate.class, msgs);
-            msgs = basicSetParentCertificate(newParentCertificate, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentCertificate != null )
+                msgs = ( ( InternalEObject ) newParentCertificate ).eInverseAdd( this, SclPackage.CERTIFICATE__SUBJECT,
+                        Certificate.class, msgs );
+            msgs = basicSetParentCertificate( newParentCertificate, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUBJECT__PARENT_CERTIFICATE, newParentCertificate, newParentCertificate));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUBJECT__PARENT_CERTIFICATE,
+                    newParentCertificate, newParentCertificate ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class SubjectImpl extends CertImpl implements Subject {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SUBJECT__PARENT_CERTIFICATE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentCertificate((Certificate)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SUBJECT__PARENT_CERTIFICATE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentCertificate( ( Certificate ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class SubjectImpl extends CertImpl implements Subject {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SUBJECT__PARENT_CERTIFICATE:
-                return basicSetParentCertificate(null, msgs);
+        switch( featureID ) {
+        case SclPackage.SUBJECT__PARENT_CERTIFICATE:
+            return basicSetParentCertificate( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class SubjectImpl extends CertImpl implements Subject {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SUBJECT__PARENT_CERTIFICATE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.CERTIFICATE__SUBJECT, Certificate.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SUBJECT__PARENT_CERTIFICATE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.CERTIFICATE__SUBJECT, Certificate.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class SubjectImpl extends CertImpl implements Subject {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SUBJECT__PARENT_CERTIFICATE:
-                return getParentCertificate();
+        switch( featureID ) {
+        case SclPackage.SUBJECT__PARENT_CERTIFICATE:
+            return getParentCertificate();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class SubjectImpl extends CertImpl implements Subject {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SUBJECT__PARENT_CERTIFICATE:
-                setParentCertificate((Certificate)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SUBJECT__PARENT_CERTIFICATE:
+            setParentCertificate( ( Certificate ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class SubjectImpl extends CertImpl implements Subject {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SUBJECT__PARENT_CERTIFICATE:
-                setParentCertificate((Certificate)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.SUBJECT__PARENT_CERTIFICATE:
+            setParentCertificate( ( Certificate ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class SubjectImpl extends CertImpl implements Subject {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SUBJECT__PARENT_CERTIFICATE:
-                return getParentCertificate() != null;
+        switch( featureID ) {
+        case SclPackage.SUBJECT__PARENT_CERTIFICATE:
+            return getParentCertificate() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //SubjectImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubstationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubstationImpl.java
index c1a5a7a..0838946 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubstationImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SubstationImpl.java
@@ -62,7 +62,7 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      * @generated
      * @ordered
      */
-    protected EList<Function> function;
+    protected EList< Function > function;
 
     /**
      * The cached value of the '{@link #getVoltageLevel() <em>Voltage Level</em>}' containment reference list.
@@ -72,7 +72,7 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      * @generated
      * @ordered
      */
-    protected EList<VoltageLevel> voltageLevel;
+    protected EList< VoltageLevel > voltageLevel;
 
     /**
      * <!-- begin-user-doc -->
@@ -99,9 +99,10 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      * @generated
      */
     @Override
-    public EList<Function> getFunction() {
-        if (function == null) {
-            function = new EObjectContainmentWithInverseEList.Unsettable<Function>(Function.class, this, SclPackage.SUBSTATION__FUNCTION, SclPackage.FUNCTION__PARENT_SUBSTATION);
+    public EList< Function > getFunction() {
+        if( function == null ) {
+            function = new EObjectContainmentWithInverseEList.Unsettable< Function >( Function.class, this,
+                    SclPackage.SUBSTATION__FUNCTION, SclPackage.FUNCTION__PARENT_SUBSTATION );
         }
         return function;
     }
@@ -113,7 +114,7 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      */
     @Override
     public void unsetFunction() {
-        if (function != null) ((InternalEList.Unsettable<?>)function).unset();
+        if( function != null ) ( ( InternalEList.Unsettable< ? > ) function ).unset();
     }
 
     /**
@@ -123,7 +124,7 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      */
     @Override
     public boolean isSetFunction() {
-        return function != null && ((InternalEList.Unsettable<?>)function).isSet();
+        return function != null && ( ( InternalEList.Unsettable< ? > ) function ).isSet();
     }
 
     /**
@@ -132,9 +133,10 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      * @generated
      */
     @Override
-    public EList<VoltageLevel> getVoltageLevel() {
-        if (voltageLevel == null) {
-            voltageLevel = new EObjectContainmentWithInverseEList.Unsettable<VoltageLevel>(VoltageLevel.class, this, SclPackage.SUBSTATION__VOLTAGE_LEVEL, SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION);
+    public EList< VoltageLevel > getVoltageLevel() {
+        if( voltageLevel == null ) {
+            voltageLevel = new EObjectContainmentWithInverseEList.Unsettable< VoltageLevel >( VoltageLevel.class, this,
+                    SclPackage.SUBSTATION__VOLTAGE_LEVEL, SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION );
         }
         return voltageLevel;
     }
@@ -146,7 +148,7 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      */
     @Override
     public void unsetVoltageLevel() {
-        if (voltageLevel != null) ((InternalEList.Unsettable<?>)voltageLevel).unset();
+        if( voltageLevel != null ) ( ( InternalEList.Unsettable< ? > ) voltageLevel ).unset();
     }
 
     /**
@@ -156,7 +158,7 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      */
     @Override
     public boolean isSetVoltageLevel() {
-        return voltageLevel != null && ((InternalEList.Unsettable<?>)voltageLevel).isSet();
+        return voltageLevel != null && ( ( InternalEList.Unsettable< ? > ) voltageLevel ).isSet();
     }
 
     /**
@@ -166,8 +168,8 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      */
     @Override
     public fr.centralesupelec.edf.riseclipse.iec61850.scl.Process getParentProcess() {
-        if (eContainerFeatureID() != SclPackage.SUBSTATION__PARENT_PROCESS) return null;
-        return (fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SUBSTATION__PARENT_PROCESS ) return null;
+        return ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) eInternalContainer();
     }
 
     /**
@@ -175,8 +177,9 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentProcess(fr.centralesupelec.edf.riseclipse.iec61850.scl.Process newParentProcess, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentProcess, SclPackage.SUBSTATION__PARENT_PROCESS, msgs);
+    public NotificationChain basicSetParentProcess(
+            fr.centralesupelec.edf.riseclipse.iec61850.scl.Process newParentProcess, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentProcess, SclPackage.SUBSTATION__PARENT_PROCESS, msgs );
         return msgs;
     }
 
@@ -186,20 +189,23 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      * @generated
      */
     @Override
-    public void setParentProcess(fr.centralesupelec.edf.riseclipse.iec61850.scl.Process newParentProcess) {
-        if (newParentProcess != eInternalContainer() || (eContainerFeatureID() != SclPackage.SUBSTATION__PARENT_PROCESS && newParentProcess != null)) {
-            if (EcoreUtil.isAncestor(this, newParentProcess))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentProcess( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process newParentProcess ) {
+        if( newParentProcess != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SUBSTATION__PARENT_PROCESS && newParentProcess != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentProcess ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentProcess != null)
-                msgs = ((InternalEObject)newParentProcess).eInverseAdd(this, SclPackage.PROCESS__SUBSTATION, fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs);
-            msgs = basicSetParentProcess(newParentProcess, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentProcess != null )
+                msgs = ( ( InternalEObject ) newParentProcess ).eInverseAdd( this, SclPackage.PROCESS__SUBSTATION,
+                        fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs );
+            msgs = basicSetParentProcess( newParentProcess, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUBSTATION__PARENT_PROCESS, newParentProcess, newParentProcess));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUBSTATION__PARENT_PROCESS,
+                    newParentProcess, newParentProcess ) );
     }
 
     /**
@@ -209,8 +215,8 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      */
     @Override
     public SCL getParentSCL() {
-        if (eContainerFeatureID() != SclPackage.SUBSTATION__PARENT_SCL) return null;
-        return (SCL)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SUBSTATION__PARENT_SCL ) return null;
+        return ( SCL ) eInternalContainer();
     }
 
     /**
@@ -218,8 +224,8 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSCL(SCL newParentSCL, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSCL, SclPackage.SUBSTATION__PARENT_SCL, msgs);
+    public NotificationChain basicSetParentSCL( SCL newParentSCL, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSCL, SclPackage.SUBSTATION__PARENT_SCL, msgs );
         return msgs;
     }
 
@@ -229,20 +235,23 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      * @generated
      */
     @Override
-    public void setParentSCL(SCL newParentSCL) {
-        if (newParentSCL != eInternalContainer() || (eContainerFeatureID() != SclPackage.SUBSTATION__PARENT_SCL && newParentSCL != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSCL))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSCL( SCL newParentSCL ) {
+        if( newParentSCL != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SUBSTATION__PARENT_SCL && newParentSCL != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSCL ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSCL != null)
-                msgs = ((InternalEObject)newParentSCL).eInverseAdd(this, SclPackage.SCL__SUBSTATION, SCL.class, msgs);
-            msgs = basicSetParentSCL(newParentSCL, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSCL != null )
+                msgs = ( ( InternalEObject ) newParentSCL ).eInverseAdd( this, SclPackage.SCL__SUBSTATION, SCL.class,
+                        msgs );
+            msgs = basicSetParentSCL( newParentSCL, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUBSTATION__PARENT_SCL, newParentSCL, newParentSCL));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUBSTATION__PARENT_SCL, newParentSCL,
+                    newParentSCL ) );
     }
 
     /**
@@ -253,21 +262,23 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SUBSTATION__FUNCTION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getFunction()).basicAdd(otherEnd, msgs);
-            case SclPackage.SUBSTATION__VOLTAGE_LEVEL:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getVoltageLevel()).basicAdd(otherEnd, msgs);
-            case SclPackage.SUBSTATION__PARENT_PROCESS:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentProcess((fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)otherEnd, msgs);
-            case SclPackage.SUBSTATION__PARENT_SCL:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSCL((SCL)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SUBSTATION__FUNCTION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getFunction() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.SUBSTATION__VOLTAGE_LEVEL:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getVoltageLevel() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.SUBSTATION__PARENT_PROCESS:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentProcess( ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) otherEnd, msgs );
+        case SclPackage.SUBSTATION__PARENT_SCL:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSCL( ( SCL ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -277,17 +288,17 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SUBSTATION__FUNCTION:
-                return ((InternalEList<?>)getFunction()).basicRemove(otherEnd, msgs);
-            case SclPackage.SUBSTATION__VOLTAGE_LEVEL:
-                return ((InternalEList<?>)getVoltageLevel()).basicRemove(otherEnd, msgs);
-            case SclPackage.SUBSTATION__PARENT_PROCESS:
-                return basicSetParentProcess(null, msgs);
-            case SclPackage.SUBSTATION__PARENT_SCL:
-                return basicSetParentSCL(null, msgs);
+        switch( featureID ) {
+        case SclPackage.SUBSTATION__FUNCTION:
+            return ( ( InternalEList< ? > ) getFunction() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SUBSTATION__VOLTAGE_LEVEL:
+            return ( ( InternalEList< ? > ) getVoltageLevel() ).basicRemove( otherEnd, msgs );
+        case SclPackage.SUBSTATION__PARENT_PROCESS:
+            return basicSetParentProcess( null, msgs );
+        case SclPackage.SUBSTATION__PARENT_SCL:
+            return basicSetParentSCL( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -297,13 +308,14 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SUBSTATION__PARENT_PROCESS:
-                return eInternalContainer().eInverseRemove(this, SclPackage.PROCESS__SUBSTATION, fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs);
-            case SclPackage.SUBSTATION__PARENT_SCL:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SCL__SUBSTATION, SCL.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SUBSTATION__PARENT_PROCESS:
+            return eInternalContainer().eInverseRemove( this, SclPackage.PROCESS__SUBSTATION,
+                    fr.centralesupelec.edf.riseclipse.iec61850.scl.Process.class, msgs );
+        case SclPackage.SUBSTATION__PARENT_SCL:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SCL__SUBSTATION, SCL.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -313,17 +325,17 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SUBSTATION__FUNCTION:
-                return getFunction();
-            case SclPackage.SUBSTATION__VOLTAGE_LEVEL:
-                return getVoltageLevel();
-            case SclPackage.SUBSTATION__PARENT_PROCESS:
-                return getParentProcess();
-            case SclPackage.SUBSTATION__PARENT_SCL:
-                return getParentSCL();
+        switch( featureID ) {
+        case SclPackage.SUBSTATION__FUNCTION:
+            return getFunction();
+        case SclPackage.SUBSTATION__VOLTAGE_LEVEL:
+            return getVoltageLevel();
+        case SclPackage.SUBSTATION__PARENT_PROCESS:
+            return getParentProcess();
+        case SclPackage.SUBSTATION__PARENT_SCL:
+            return getParentSCL();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -334,23 +346,23 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SUBSTATION__FUNCTION:
-                getFunction().clear();
-                getFunction().addAll((Collection<? extends Function>)newValue);
-                return;
-            case SclPackage.SUBSTATION__VOLTAGE_LEVEL:
-                getVoltageLevel().clear();
-                getVoltageLevel().addAll((Collection<? extends VoltageLevel>)newValue);
-                return;
-            case SclPackage.SUBSTATION__PARENT_PROCESS:
-                setParentProcess((fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)newValue);
-                return;
-            case SclPackage.SUBSTATION__PARENT_SCL:
-                setParentSCL((SCL)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SUBSTATION__FUNCTION:
+            getFunction().clear();
+            getFunction().addAll( ( Collection< ? extends Function > ) newValue );
+            return;
+        case SclPackage.SUBSTATION__VOLTAGE_LEVEL:
+            getVoltageLevel().clear();
+            getVoltageLevel().addAll( ( Collection< ? extends VoltageLevel > ) newValue );
+            return;
+        case SclPackage.SUBSTATION__PARENT_PROCESS:
+            setParentProcess( ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) newValue );
+            return;
+        case SclPackage.SUBSTATION__PARENT_SCL:
+            setParentSCL( ( SCL ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -360,21 +372,21 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SUBSTATION__FUNCTION:
-                unsetFunction();
-                return;
-            case SclPackage.SUBSTATION__VOLTAGE_LEVEL:
-                unsetVoltageLevel();
-                return;
-            case SclPackage.SUBSTATION__PARENT_PROCESS:
-                setParentProcess((fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)null);
-                return;
-            case SclPackage.SUBSTATION__PARENT_SCL:
-                setParentSCL((SCL)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.SUBSTATION__FUNCTION:
+            unsetFunction();
+            return;
+        case SclPackage.SUBSTATION__VOLTAGE_LEVEL:
+            unsetVoltageLevel();
+            return;
+        case SclPackage.SUBSTATION__PARENT_PROCESS:
+            setParentProcess( ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) null );
+            return;
+        case SclPackage.SUBSTATION__PARENT_SCL:
+            setParentSCL( ( SCL ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -384,17 +396,17 @@ public class SubstationImpl extends EquipmentContainerImpl implements Substation
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SUBSTATION__FUNCTION:
-                return isSetFunction();
-            case SclPackage.SUBSTATION__VOLTAGE_LEVEL:
-                return isSetVoltageLevel();
-            case SclPackage.SUBSTATION__PARENT_PROCESS:
-                return getParentProcess() != null;
-            case SclPackage.SUBSTATION__PARENT_SCL:
-                return getParentSCL() != null;
+        switch( featureID ) {
+        case SclPackage.SUBSTATION__FUNCTION:
+            return isSetFunction();
+        case SclPackage.SUBSTATION__VOLTAGE_LEVEL:
+            return isSetVoltageLevel();
+        case SclPackage.SUBSTATION__PARENT_PROCESS:
+            return getParentProcess() != null;
+        case SclPackage.SUBSTATION__PARENT_SCL:
+            return getParentSCL() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //SubstationImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SupSubscriptionImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SupSubscriptionImpl.java
index e30e39a..1219b09 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SupSubscriptionImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SupSubscriptionImpl.java
@@ -145,8 +145,9 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
         maxGo = newMaxGo;
         boolean oldMaxGoESet = maxGoESet;
         maxGoESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUP_SUBSCRIPTION__MAX_GO, oldMaxGo, maxGo, !oldMaxGoESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUP_SUBSCRIPTION__MAX_GO, oldMaxGo,
+                    maxGo, !oldMaxGoESet ) );
     }
 
     /**
@@ -160,8 +161,9 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
         boolean oldMaxGoESet = maxGoESet;
         maxGo = MAX_GO_EDEFAULT;
         maxGoESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SUP_SUBSCRIPTION__MAX_GO, oldMaxGo, MAX_GO_EDEFAULT, oldMaxGoESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SUP_SUBSCRIPTION__MAX_GO, oldMaxGo,
+                    MAX_GO_EDEFAULT, oldMaxGoESet ) );
     }
 
     /**
@@ -195,8 +197,9 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
         maxSv = newMaxSv;
         boolean oldMaxSvESet = maxSvESet;
         maxSvESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUP_SUBSCRIPTION__MAX_SV, oldMaxSv, maxSv, !oldMaxSvESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUP_SUBSCRIPTION__MAX_SV, oldMaxSv,
+                    maxSv, !oldMaxSvESet ) );
     }
 
     /**
@@ -210,8 +213,9 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
         boolean oldMaxSvESet = maxSvESet;
         maxSv = MAX_SV_EDEFAULT;
         maxSvESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.SUP_SUBSCRIPTION__MAX_SV, oldMaxSv, MAX_SV_EDEFAULT, oldMaxSvESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SUP_SUBSCRIPTION__MAX_SV, oldMaxSv,
+                    MAX_SV_EDEFAULT, oldMaxSvESet ) );
     }
 
     /**
@@ -231,8 +235,8 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -240,8 +244,9 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -251,20 +256,24 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__SUP_SUBSCRIPTION, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this,
+                        SclPackage.SERVICES__SUP_SUBSCRIPTION, Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -274,13 +283,13 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -290,11 +299,11 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -304,11 +313,12 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__SUP_SUBSCRIPTION, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__SUP_SUBSCRIPTION, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -318,15 +328,15 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.SUP_SUBSCRIPTION__MAX_GO:
-                return getMaxGo();
-            case SclPackage.SUP_SUBSCRIPTION__MAX_SV:
-                return getMaxSv();
-            case SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.SUP_SUBSCRIPTION__MAX_GO:
+            return getMaxGo();
+        case SclPackage.SUP_SUBSCRIPTION__MAX_SV:
+            return getMaxSv();
+        case SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -336,18 +346,18 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.SUP_SUBSCRIPTION__MAX_GO:
-                setMaxGo((Integer)newValue);
-                return;
-            case SclPackage.SUP_SUBSCRIPTION__MAX_SV:
-                setMaxSv((Integer)newValue);
-                return;
-            case SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.SUP_SUBSCRIPTION__MAX_GO:
+            setMaxGo( ( Integer ) newValue );
+            return;
+        case SclPackage.SUP_SUBSCRIPTION__MAX_SV:
+            setMaxSv( ( Integer ) newValue );
+            return;
+        case SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -357,18 +367,18 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SUP_SUBSCRIPTION__MAX_GO:
-                unsetMaxGo();
-                return;
-            case SclPackage.SUP_SUBSCRIPTION__MAX_SV:
-                unsetMaxSv();
-                return;
-            case SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.SUP_SUBSCRIPTION__MAX_GO:
+            unsetMaxGo();
+            return;
+        case SclPackage.SUP_SUBSCRIPTION__MAX_SV:
+            unsetMaxSv();
+            return;
+        case SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -378,15 +388,15 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.SUP_SUBSCRIPTION__MAX_GO:
-                return isSetMaxGo();
-            case SclPackage.SUP_SUBSCRIPTION__MAX_SV:
-                return isSetMaxSv();
-            case SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.SUP_SUBSCRIPTION__MAX_GO:
+            return isSetMaxGo();
+        case SclPackage.SUP_SUBSCRIPTION__MAX_SV:
+            return isSetMaxSv();
+        case SclPackage.SUP_SUBSCRIPTION__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -396,14 +406,20 @@ public class SupSubscriptionImpl extends SclObjectImpl implements SupSubscriptio
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (maxGo: ");
-        if (maxGoESet) result.append(maxGo); else result.append("<unset>");
-        result.append(", maxSv: ");
-        if (maxSvESet) result.append(maxSv); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (maxGo: " );
+        if( maxGoESet )
+            result.append( maxGo );
+        else
+            result.append( "<unset>" );
+        result.append( ", maxSv: " );
+        if( maxSvESet )
+            result.append( maxSv );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TapChangerImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TapChangerImpl.java
index fcf2c97..07fe2cc 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TapChangerImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TapChangerImpl.java
@@ -122,7 +122,7 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      * @generated
      * @ordered
      */
-    protected EList<EqFunction> eqFunction;
+    protected EList< EqFunction > eqFunction;
 
     /**
      * The cached value of the '{@link #getSubEquipment() <em>Sub Equipment</em>}' containment reference list.
@@ -132,7 +132,7 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      * @generated
      * @ordered
      */
-    protected EList<SubEquipment> subEquipment;
+    protected EList< SubEquipment > subEquipment;
 
     /**
      * <!-- begin-user-doc -->
@@ -174,8 +174,9 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TAP_CHANGER__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TAP_CHANGER__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -189,8 +190,9 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TAP_CHANGER__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TAP_CHANGER__TYPE, oldType,
+                    TYPE_EDEFAULT, oldTypeESet ) );
     }
 
     /**
@@ -224,8 +226,9 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
         virtual = newVirtual;
         boolean oldVirtualESet = virtualESet;
         virtualESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TAP_CHANGER__VIRTUAL, oldVirtual, virtual, !oldVirtualESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TAP_CHANGER__VIRTUAL, oldVirtual,
+                    virtual, !oldVirtualESet ) );
     }
 
     /**
@@ -239,8 +242,9 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
         boolean oldVirtualESet = virtualESet;
         virtual = VIRTUAL_EDEFAULT;
         virtualESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TAP_CHANGER__VIRTUAL, oldVirtual, VIRTUAL_EDEFAULT, oldVirtualESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TAP_CHANGER__VIRTUAL, oldVirtual,
+                    VIRTUAL_EDEFAULT, oldVirtualESet ) );
     }
 
     /**
@@ -259,9 +263,10 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      * @generated
      */
     @Override
-    public EList<EqFunction> getEqFunction() {
-        if (eqFunction == null) {
-            eqFunction = new EObjectContainmentWithInverseEList.Unsettable<EqFunction>(EqFunction.class, this, SclPackage.TAP_CHANGER__EQ_FUNCTION, SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER);
+    public EList< EqFunction > getEqFunction() {
+        if( eqFunction == null ) {
+            eqFunction = new EObjectContainmentWithInverseEList.Unsettable< EqFunction >( EqFunction.class, this,
+                    SclPackage.TAP_CHANGER__EQ_FUNCTION, SclPackage.EQ_FUNCTION__PARENT_TAP_CHANGER );
         }
         return eqFunction;
     }
@@ -273,7 +278,7 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      */
     @Override
     public void unsetEqFunction() {
-        if (eqFunction != null) ((InternalEList.Unsettable<?>)eqFunction).unset();
+        if( eqFunction != null ) ( ( InternalEList.Unsettable< ? > ) eqFunction ).unset();
     }
 
     /**
@@ -283,7 +288,7 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      */
     @Override
     public boolean isSetEqFunction() {
-        return eqFunction != null && ((InternalEList.Unsettable<?>)eqFunction).isSet();
+        return eqFunction != null && ( ( InternalEList.Unsettable< ? > ) eqFunction ).isSet();
     }
 
     /**
@@ -292,9 +297,10 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      * @generated
      */
     @Override
-    public EList<SubEquipment> getSubEquipment() {
-        if (subEquipment == null) {
-            subEquipment = new EObjectContainmentWithInverseEList.Unsettable<SubEquipment>(SubEquipment.class, this, SclPackage.TAP_CHANGER__SUB_EQUIPMENT, SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER);
+    public EList< SubEquipment > getSubEquipment() {
+        if( subEquipment == null ) {
+            subEquipment = new EObjectContainmentWithInverseEList.Unsettable< SubEquipment >( SubEquipment.class, this,
+                    SclPackage.TAP_CHANGER__SUB_EQUIPMENT, SclPackage.SUB_EQUIPMENT__PARENT_TAP_CHANGER );
         }
         return subEquipment;
     }
@@ -306,7 +312,7 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      */
     @Override
     public void unsetSubEquipment() {
-        if (subEquipment != null) ((InternalEList.Unsettable<?>)subEquipment).unset();
+        if( subEquipment != null ) ( ( InternalEList.Unsettable< ? > ) subEquipment ).unset();
     }
 
     /**
@@ -316,7 +322,7 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      */
     @Override
     public boolean isSetSubEquipment() {
-        return subEquipment != null && ((InternalEList.Unsettable<?>)subEquipment).isSet();
+        return subEquipment != null && ( ( InternalEList.Unsettable< ? > ) subEquipment ).isSet();
     }
 
     /**
@@ -326,8 +332,8 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      */
     @Override
     public TransformerWinding getParentTransformerWinding() {
-        if (eContainerFeatureID() != SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING) return null;
-        return (TransformerWinding)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING ) return null;
+        return ( TransformerWinding ) eInternalContainer();
     }
 
     /**
@@ -335,8 +341,10 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentTransformerWinding(TransformerWinding newParentTransformerWinding, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentTransformerWinding, SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING, msgs);
+    public NotificationChain basicSetParentTransformerWinding( TransformerWinding newParentTransformerWinding,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentTransformerWinding,
+                SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING, msgs );
         return msgs;
     }
 
@@ -346,20 +354,24 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      * @generated
      */
     @Override
-    public void setParentTransformerWinding(TransformerWinding newParentTransformerWinding) {
-        if (newParentTransformerWinding != eInternalContainer() || (eContainerFeatureID() != SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING && newParentTransformerWinding != null)) {
-            if (EcoreUtil.isAncestor(this, newParentTransformerWinding))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentTransformerWinding( TransformerWinding newParentTransformerWinding ) {
+        if( newParentTransformerWinding != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING
+                        && newParentTransformerWinding != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentTransformerWinding ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentTransformerWinding != null)
-                msgs = ((InternalEObject)newParentTransformerWinding).eInverseAdd(this, SclPackage.TRANSFORMER_WINDING__TAP_CHANGER, TransformerWinding.class, msgs);
-            msgs = basicSetParentTransformerWinding(newParentTransformerWinding, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentTransformerWinding != null )
+                msgs = ( ( InternalEObject ) newParentTransformerWinding ).eInverseAdd( this,
+                        SclPackage.TRANSFORMER_WINDING__TAP_CHANGER, TransformerWinding.class, msgs );
+            msgs = basicSetParentTransformerWinding( newParentTransformerWinding, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING, newParentTransformerWinding, newParentTransformerWinding));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING,
+                    newParentTransformerWinding, newParentTransformerWinding ) );
     }
 
     /**
@@ -370,17 +382,19 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.TAP_CHANGER__EQ_FUNCTION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getEqFunction()).basicAdd(otherEnd, msgs);
-            case SclPackage.TAP_CHANGER__SUB_EQUIPMENT:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSubEquipment()).basicAdd(otherEnd, msgs);
-            case SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentTransformerWinding((TransformerWinding)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.TAP_CHANGER__EQ_FUNCTION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getEqFunction() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.TAP_CHANGER__SUB_EQUIPMENT:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getSubEquipment() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentTransformerWinding( ( TransformerWinding ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -390,15 +404,15 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.TAP_CHANGER__EQ_FUNCTION:
-                return ((InternalEList<?>)getEqFunction()).basicRemove(otherEnd, msgs);
-            case SclPackage.TAP_CHANGER__SUB_EQUIPMENT:
-                return ((InternalEList<?>)getSubEquipment()).basicRemove(otherEnd, msgs);
-            case SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING:
-                return basicSetParentTransformerWinding(null, msgs);
+        switch( featureID ) {
+        case SclPackage.TAP_CHANGER__EQ_FUNCTION:
+            return ( ( InternalEList< ? > ) getEqFunction() ).basicRemove( otherEnd, msgs );
+        case SclPackage.TAP_CHANGER__SUB_EQUIPMENT:
+            return ( ( InternalEList< ? > ) getSubEquipment() ).basicRemove( otherEnd, msgs );
+        case SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING:
+            return basicSetParentTransformerWinding( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -408,11 +422,12 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING:
-                return eInternalContainer().eInverseRemove(this, SclPackage.TRANSFORMER_WINDING__TAP_CHANGER, TransformerWinding.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING:
+            return eInternalContainer().eInverseRemove( this, SclPackage.TRANSFORMER_WINDING__TAP_CHANGER,
+                    TransformerWinding.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -422,19 +437,19 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.TAP_CHANGER__VIRTUAL:
-                return getVirtual();
-            case SclPackage.TAP_CHANGER__TYPE:
-                return getType();
-            case SclPackage.TAP_CHANGER__EQ_FUNCTION:
-                return getEqFunction();
-            case SclPackage.TAP_CHANGER__SUB_EQUIPMENT:
-                return getSubEquipment();
-            case SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING:
-                return getParentTransformerWinding();
+        switch( featureID ) {
+        case SclPackage.TAP_CHANGER__VIRTUAL:
+            return getVirtual();
+        case SclPackage.TAP_CHANGER__TYPE:
+            return getType();
+        case SclPackage.TAP_CHANGER__EQ_FUNCTION:
+            return getEqFunction();
+        case SclPackage.TAP_CHANGER__SUB_EQUIPMENT:
+            return getSubEquipment();
+        case SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING:
+            return getParentTransformerWinding();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -445,26 +460,26 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.TAP_CHANGER__VIRTUAL:
-                setVirtual((Boolean)newValue);
-                return;
-            case SclPackage.TAP_CHANGER__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.TAP_CHANGER__EQ_FUNCTION:
-                getEqFunction().clear();
-                getEqFunction().addAll((Collection<? extends EqFunction>)newValue);
-                return;
-            case SclPackage.TAP_CHANGER__SUB_EQUIPMENT:
-                getSubEquipment().clear();
-                getSubEquipment().addAll((Collection<? extends SubEquipment>)newValue);
-                return;
-            case SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING:
-                setParentTransformerWinding((TransformerWinding)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.TAP_CHANGER__VIRTUAL:
+            setVirtual( ( Boolean ) newValue );
+            return;
+        case SclPackage.TAP_CHANGER__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.TAP_CHANGER__EQ_FUNCTION:
+            getEqFunction().clear();
+            getEqFunction().addAll( ( Collection< ? extends EqFunction > ) newValue );
+            return;
+        case SclPackage.TAP_CHANGER__SUB_EQUIPMENT:
+            getSubEquipment().clear();
+            getSubEquipment().addAll( ( Collection< ? extends SubEquipment > ) newValue );
+            return;
+        case SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING:
+            setParentTransformerWinding( ( TransformerWinding ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -474,24 +489,24 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.TAP_CHANGER__VIRTUAL:
-                unsetVirtual();
-                return;
-            case SclPackage.TAP_CHANGER__TYPE:
-                unsetType();
-                return;
-            case SclPackage.TAP_CHANGER__EQ_FUNCTION:
-                unsetEqFunction();
-                return;
-            case SclPackage.TAP_CHANGER__SUB_EQUIPMENT:
-                unsetSubEquipment();
-                return;
-            case SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING:
-                setParentTransformerWinding((TransformerWinding)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.TAP_CHANGER__VIRTUAL:
+            unsetVirtual();
+            return;
+        case SclPackage.TAP_CHANGER__TYPE:
+            unsetType();
+            return;
+        case SclPackage.TAP_CHANGER__EQ_FUNCTION:
+            unsetEqFunction();
+            return;
+        case SclPackage.TAP_CHANGER__SUB_EQUIPMENT:
+            unsetSubEquipment();
+            return;
+        case SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING:
+            setParentTransformerWinding( ( TransformerWinding ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -501,19 +516,19 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.TAP_CHANGER__VIRTUAL:
-                return isSetVirtual();
-            case SclPackage.TAP_CHANGER__TYPE:
-                return isSetType();
-            case SclPackage.TAP_CHANGER__EQ_FUNCTION:
-                return isSetEqFunction();
-            case SclPackage.TAP_CHANGER__SUB_EQUIPMENT:
-                return isSetSubEquipment();
-            case SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING:
-                return getParentTransformerWinding() != null;
+        switch( featureID ) {
+        case SclPackage.TAP_CHANGER__VIRTUAL:
+            return isSetVirtual();
+        case SclPackage.TAP_CHANGER__TYPE:
+            return isSetType();
+        case SclPackage.TAP_CHANGER__EQ_FUNCTION:
+            return isSetEqFunction();
+        case SclPackage.TAP_CHANGER__SUB_EQUIPMENT:
+            return isSetSubEquipment();
+        case SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING:
+            return getParentTransformerWinding() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -522,14 +537,16 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      * @generated
      */
     @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == AgVirtual.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.TAP_CHANGER__VIRTUAL: return SclPackage.AG_VIRTUAL__VIRTUAL;
-                default: return -1;
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgVirtual.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.TAP_CHANGER__VIRTUAL:
+                return SclPackage.AG_VIRTUAL__VIRTUAL;
+            default:
+                return -1;
             }
         }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
     }
 
     /**
@@ -538,14 +555,16 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      * @generated
      */
     @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == AgVirtual.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_VIRTUAL__VIRTUAL: return SclPackage.TAP_CHANGER__VIRTUAL;
-                default: return -1;
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgVirtual.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_VIRTUAL__VIRTUAL:
+                return SclPackage.TAP_CHANGER__VIRTUAL;
+            default:
+                return -1;
             }
         }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
     }
 
     /**
@@ -555,14 +574,20 @@ public class TapChangerImpl extends PowerSystemResourceImpl implements TapChange
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (virtual: ");
-        if (virtualESet) result.append(virtual); else result.append("<unset>");
-        result.append(", type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (virtual: " );
+        if( virtualESet )
+            result.append( virtual );
+        else
+            result.append( "<unset>" );
+        result.append( ", type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TerminalImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TerminalImpl.java
index 4ec6ecb..3b3846c 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TerminalImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TerminalImpl.java
@@ -355,8 +355,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         bayName = newBayName;
         boolean oldBayNameESet = bayNameESet;
         bayNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TERMINAL__BAY_NAME, oldBayName, bayName, !oldBayNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TERMINAL__BAY_NAME, oldBayName, bayName,
+                    !oldBayNameESet ) );
     }
 
     /**
@@ -370,8 +371,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         boolean oldBayNameESet = bayNameESet;
         bayName = BAY_NAME_EDEFAULT;
         bayNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TERMINAL__BAY_NAME, oldBayName, BAY_NAME_EDEFAULT, oldBayNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TERMINAL__BAY_NAME, oldBayName,
+                    BAY_NAME_EDEFAULT, oldBayNameESet ) );
     }
 
     /**
@@ -405,8 +407,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         cNodeName = newCNodeName;
         boolean oldCNodeNameESet = cNodeNameESet;
         cNodeNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TERMINAL__CNODE_NAME, oldCNodeName, cNodeName, !oldCNodeNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TERMINAL__CNODE_NAME, oldCNodeName,
+                    cNodeName, !oldCNodeNameESet ) );
     }
 
     /**
@@ -420,8 +423,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         boolean oldCNodeNameESet = cNodeNameESet;
         cNodeName = CNODE_NAME_EDEFAULT;
         cNodeNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TERMINAL__CNODE_NAME, oldCNodeName, CNODE_NAME_EDEFAULT, oldCNodeNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TERMINAL__CNODE_NAME, oldCNodeName,
+                    CNODE_NAME_EDEFAULT, oldCNodeNameESet ) );
     }
 
     /**
@@ -455,8 +459,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         connectivityNode = newConnectivityNode;
         boolean oldConnectivityNodeESet = connectivityNodeESet;
         connectivityNodeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TERMINAL__CONNECTIVITY_NODE, oldConnectivityNode, connectivityNode, !oldConnectivityNodeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TERMINAL__CONNECTIVITY_NODE,
+                    oldConnectivityNode, connectivityNode, !oldConnectivityNodeESet ) );
     }
 
     /**
@@ -470,8 +475,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         boolean oldConnectivityNodeESet = connectivityNodeESet;
         connectivityNode = CONNECTIVITY_NODE_EDEFAULT;
         connectivityNodeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TERMINAL__CONNECTIVITY_NODE, oldConnectivityNode, CONNECTIVITY_NODE_EDEFAULT, oldConnectivityNodeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TERMINAL__CONNECTIVITY_NODE,
+                    oldConnectivityNode, CONNECTIVITY_NODE_EDEFAULT, oldConnectivityNodeESet ) );
     }
 
     /**
@@ -505,8 +511,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         processName = newProcessName;
         boolean oldProcessNameESet = processNameESet;
         processNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TERMINAL__PROCESS_NAME, oldProcessName, processName, !oldProcessNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TERMINAL__PROCESS_NAME, oldProcessName,
+                    processName, !oldProcessNameESet ) );
     }
 
     /**
@@ -520,8 +527,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         boolean oldProcessNameESet = processNameESet;
         processName = PROCESS_NAME_EDEFAULT;
         processNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TERMINAL__PROCESS_NAME, oldProcessName, PROCESS_NAME_EDEFAULT, oldProcessNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TERMINAL__PROCESS_NAME, oldProcessName,
+                    PROCESS_NAME_EDEFAULT, oldProcessNameESet ) );
     }
 
     /**
@@ -555,8 +563,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         substationName = newSubstationName;
         boolean oldSubstationNameESet = substationNameESet;
         substationNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TERMINAL__SUBSTATION_NAME, oldSubstationName, substationName, !oldSubstationNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TERMINAL__SUBSTATION_NAME,
+                    oldSubstationName, substationName, !oldSubstationNameESet ) );
     }
 
     /**
@@ -570,8 +579,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         boolean oldSubstationNameESet = substationNameESet;
         substationName = SUBSTATION_NAME_EDEFAULT;
         substationNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TERMINAL__SUBSTATION_NAME, oldSubstationName, SUBSTATION_NAME_EDEFAULT, oldSubstationNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TERMINAL__SUBSTATION_NAME,
+                    oldSubstationName, SUBSTATION_NAME_EDEFAULT, oldSubstationNameESet ) );
     }
 
     /**
@@ -605,8 +615,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         voltageLevelName = newVoltageLevelName;
         boolean oldVoltageLevelNameESet = voltageLevelNameESet;
         voltageLevelNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TERMINAL__VOLTAGE_LEVEL_NAME, oldVoltageLevelName, voltageLevelName, !oldVoltageLevelNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TERMINAL__VOLTAGE_LEVEL_NAME,
+                    oldVoltageLevelName, voltageLevelName, !oldVoltageLevelNameESet ) );
     }
 
     /**
@@ -620,8 +631,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         boolean oldVoltageLevelNameESet = voltageLevelNameESet;
         voltageLevelName = VOLTAGE_LEVEL_NAME_EDEFAULT;
         voltageLevelNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TERMINAL__VOLTAGE_LEVEL_NAME, oldVoltageLevelName, VOLTAGE_LEVEL_NAME_EDEFAULT, oldVoltageLevelNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TERMINAL__VOLTAGE_LEVEL_NAME,
+                    oldVoltageLevelName, VOLTAGE_LEVEL_NAME_EDEFAULT, oldVoltageLevelNameESet ) );
     }
 
     /**
@@ -641,8 +653,8 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      */
     @Override
     public AbstractConductingEquipment getParentAbstractConductingEquipment() {
-        if (eContainerFeatureID() != SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT) return null;
-        return (AbstractConductingEquipment)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT ) return null;
+        return ( AbstractConductingEquipment ) eInternalContainer();
     }
 
     /**
@@ -650,8 +662,10 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAbstractConductingEquipment(AbstractConductingEquipment newParentAbstractConductingEquipment, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAbstractConductingEquipment, SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT, msgs);
+    public NotificationChain basicSetParentAbstractConductingEquipment(
+            AbstractConductingEquipment newParentAbstractConductingEquipment, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAbstractConductingEquipment,
+                SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT, msgs );
         return msgs;
     }
 
@@ -661,20 +675,26 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      * @generated
      */
     @Override
-    public void setParentAbstractConductingEquipment(AbstractConductingEquipment newParentAbstractConductingEquipment) {
-        if (newParentAbstractConductingEquipment != eInternalContainer() || (eContainerFeatureID() != SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT && newParentAbstractConductingEquipment != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAbstractConductingEquipment))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAbstractConductingEquipment(
+            AbstractConductingEquipment newParentAbstractConductingEquipment ) {
+        if( newParentAbstractConductingEquipment != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT
+                        && newParentAbstractConductingEquipment != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAbstractConductingEquipment ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAbstractConductingEquipment != null)
-                msgs = ((InternalEObject)newParentAbstractConductingEquipment).eInverseAdd(this, SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL, AbstractConductingEquipment.class, msgs);
-            msgs = basicSetParentAbstractConductingEquipment(newParentAbstractConductingEquipment, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAbstractConductingEquipment != null )
+                msgs = ( ( InternalEObject ) newParentAbstractConductingEquipment ).eInverseAdd( this,
+                        SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL, AbstractConductingEquipment.class, msgs );
+            msgs = basicSetParentAbstractConductingEquipment( newParentAbstractConductingEquipment, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT, newParentAbstractConductingEquipment, newParentAbstractConductingEquipment));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET,
+                    SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT, newParentAbstractConductingEquipment,
+                    newParentAbstractConductingEquipment ) );
     }
 
     /**
@@ -692,14 +712,20 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRefersToConnectivityNode(ConnectivityNode newRefersToConnectivityNode, NotificationChain msgs) {
+    public NotificationChain basicSetRefersToConnectivityNode( ConnectivityNode newRefersToConnectivityNode,
+            NotificationChain msgs ) {
         ConnectivityNode oldRefersToConnectivityNode = refersToConnectivityNode;
         refersToConnectivityNode = newRefersToConnectivityNode;
         boolean oldRefersToConnectivityNodeESet = refersToConnectivityNodeESet;
         refersToConnectivityNodeESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE, oldRefersToConnectivityNode, newRefersToConnectivityNode, !oldRefersToConnectivityNodeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE, oldRefersToConnectivityNode,
+                    newRefersToConnectivityNode, !oldRefersToConnectivityNodeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -710,21 +736,25 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      * @generated
      */
     @Override
-    public void setRefersToConnectivityNode(ConnectivityNode newRefersToConnectivityNode) {
-        if (newRefersToConnectivityNode != refersToConnectivityNode) {
+    public void setRefersToConnectivityNode( ConnectivityNode newRefersToConnectivityNode ) {
+        if( newRefersToConnectivityNode != refersToConnectivityNode ) {
             NotificationChain msgs = null;
-            if (refersToConnectivityNode != null)
-                msgs = ((InternalEObject)refersToConnectivityNode).eInverseRemove(this, SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL, ConnectivityNode.class, msgs);
-            if (newRefersToConnectivityNode != null)
-                msgs = ((InternalEObject)newRefersToConnectivityNode).eInverseAdd(this, SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL, ConnectivityNode.class, msgs);
-            msgs = basicSetRefersToConnectivityNode(newRefersToConnectivityNode, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( refersToConnectivityNode != null )
+                msgs = ( ( InternalEObject ) refersToConnectivityNode ).eInverseRemove( this,
+                        SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL, ConnectivityNode.class, msgs );
+            if( newRefersToConnectivityNode != null )
+                msgs = ( ( InternalEObject ) newRefersToConnectivityNode ).eInverseAdd( this,
+                        SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL, ConnectivityNode.class, msgs );
+            msgs = basicSetRefersToConnectivityNode( newRefersToConnectivityNode, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToConnectivityNodeESet = refersToConnectivityNodeESet;
             refersToConnectivityNodeESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE, newRefersToConnectivityNode, newRefersToConnectivityNode, !oldRefersToConnectivityNodeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET,
+                        SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE, newRefersToConnectivityNode,
+                        newRefersToConnectivityNode, !oldRefersToConnectivityNodeESet ) );
         }
     }
 
@@ -733,14 +763,19 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicUnsetRefersToConnectivityNode(NotificationChain msgs) {
+    public NotificationChain basicUnsetRefersToConnectivityNode( NotificationChain msgs ) {
         ConnectivityNode oldRefersToConnectivityNode = refersToConnectivityNode;
         refersToConnectivityNode = null;
         boolean oldRefersToConnectivityNodeESet = refersToConnectivityNodeESet;
         refersToConnectivityNodeESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE, oldRefersToConnectivityNode, null, oldRefersToConnectivityNodeESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE, oldRefersToConnectivityNode, null,
+                    oldRefersToConnectivityNodeESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -752,17 +787,20 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      */
     @Override
     public void unsetRefersToConnectivityNode() {
-        if (refersToConnectivityNode != null) {
+        if( refersToConnectivityNode != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)refersToConnectivityNode).eInverseRemove(this, SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL, ConnectivityNode.class, msgs);
-            msgs = basicUnsetRefersToConnectivityNode(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) refersToConnectivityNode ).eInverseRemove( this,
+                    SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL, ConnectivityNode.class, msgs );
+            msgs = basicUnsetRefersToConnectivityNode( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldRefersToConnectivityNodeESet = refersToConnectivityNodeESet;
             refersToConnectivityNodeESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE, null, null, oldRefersToConnectivityNodeESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET,
+                        SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE, null, null,
+                        oldRefersToConnectivityNodeESet ) );
         }
     }
 
@@ -792,13 +830,14 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      * @generated
      */
     @Override
-    public void setName(String newName) {
+    public void setName( String newName ) {
         String oldName = name;
         name = newName;
         boolean oldNameESet = nameESet;
         nameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TERMINAL__NAME, oldName, name, !oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TERMINAL__NAME, oldName, name,
+                    !oldNameESet ) );
     }
 
     /**
@@ -812,8 +851,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         boolean oldNameESet = nameESet;
         name = NAME_EDEFAULT;
         nameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TERMINAL__NAME, oldName, NAME_EDEFAULT, oldNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TERMINAL__NAME, oldName, NAME_EDEFAULT,
+                    oldNameESet ) );
     }
 
     /**
@@ -842,13 +882,14 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      * @generated
      */
     @Override
-    public void setLineName(String newLineName) {
+    public void setLineName( String newLineName ) {
         String oldLineName = lineName;
         lineName = newLineName;
         boolean oldLineNameESet = lineNameESet;
         lineNameESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TERMINAL__LINE_NAME, oldLineName, lineName, !oldLineNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TERMINAL__LINE_NAME, oldLineName,
+                    lineName, !oldLineNameESet ) );
     }
 
     /**
@@ -862,8 +903,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         boolean oldLineNameESet = lineNameESet;
         lineName = LINE_NAME_EDEFAULT;
         lineNameESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TERMINAL__LINE_NAME, oldLineName, LINE_NAME_EDEFAULT, oldLineNameESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TERMINAL__LINE_NAME, oldLineName,
+                    LINE_NAME_EDEFAULT, oldLineNameESet ) );
     }
 
     /**
@@ -883,17 +925,18 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAbstractConductingEquipment((AbstractConductingEquipment)otherEnd, msgs);
-            case SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE:
-                if (refersToConnectivityNode != null)
-                    msgs = ((InternalEObject)refersToConnectivityNode).eInverseRemove(this, SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL, ConnectivityNode.class, msgs);
-                return basicSetRefersToConnectivityNode((ConnectivityNode)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAbstractConductingEquipment( ( AbstractConductingEquipment ) otherEnd, msgs );
+        case SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE:
+            if( refersToConnectivityNode != null )
+                msgs = ( ( InternalEObject ) refersToConnectivityNode ).eInverseRemove( this,
+                        SclPackage.CONNECTIVITY_NODE__REFERRED_BY_TERMINAL, ConnectivityNode.class, msgs );
+            return basicSetRefersToConnectivityNode( ( ConnectivityNode ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -903,13 +946,13 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
-                return basicSetParentAbstractConductingEquipment(null, msgs);
-            case SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE:
-                return basicUnsetRefersToConnectivityNode(msgs);
+        switch( featureID ) {
+        case SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
+            return basicSetParentAbstractConductingEquipment( null, msgs );
+        case SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE:
+            return basicUnsetRefersToConnectivityNode( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -919,11 +962,12 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL, AbstractConductingEquipment.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT__TERMINAL,
+                    AbstractConductingEquipment.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -933,29 +977,29 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.TERMINAL__BAY_NAME:
-                return getBayName();
-            case SclPackage.TERMINAL__CNODE_NAME:
-                return getCNodeName();
-            case SclPackage.TERMINAL__CONNECTIVITY_NODE:
-                return getConnectivityNode();
-            case SclPackage.TERMINAL__PROCESS_NAME:
-                return getProcessName();
-            case SclPackage.TERMINAL__SUBSTATION_NAME:
-                return getSubstationName();
-            case SclPackage.TERMINAL__VOLTAGE_LEVEL_NAME:
-                return getVoltageLevelName();
-            case SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
-                return getParentAbstractConductingEquipment();
-            case SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE:
-                return getRefersToConnectivityNode();
-            case SclPackage.TERMINAL__NAME:
-                return getName();
-            case SclPackage.TERMINAL__LINE_NAME:
-                return getLineName();
+        switch( featureID ) {
+        case SclPackage.TERMINAL__BAY_NAME:
+            return getBayName();
+        case SclPackage.TERMINAL__CNODE_NAME:
+            return getCNodeName();
+        case SclPackage.TERMINAL__CONNECTIVITY_NODE:
+            return getConnectivityNode();
+        case SclPackage.TERMINAL__PROCESS_NAME:
+            return getProcessName();
+        case SclPackage.TERMINAL__SUBSTATION_NAME:
+            return getSubstationName();
+        case SclPackage.TERMINAL__VOLTAGE_LEVEL_NAME:
+            return getVoltageLevelName();
+        case SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
+            return getParentAbstractConductingEquipment();
+        case SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE:
+            return getRefersToConnectivityNode();
+        case SclPackage.TERMINAL__NAME:
+            return getName();
+        case SclPackage.TERMINAL__LINE_NAME:
+            return getLineName();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -965,39 +1009,39 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.TERMINAL__BAY_NAME:
-                setBayName((String)newValue);
-                return;
-            case SclPackage.TERMINAL__CNODE_NAME:
-                setCNodeName((String)newValue);
-                return;
-            case SclPackage.TERMINAL__CONNECTIVITY_NODE:
-                setConnectivityNode((String)newValue);
-                return;
-            case SclPackage.TERMINAL__PROCESS_NAME:
-                setProcessName((String)newValue);
-                return;
-            case SclPackage.TERMINAL__SUBSTATION_NAME:
-                setSubstationName((String)newValue);
-                return;
-            case SclPackage.TERMINAL__VOLTAGE_LEVEL_NAME:
-                setVoltageLevelName((String)newValue);
-                return;
-            case SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
-                setParentAbstractConductingEquipment((AbstractConductingEquipment)newValue);
-                return;
-            case SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE:
-                setRefersToConnectivityNode((ConnectivityNode)newValue);
-                return;
-            case SclPackage.TERMINAL__NAME:
-                setName((String)newValue);
-                return;
-            case SclPackage.TERMINAL__LINE_NAME:
-                setLineName((String)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.TERMINAL__BAY_NAME:
+            setBayName( ( String ) newValue );
+            return;
+        case SclPackage.TERMINAL__CNODE_NAME:
+            setCNodeName( ( String ) newValue );
+            return;
+        case SclPackage.TERMINAL__CONNECTIVITY_NODE:
+            setConnectivityNode( ( String ) newValue );
+            return;
+        case SclPackage.TERMINAL__PROCESS_NAME:
+            setProcessName( ( String ) newValue );
+            return;
+        case SclPackage.TERMINAL__SUBSTATION_NAME:
+            setSubstationName( ( String ) newValue );
+            return;
+        case SclPackage.TERMINAL__VOLTAGE_LEVEL_NAME:
+            setVoltageLevelName( ( String ) newValue );
+            return;
+        case SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
+            setParentAbstractConductingEquipment( ( AbstractConductingEquipment ) newValue );
+            return;
+        case SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE:
+            setRefersToConnectivityNode( ( ConnectivityNode ) newValue );
+            return;
+        case SclPackage.TERMINAL__NAME:
+            setName( ( String ) newValue );
+            return;
+        case SclPackage.TERMINAL__LINE_NAME:
+            setLineName( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -1007,39 +1051,39 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.TERMINAL__BAY_NAME:
-                unsetBayName();
-                return;
-            case SclPackage.TERMINAL__CNODE_NAME:
-                unsetCNodeName();
-                return;
-            case SclPackage.TERMINAL__CONNECTIVITY_NODE:
-                unsetConnectivityNode();
-                return;
-            case SclPackage.TERMINAL__PROCESS_NAME:
-                unsetProcessName();
-                return;
-            case SclPackage.TERMINAL__SUBSTATION_NAME:
-                unsetSubstationName();
-                return;
-            case SclPackage.TERMINAL__VOLTAGE_LEVEL_NAME:
-                unsetVoltageLevelName();
-                return;
-            case SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
-                setParentAbstractConductingEquipment((AbstractConductingEquipment)null);
-                return;
-            case SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE:
-                unsetRefersToConnectivityNode();
-                return;
-            case SclPackage.TERMINAL__NAME:
-                unsetName();
-                return;
-            case SclPackage.TERMINAL__LINE_NAME:
-                unsetLineName();
-                return;
+        switch( featureID ) {
+        case SclPackage.TERMINAL__BAY_NAME:
+            unsetBayName();
+            return;
+        case SclPackage.TERMINAL__CNODE_NAME:
+            unsetCNodeName();
+            return;
+        case SclPackage.TERMINAL__CONNECTIVITY_NODE:
+            unsetConnectivityNode();
+            return;
+        case SclPackage.TERMINAL__PROCESS_NAME:
+            unsetProcessName();
+            return;
+        case SclPackage.TERMINAL__SUBSTATION_NAME:
+            unsetSubstationName();
+            return;
+        case SclPackage.TERMINAL__VOLTAGE_LEVEL_NAME:
+            unsetVoltageLevelName();
+            return;
+        case SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
+            setParentAbstractConductingEquipment( ( AbstractConductingEquipment ) null );
+            return;
+        case SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE:
+            unsetRefersToConnectivityNode();
+            return;
+        case SclPackage.TERMINAL__NAME:
+            unsetName();
+            return;
+        case SclPackage.TERMINAL__LINE_NAME:
+            unsetLineName();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -1049,29 +1093,29 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.TERMINAL__BAY_NAME:
-                return isSetBayName();
-            case SclPackage.TERMINAL__CNODE_NAME:
-                return isSetCNodeName();
-            case SclPackage.TERMINAL__CONNECTIVITY_NODE:
-                return isSetConnectivityNode();
-            case SclPackage.TERMINAL__PROCESS_NAME:
-                return isSetProcessName();
-            case SclPackage.TERMINAL__SUBSTATION_NAME:
-                return isSetSubstationName();
-            case SclPackage.TERMINAL__VOLTAGE_LEVEL_NAME:
-                return isSetVoltageLevelName();
-            case SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
-                return getParentAbstractConductingEquipment() != null;
-            case SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE:
-                return isSetRefersToConnectivityNode();
-            case SclPackage.TERMINAL__NAME:
-                return isSetName();
-            case SclPackage.TERMINAL__LINE_NAME:
-                return isSetLineName();
+        switch( featureID ) {
+        case SclPackage.TERMINAL__BAY_NAME:
+            return isSetBayName();
+        case SclPackage.TERMINAL__CNODE_NAME:
+            return isSetCNodeName();
+        case SclPackage.TERMINAL__CONNECTIVITY_NODE:
+            return isSetConnectivityNode();
+        case SclPackage.TERMINAL__PROCESS_NAME:
+            return isSetProcessName();
+        case SclPackage.TERMINAL__SUBSTATION_NAME:
+            return isSetSubstationName();
+        case SclPackage.TERMINAL__VOLTAGE_LEVEL_NAME:
+            return isSetVoltageLevelName();
+        case SclPackage.TERMINAL__PARENT_ABSTRACT_CONDUCTING_EQUIPMENT:
+            return getParentAbstractConductingEquipment() != null;
+        case SclPackage.TERMINAL__REFERS_TO_CONNECTIVITY_NODE:
+            return isSetRefersToConnectivityNode();
+        case SclPackage.TERMINAL__NAME:
+            return isSetName();
+        case SclPackage.TERMINAL__LINE_NAME:
+            return isSetLineName();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -1081,26 +1125,50 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (bayName: ");
-        if (bayNameESet) result.append(bayName); else result.append("<unset>");
-        result.append(", cNodeName: ");
-        if (cNodeNameESet) result.append(cNodeName); else result.append("<unset>");
-        result.append(", connectivityNode: ");
-        if (connectivityNodeESet) result.append(connectivityNode); else result.append("<unset>");
-        result.append(", processName: ");
-        if (processNameESet) result.append(processName); else result.append("<unset>");
-        result.append(", substationName: ");
-        if (substationNameESet) result.append(substationName); else result.append("<unset>");
-        result.append(", voltageLevelName: ");
-        if (voltageLevelNameESet) result.append(voltageLevelName); else result.append("<unset>");
-        result.append(", name: ");
-        if (nameESet) result.append(name); else result.append("<unset>");
-        result.append(", lineName: ");
-        if (lineNameESet) result.append(lineName); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (bayName: " );
+        if( bayNameESet )
+            result.append( bayName );
+        else
+            result.append( "<unset>" );
+        result.append( ", cNodeName: " );
+        if( cNodeNameESet )
+            result.append( cNodeName );
+        else
+            result.append( "<unset>" );
+        result.append( ", connectivityNode: " );
+        if( connectivityNodeESet )
+            result.append( connectivityNode );
+        else
+            result.append( "<unset>" );
+        result.append( ", processName: " );
+        if( processNameESet )
+            result.append( processName );
+        else
+            result.append( "<unset>" );
+        result.append( ", substationName: " );
+        if( substationNameESet )
+            result.append( substationName );
+        else
+            result.append( "<unset>" );
+        result.append( ", voltageLevelName: " );
+        if( voltageLevelNameESet )
+            result.append( voltageLevelName );
+        else
+            result.append( "<unset>" );
+        result.append( ", name: " );
+        if( nameESet )
+            result.append( name );
+        else
+            result.append( "<unset>" );
+        result.append( ", lineName: " );
+        if( lineNameESet )
+            result.append( lineName );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
@@ -1110,7 +1178,7 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         super.doBuildExplicitLinks( console );
 
         String messagePrefix = "[SCL links] while resolving link from Terminal on line " + getLineNumber() + ": ";
-        
+
         if( getSubstationName() != null ) {
             doBuildExplicitLinkWithSubstation( console, messagePrefix );
         }
@@ -1121,7 +1189,7 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
             // TODO: processName ?
         }
     }
-    
+
     private void doBuildExplicitLinkWithSubstation( IRiseClipseConsole console, String messagePrefix ) {
 
         // name             The optional relative name of the terminal at this Equipment. The default is the empty string, which means that the name
@@ -1135,29 +1203,28 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
         // cNodeName        The (relative) name of the connectivityNode within its bay
         // neutralPoint     If true, this terminal connects to a neutral (star) point of all power transformer windings. Default value is false.
 
-        if(( getCNodeName() == null ) || getCNodeName().isEmpty() ) {
+        if( ( getCNodeName() == null ) || getCNodeName().isEmpty() ) {
             console.warning( messagePrefix, "cNodeName is missing" );
             return;
         }
-        if(( getVoltageLevelName() == null ) || getVoltageLevelName().isEmpty() ) {
+        if( ( getVoltageLevelName() == null ) || getVoltageLevelName().isEmpty() ) {
             console.warning( messagePrefix, "voltageLevelName is missing" );
             return;
         }
-        if(( getBayName() == null ) || getBayName().isEmpty() ) {
+        if( ( getBayName() == null ) || getBayName().isEmpty() ) {
             console.warning( messagePrefix, "bayName is missing" );
             return;
         }
 
         // find a Substation with
         //   Substation.name == Terminal.substationName
-        List< Substation > res1 =
-                SclUtilities
+        List< Substation > res1 = SclUtilities
                 .getSCL( this )
                 .getSubstation()
                 .stream()
-                .filter(  s -> getSubstationName().equals( s.getName() ))
+                .filter( s -> getSubstationName().equals( s.getName() ) )
                 .collect( Collectors.toList() );
-        
+
         String mess1 = "Substation( name = " + getSubstationName() + " )";
         if( res1.size() != 1 ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess1, res1.size() );
@@ -1168,13 +1235,12 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
 
         // find a VoltageLevel with
         //   VoltageLevel.name == Terminal.voltageLevelName
-        List< VoltageLevel > res2 =
-                    substation
-                    .getVoltageLevel()
-                    .stream()
-                    .filter(  vl -> getVoltageLevelName().equals( vl.getName() ))
-                    .collect( Collectors.toList() );
-        
+        List< VoltageLevel > res2 = substation
+                .getVoltageLevel()
+                .stream()
+                .filter( vl -> getVoltageLevelName().equals( vl.getName() ) )
+                .collect( Collectors.toList() );
+
         String mess2 = "VoltageLevel( name = " + getVoltageLevelName() + " )";
         if( res2.size() != 1 ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess2, res2.size() );
@@ -1185,13 +1251,12 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
 
         // find a Bay with
         //   Bay.name == Terminal.bayName
-        List< Bay > res3 =
-                voltageLevel
+        List< Bay > res3 = voltageLevel
                 .getBay()
                 .stream()
-                .filter(  b -> getBayName().equals( b.getName() ))
+                .filter( b -> getBayName().equals( b.getName() ) )
                 .collect( Collectors.toList() );
-                
+
         String mess3 = "Bay( name = " + getBayName() + " )";
         if( res3.size() != 1 ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess3, res3.size() );
@@ -1202,38 +1267,37 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
 
         // find a ConnectivityNode with
         //   ConnectivityNode.name == Terminal.bayName
-        List< ConnectivityNode > res4 =
-                bay
+        List< ConnectivityNode > res4 = bay
                 .getConnectivityNode()
                 .stream()
-                .filter( cn -> getCNodeName().equals( cn.getName() ))
+                .filter( cn -> getCNodeName().equals( cn.getName() ) )
                 .collect( Collectors.toList() );
-                
+
         String mess4 = "ConnectivityNode( name = " + getCNodeName() + " )";
         if( res4.size() != 1 ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess4, res4.size() );
             return;
         }
-        setRefersToConnectivityNode( res4.get( 0 ));
-        console.info( "[SCL links] Terminal on line ", getLineNumber(), " refers to ", mess4, " on line ", getRefersToConnectivityNode().getLineNumber() );
+        setRefersToConnectivityNode( res4.get( 0 ) );
+        console.info( "[SCL links] Terminal on line ", getLineNumber(), " refers to ", mess4, " on line ",
+                getRefersToConnectivityNode().getLineNumber() );
     }
 
     private void doBuildExplicitLinkWithLine( IRiseClipseConsole console, String messagePrefix ) {
-        if(( getCNodeName() == null ) || getCNodeName().isEmpty() ) {
+        if( ( getCNodeName() == null ) || getCNodeName().isEmpty() ) {
             console.warning( messagePrefix, "cNodeName is missing" );
             return;
         }
 
         // find a Line with
         //   Line.name == Terminal.lineName
-        List< Line > res1 =
-                SclUtilities
+        List< Line > res1 = SclUtilities
                 .getSCL( this )
                 .getLine()
                 .stream()
-                .filter( l -> getLineName().equals( l.getName() ))
+                .filter( l -> getLineName().equals( l.getName() ) )
                 .collect( Collectors.toList() );
-                
+
         String mess1 = "Line( name = " + getLineName() + " )";
         if( res1.size() != 1 ) {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess1, res1.size() );
@@ -1244,11 +1308,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
 
         // find a ConnectivityNode with
         //   ConnectivityNode.name == Terminal.bayName
-        List< ConnectivityNode > res2 =
-                line.
-                getConnectivityNode()
+        List< ConnectivityNode > res2 = line.getConnectivityNode()
                 .stream()
-                .filter( cn -> getCNodeName().equals( cn.getName() ))
+                .filter( cn -> getCNodeName().equals( cn.getName() ) )
                 .collect( Collectors.toList() );
 
         String mess2 = "ConnectivityNode( name = " + getCNodeName() + " )";
@@ -1256,8 +1318,9 @@ public class TerminalImpl extends UnNamingImpl implements Terminal {
             SclUtilities.displayNotFoundWarning( console, messagePrefix, mess2, res2.size() );
             return;
         }
-        setRefersToConnectivityNode( res2.get( 0 ));
-        console.info( "[SCL links] Terminal on line ", getLineNumber(), " refers to ", mess2 + " on line ", getRefersToConnectivityNode().getLineNumber() );
+        setRefersToConnectivityNode( res2.get( 0 ) );
+        console.info( "[SCL links] Terminal on line ", getLineNumber(), " refers to ", mess2 + " on line ",
+                getRefersToConnectivityNode().getLineNumber() );
     }
 
 } //TerminalImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TextImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TextImpl.java
index bbb7a77..3d93534 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TextImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TextImpl.java
@@ -138,8 +138,9 @@ public class TextImpl extends SclObjectImpl implements Text {
         source = newSource;
         boolean oldSourceESet = sourceESet;
         sourceESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TEXT__SOURCE, oldSource, source, !oldSourceESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TEXT__SOURCE, oldSource, source,
+                    !oldSourceESet ) );
     }
 
     /**
@@ -153,8 +154,9 @@ public class TextImpl extends SclObjectImpl implements Text {
         boolean oldSourceESet = sourceESet;
         source = SOURCE_EDEFAULT;
         sourceESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TEXT__SOURCE, oldSource, SOURCE_EDEFAULT, oldSourceESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TEXT__SOURCE, oldSource,
+                    SOURCE_EDEFAULT, oldSourceESet ) );
     }
 
     /**
@@ -174,8 +176,8 @@ public class TextImpl extends SclObjectImpl implements Text {
      */
     @Override
     public BaseElement getParentBaseElement() {
-        if (eContainerFeatureID() != SclPackage.TEXT__PARENT_BASE_ELEMENT) return null;
-        return (BaseElement)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.TEXT__PARENT_BASE_ELEMENT ) return null;
+        return ( BaseElement ) eInternalContainer();
     }
 
     /**
@@ -183,8 +185,9 @@ public class TextImpl extends SclObjectImpl implements Text {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentBaseElement(BaseElement newParentBaseElement, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentBaseElement, SclPackage.TEXT__PARENT_BASE_ELEMENT, msgs);
+    public NotificationChain basicSetParentBaseElement( BaseElement newParentBaseElement, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentBaseElement, SclPackage.TEXT__PARENT_BASE_ELEMENT,
+                msgs );
         return msgs;
     }
 
@@ -194,20 +197,23 @@ public class TextImpl extends SclObjectImpl implements Text {
      * @generated
      */
     @Override
-    public void setParentBaseElement(BaseElement newParentBaseElement) {
-        if (newParentBaseElement != eInternalContainer() || (eContainerFeatureID() != SclPackage.TEXT__PARENT_BASE_ELEMENT && newParentBaseElement != null)) {
-            if (EcoreUtil.isAncestor(this, newParentBaseElement))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentBaseElement( BaseElement newParentBaseElement ) {
+        if( newParentBaseElement != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.TEXT__PARENT_BASE_ELEMENT && newParentBaseElement != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentBaseElement ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentBaseElement != null)
-                msgs = ((InternalEObject)newParentBaseElement).eInverseAdd(this, SclPackage.BASE_ELEMENT__TEXT, BaseElement.class, msgs);
-            msgs = basicSetParentBaseElement(newParentBaseElement, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentBaseElement != null )
+                msgs = ( ( InternalEObject ) newParentBaseElement ).eInverseAdd( this, SclPackage.BASE_ELEMENT__TEXT,
+                        BaseElement.class, msgs );
+            msgs = basicSetParentBaseElement( newParentBaseElement, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TEXT__PARENT_BASE_ELEMENT, newParentBaseElement, newParentBaseElement));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TEXT__PARENT_BASE_ELEMENT,
+                    newParentBaseElement, newParentBaseElement ) );
     }
 
     /**
@@ -217,8 +223,8 @@ public class TextImpl extends SclObjectImpl implements Text {
      */
     @Override
     public Header getParentHeader() {
-        if (eContainerFeatureID() != SclPackage.TEXT__PARENT_HEADER) return null;
-        return (Header)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.TEXT__PARENT_HEADER ) return null;
+        return ( Header ) eInternalContainer();
     }
 
     /**
@@ -226,8 +232,8 @@ public class TextImpl extends SclObjectImpl implements Text {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentHeader(Header newParentHeader, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentHeader, SclPackage.TEXT__PARENT_HEADER, msgs);
+    public NotificationChain basicSetParentHeader( Header newParentHeader, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentHeader, SclPackage.TEXT__PARENT_HEADER, msgs );
         return msgs;
     }
 
@@ -237,20 +243,23 @@ public class TextImpl extends SclObjectImpl implements Text {
      * @generated
      */
     @Override
-    public void setParentHeader(Header newParentHeader) {
-        if (newParentHeader != eInternalContainer() || (eContainerFeatureID() != SclPackage.TEXT__PARENT_HEADER && newParentHeader != null)) {
-            if (EcoreUtil.isAncestor(this, newParentHeader))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentHeader( Header newParentHeader ) {
+        if( newParentHeader != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.TEXT__PARENT_HEADER && newParentHeader != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentHeader ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentHeader != null)
-                msgs = ((InternalEObject)newParentHeader).eInverseAdd(this, SclPackage.HEADER__TEXT, Header.class, msgs);
-            msgs = basicSetParentHeader(newParentHeader, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentHeader != null )
+                msgs = ( ( InternalEObject ) newParentHeader ).eInverseAdd( this, SclPackage.HEADER__TEXT, Header.class,
+                        msgs );
+            msgs = basicSetParentHeader( newParentHeader, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TEXT__PARENT_HEADER, newParentHeader, newParentHeader));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TEXT__PARENT_HEADER, newParentHeader,
+                    newParentHeader ) );
     }
 
     /**
@@ -272,8 +281,8 @@ public class TextImpl extends SclObjectImpl implements Text {
     public void setValue( String newValue ) {
         String oldValue = value;
         value = newValue;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TEXT__VALUE, oldValue, value));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TEXT__VALUE, oldValue, value ) );
     }
 
     /**
@@ -283,17 +292,17 @@ public class TextImpl extends SclObjectImpl implements Text {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.TEXT__PARENT_BASE_ELEMENT:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentBaseElement((BaseElement)otherEnd, msgs);
-            case SclPackage.TEXT__PARENT_HEADER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentHeader((Header)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.TEXT__PARENT_BASE_ELEMENT:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentBaseElement( ( BaseElement ) otherEnd, msgs );
+        case SclPackage.TEXT__PARENT_HEADER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentHeader( ( Header ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -303,13 +312,13 @@ public class TextImpl extends SclObjectImpl implements Text {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.TEXT__PARENT_BASE_ELEMENT:
-                return basicSetParentBaseElement(null, msgs);
-            case SclPackage.TEXT__PARENT_HEADER:
-                return basicSetParentHeader(null, msgs);
+        switch( featureID ) {
+        case SclPackage.TEXT__PARENT_BASE_ELEMENT:
+            return basicSetParentBaseElement( null, msgs );
+        case SclPackage.TEXT__PARENT_HEADER:
+            return basicSetParentHeader( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -319,13 +328,13 @@ public class TextImpl extends SclObjectImpl implements Text {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.TEXT__PARENT_BASE_ELEMENT:
-                return eInternalContainer().eInverseRemove(this, SclPackage.BASE_ELEMENT__TEXT, BaseElement.class, msgs);
-            case SclPackage.TEXT__PARENT_HEADER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.HEADER__TEXT, Header.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.TEXT__PARENT_BASE_ELEMENT:
+            return eInternalContainer().eInverseRemove( this, SclPackage.BASE_ELEMENT__TEXT, BaseElement.class, msgs );
+        case SclPackage.TEXT__PARENT_HEADER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.HEADER__TEXT, Header.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -335,17 +344,17 @@ public class TextImpl extends SclObjectImpl implements Text {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.TEXT__SOURCE:
-                return getSource();
-            case SclPackage.TEXT__PARENT_BASE_ELEMENT:
-                return getParentBaseElement();
-            case SclPackage.TEXT__PARENT_HEADER:
-                return getParentHeader();
-            case SclPackage.TEXT__VALUE:
-                return getValue();
+        switch( featureID ) {
+        case SclPackage.TEXT__SOURCE:
+            return getSource();
+        case SclPackage.TEXT__PARENT_BASE_ELEMENT:
+            return getParentBaseElement();
+        case SclPackage.TEXT__PARENT_HEADER:
+            return getParentHeader();
+        case SclPackage.TEXT__VALUE:
+            return getValue();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -355,21 +364,21 @@ public class TextImpl extends SclObjectImpl implements Text {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.TEXT__SOURCE:
-                setSource((String)newValue);
-                return;
-            case SclPackage.TEXT__PARENT_BASE_ELEMENT:
-                setParentBaseElement((BaseElement)newValue);
-                return;
-            case SclPackage.TEXT__PARENT_HEADER:
-                setParentHeader((Header)newValue);
-                return;
-            case SclPackage.TEXT__VALUE:
-                setValue((String)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.TEXT__SOURCE:
+            setSource( ( String ) newValue );
+            return;
+        case SclPackage.TEXT__PARENT_BASE_ELEMENT:
+            setParentBaseElement( ( BaseElement ) newValue );
+            return;
+        case SclPackage.TEXT__PARENT_HEADER:
+            setParentHeader( ( Header ) newValue );
+            return;
+        case SclPackage.TEXT__VALUE:
+            setValue( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -379,21 +388,21 @@ public class TextImpl extends SclObjectImpl implements Text {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.TEXT__SOURCE:
-                unsetSource();
-                return;
-            case SclPackage.TEXT__PARENT_BASE_ELEMENT:
-                setParentBaseElement((BaseElement)null);
-                return;
-            case SclPackage.TEXT__PARENT_HEADER:
-                setParentHeader((Header)null);
-                return;
-            case SclPackage.TEXT__VALUE:
-                setValue(VALUE_EDEFAULT);
-                return;
+        switch( featureID ) {
+        case SclPackage.TEXT__SOURCE:
+            unsetSource();
+            return;
+        case SclPackage.TEXT__PARENT_BASE_ELEMENT:
+            setParentBaseElement( ( BaseElement ) null );
+            return;
+        case SclPackage.TEXT__PARENT_HEADER:
+            setParentHeader( ( Header ) null );
+            return;
+        case SclPackage.TEXT__VALUE:
+            setValue( VALUE_EDEFAULT );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -403,17 +412,17 @@ public class TextImpl extends SclObjectImpl implements Text {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.TEXT__SOURCE:
-                return isSetSource();
-            case SclPackage.TEXT__PARENT_BASE_ELEMENT:
-                return getParentBaseElement() != null;
-            case SclPackage.TEXT__PARENT_HEADER:
-                return getParentHeader() != null;
-            case SclPackage.TEXT__VALUE:
-                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+        switch( featureID ) {
+        case SclPackage.TEXT__SOURCE:
+            return isSetSource();
+        case SclPackage.TEXT__PARENT_BASE_ELEMENT:
+            return getParentBaseElement() != null;
+        case SclPackage.TEXT__PARENT_HEADER:
+            return getParentHeader() != null;
+        case SclPackage.TEXT__VALUE:
+            return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals( value );
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -423,14 +432,17 @@ public class TextImpl extends SclObjectImpl implements Text {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (source: ");
-        if (sourceESet) result.append(source); else result.append("<unset>");
-        result.append(", value: ");
-        result.append(value);
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (source: " );
+        if( sourceESet )
+            result.append( source );
+        else
+            result.append( "<unset>" );
+        result.append( ", value: " );
+        result.append( value );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TimeSyncProtImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TimeSyncProtImpl.java
index ef1a351..e499ec2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TimeSyncProtImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TimeSyncProtImpl.java
@@ -207,8 +207,9 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
         c37_238 = newC37_238;
         boolean oldC37_238ESet = c37_238ESet;
         c37_238ESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TIME_SYNC_PROT__C37_238, oldC37_238, c37_238, !oldC37_238ESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TIME_SYNC_PROT__C37_238, oldC37_238,
+                    c37_238, !oldC37_238ESet ) );
     }
 
     /**
@@ -222,8 +223,9 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
         boolean oldC37_238ESet = c37_238ESet;
         c37_238 = C37_238_EDEFAULT;
         c37_238ESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TIME_SYNC_PROT__C37_238, oldC37_238, C37_238_EDEFAULT, oldC37_238ESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TIME_SYNC_PROT__C37_238, oldC37_238,
+                    C37_238_EDEFAULT, oldC37_238ESet ) );
     }
 
     /**
@@ -257,8 +259,9 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
         other = newOther;
         boolean oldOtherESet = otherESet;
         otherESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TIME_SYNC_PROT__OTHER, oldOther, other, !oldOtherESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TIME_SYNC_PROT__OTHER, oldOther, other,
+                    !oldOtherESet ) );
     }
 
     /**
@@ -272,8 +275,9 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
         boolean oldOtherESet = otherESet;
         other = OTHER_EDEFAULT;
         otherESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TIME_SYNC_PROT__OTHER, oldOther, OTHER_EDEFAULT, oldOtherESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TIME_SYNC_PROT__OTHER, oldOther,
+                    OTHER_EDEFAULT, oldOtherESet ) );
     }
 
     /**
@@ -307,8 +311,9 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
         sntp = newSntp;
         boolean oldSntpESet = sntpESet;
         sntpESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TIME_SYNC_PROT__SNTP, oldSntp, sntp, !oldSntpESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TIME_SYNC_PROT__SNTP, oldSntp, sntp,
+                    !oldSntpESet ) );
     }
 
     /**
@@ -322,8 +327,9 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
         boolean oldSntpESet = sntpESet;
         sntp = SNTP_EDEFAULT;
         sntpESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TIME_SYNC_PROT__SNTP, oldSntp, SNTP_EDEFAULT, oldSntpESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TIME_SYNC_PROT__SNTP, oldSntp,
+                    SNTP_EDEFAULT, oldSntpESet ) );
     }
 
     /**
@@ -343,8 +349,8 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      */
     @Override
     public ClientServices getParentClientServices() {
-        if (eContainerFeatureID() != SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES) return null;
-        return (ClientServices)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES ) return null;
+        return ( ClientServices ) eInternalContainer();
     }
 
     /**
@@ -352,8 +358,10 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentClientServices(ClientServices newParentClientServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentClientServices, SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES, msgs);
+    public NotificationChain basicSetParentClientServices( ClientServices newParentClientServices,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentClientServices,
+                SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -363,20 +371,24 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      * @generated
      */
     @Override
-    public void setParentClientServices(ClientServices newParentClientServices) {
-        if (newParentClientServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES && newParentClientServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentClientServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentClientServices( ClientServices newParentClientServices ) {
+        if( newParentClientServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES
+                        && newParentClientServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentClientServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentClientServices != null)
-                msgs = ((InternalEObject)newParentClientServices).eInverseAdd(this, SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT, ClientServices.class, msgs);
-            msgs = basicSetParentClientServices(newParentClientServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentClientServices != null )
+                msgs = ( ( InternalEObject ) newParentClientServices ).eInverseAdd( this,
+                        SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT, ClientServices.class, msgs );
+            msgs = basicSetParentClientServices( newParentClientServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES, newParentClientServices, newParentClientServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES,
+                    newParentClientServices, newParentClientServices ) );
     }
 
     /**
@@ -386,8 +398,8 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.TIME_SYNC_PROT__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.TIME_SYNC_PROT__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -395,8 +407,9 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.TIME_SYNC_PROT__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.TIME_SYNC_PROT__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -406,20 +419,24 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.TIME_SYNC_PROT__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.TIME_SYNC_PROT__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__TIME_SYNC_PROT, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__TIME_SYNC_PROT,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TIME_SYNC_PROT__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TIME_SYNC_PROT__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -438,13 +455,14 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      * @generated
      */
     @Override
-    public void setIec61850_9_3(Boolean newIec61850_9_3) {
+    public void setIec61850_9_3( Boolean newIec61850_9_3 ) {
         Boolean oldIec61850_9_3 = iec61850_9_3;
         iec61850_9_3 = newIec61850_9_3;
         boolean oldIec61850_9_3ESet = iec61850_9_3ESet;
         iec61850_9_3ESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TIME_SYNC_PROT__IEC61850_93, oldIec61850_9_3, iec61850_9_3, !oldIec61850_9_3ESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TIME_SYNC_PROT__IEC61850_93,
+                    oldIec61850_9_3, iec61850_9_3, !oldIec61850_9_3ESet ) );
     }
 
     /**
@@ -458,8 +476,9 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
         boolean oldIec61850_9_3ESet = iec61850_9_3ESet;
         iec61850_9_3 = IEC61850_93_EDEFAULT;
         iec61850_9_3ESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TIME_SYNC_PROT__IEC61850_93, oldIec61850_9_3, IEC61850_93_EDEFAULT, oldIec61850_9_3ESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TIME_SYNC_PROT__IEC61850_93,
+                    oldIec61850_9_3, IEC61850_93_EDEFAULT, oldIec61850_9_3ESet ) );
     }
 
     /**
@@ -479,17 +498,17 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentClientServices((ClientServices)otherEnd, msgs);
-            case SclPackage.TIME_SYNC_PROT__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentClientServices( ( ClientServices ) otherEnd, msgs );
+        case SclPackage.TIME_SYNC_PROT__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -499,13 +518,13 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES:
-                return basicSetParentClientServices(null, msgs);
-            case SclPackage.TIME_SYNC_PROT__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES:
+            return basicSetParentClientServices( null, msgs );
+        case SclPackage.TIME_SYNC_PROT__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -515,13 +534,15 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT, ClientServices.class, msgs);
-            case SclPackage.TIME_SYNC_PROT__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__TIME_SYNC_PROT, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.CLIENT_SERVICES__TIME_SYNC_PROT,
+                    ClientServices.class, msgs );
+        case SclPackage.TIME_SYNC_PROT__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__TIME_SYNC_PROT, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -531,21 +552,21 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.TIME_SYNC_PROT__C37_238:
-                return getC37_238();
-            case SclPackage.TIME_SYNC_PROT__OTHER:
-                return getOther();
-            case SclPackage.TIME_SYNC_PROT__SNTP:
-                return getSntp();
-            case SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES:
-                return getParentClientServices();
-            case SclPackage.TIME_SYNC_PROT__PARENT_SERVICES:
-                return getParentServices();
-            case SclPackage.TIME_SYNC_PROT__IEC61850_93:
-                return getIec61850_9_3();
+        switch( featureID ) {
+        case SclPackage.TIME_SYNC_PROT__C37_238:
+            return getC37_238();
+        case SclPackage.TIME_SYNC_PROT__OTHER:
+            return getOther();
+        case SclPackage.TIME_SYNC_PROT__SNTP:
+            return getSntp();
+        case SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES:
+            return getParentClientServices();
+        case SclPackage.TIME_SYNC_PROT__PARENT_SERVICES:
+            return getParentServices();
+        case SclPackage.TIME_SYNC_PROT__IEC61850_93:
+            return getIec61850_9_3();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -555,27 +576,27 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.TIME_SYNC_PROT__C37_238:
-                setC37_238((Boolean)newValue);
-                return;
-            case SclPackage.TIME_SYNC_PROT__OTHER:
-                setOther((Boolean)newValue);
-                return;
-            case SclPackage.TIME_SYNC_PROT__SNTP:
-                setSntp((Boolean)newValue);
-                return;
-            case SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES:
-                setParentClientServices((ClientServices)newValue);
-                return;
-            case SclPackage.TIME_SYNC_PROT__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
-            case SclPackage.TIME_SYNC_PROT__IEC61850_93:
-                setIec61850_9_3((Boolean)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.TIME_SYNC_PROT__C37_238:
+            setC37_238( ( Boolean ) newValue );
+            return;
+        case SclPackage.TIME_SYNC_PROT__OTHER:
+            setOther( ( Boolean ) newValue );
+            return;
+        case SclPackage.TIME_SYNC_PROT__SNTP:
+            setSntp( ( Boolean ) newValue );
+            return;
+        case SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES:
+            setParentClientServices( ( ClientServices ) newValue );
+            return;
+        case SclPackage.TIME_SYNC_PROT__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
+        case SclPackage.TIME_SYNC_PROT__IEC61850_93:
+            setIec61850_9_3( ( Boolean ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -585,27 +606,27 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.TIME_SYNC_PROT__C37_238:
-                unsetC37_238();
-                return;
-            case SclPackage.TIME_SYNC_PROT__OTHER:
-                unsetOther();
-                return;
-            case SclPackage.TIME_SYNC_PROT__SNTP:
-                unsetSntp();
-                return;
-            case SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES:
-                setParentClientServices((ClientServices)null);
-                return;
-            case SclPackage.TIME_SYNC_PROT__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
-            case SclPackage.TIME_SYNC_PROT__IEC61850_93:
-                unsetIec61850_9_3();
-                return;
+        switch( featureID ) {
+        case SclPackage.TIME_SYNC_PROT__C37_238:
+            unsetC37_238();
+            return;
+        case SclPackage.TIME_SYNC_PROT__OTHER:
+            unsetOther();
+            return;
+        case SclPackage.TIME_SYNC_PROT__SNTP:
+            unsetSntp();
+            return;
+        case SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES:
+            setParentClientServices( ( ClientServices ) null );
+            return;
+        case SclPackage.TIME_SYNC_PROT__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
+        case SclPackage.TIME_SYNC_PROT__IEC61850_93:
+            unsetIec61850_9_3();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -615,21 +636,21 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.TIME_SYNC_PROT__C37_238:
-                return isSetC37_238();
-            case SclPackage.TIME_SYNC_PROT__OTHER:
-                return isSetOther();
-            case SclPackage.TIME_SYNC_PROT__SNTP:
-                return isSetSntp();
-            case SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES:
-                return getParentClientServices() != null;
-            case SclPackage.TIME_SYNC_PROT__PARENT_SERVICES:
-                return getParentServices() != null;
-            case SclPackage.TIME_SYNC_PROT__IEC61850_93:
-                return isSetIec61850_9_3();
+        switch( featureID ) {
+        case SclPackage.TIME_SYNC_PROT__C37_238:
+            return isSetC37_238();
+        case SclPackage.TIME_SYNC_PROT__OTHER:
+            return isSetOther();
+        case SclPackage.TIME_SYNC_PROT__SNTP:
+            return isSetSntp();
+        case SclPackage.TIME_SYNC_PROT__PARENT_CLIENT_SERVICES:
+            return getParentClientServices() != null;
+        case SclPackage.TIME_SYNC_PROT__PARENT_SERVICES:
+            return getParentServices() != null;
+        case SclPackage.TIME_SYNC_PROT__IEC61850_93:
+            return isSetIec61850_9_3();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -639,18 +660,30 @@ public class TimeSyncProtImpl extends SclObjectImpl implements TimeSyncProt {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (c37_238: ");
-        if (c37_238ESet) result.append(c37_238); else result.append("<unset>");
-        result.append(", other: ");
-        if (otherESet) result.append(other); else result.append("<unset>");
-        result.append(", sntp: ");
-        if (sntpESet) result.append(sntp); else result.append("<unset>");
-        result.append(", iec61850_9_3: ");
-        if (iec61850_9_3ESet) result.append(iec61850_9_3); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (c37_238: " );
+        if( c37_238ESet )
+            result.append( c37_238 );
+        else
+            result.append( "<unset>" );
+        result.append( ", other: " );
+        if( otherESet )
+            result.append( other );
+        else
+            result.append( "<unset>" );
+        result.append( ", sntp: " );
+        if( sntpESet )
+            result.append( sntp );
+        else
+            result.append( "<unset>" );
+        result.append( ", iec61850_9_3: " );
+        if( iec61850_9_3ESet )
+            result.append( iec61850_9_3 );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TimerActivatedControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TimerActivatedControlImpl.java
index ae441b3..c0c6f75 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TimerActivatedControlImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TimerActivatedControlImpl.java
@@ -71,8 +71,8 @@ public class TimerActivatedControlImpl extends ServiceYesNoImpl implements Timer
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -80,8 +80,9 @@ public class TimerActivatedControlImpl extends ServiceYesNoImpl implements Timer
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices,
+                SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES, msgs );
         return msgs;
     }
 
@@ -91,20 +92,24 @@ public class TimerActivatedControlImpl extends ServiceYesNoImpl implements Timer
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this,
+                        SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL, Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -114,13 +119,13 @@ public class TimerActivatedControlImpl extends ServiceYesNoImpl implements Timer
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -130,11 +135,11 @@ public class TimerActivatedControlImpl extends ServiceYesNoImpl implements Timer
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -144,11 +149,12 @@ public class TimerActivatedControlImpl extends ServiceYesNoImpl implements Timer
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__TIMER_ACTIVATED_CONTROL,
+                    Services.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -158,11 +164,11 @@ public class TimerActivatedControlImpl extends ServiceYesNoImpl implements Timer
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -172,12 +178,12 @@ public class TimerActivatedControlImpl extends ServiceYesNoImpl implements Timer
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -187,12 +193,12 @@ public class TimerActivatedControlImpl extends ServiceYesNoImpl implements Timer
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -202,11 +208,11 @@ public class TimerActivatedControlImpl extends ServiceYesNoImpl implements Timer
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.TIMER_ACTIVATED_CONTROL__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //TimerActivatedControlImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TransformerWindingImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TransformerWindingImpl.java
index a8cef77..62488db 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TransformerWindingImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TransformerWindingImpl.java
@@ -93,7 +93,7 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      * @generated
      * @ordered
      */
-    protected EList<EqFunction> eqFunction;
+    protected EList< EqFunction > eqFunction;
 
     /**
      * The cached value of the '{@link #getNeutralPoint() <em>Neutral Point</em>}' containment reference.
@@ -173,8 +173,9 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
         type = newType;
         boolean oldTypeESet = typeESet;
         typeESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TRANSFORMER_WINDING__TYPE, oldType, type, !oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TRANSFORMER_WINDING__TYPE, oldType, type,
+                    !oldTypeESet ) );
     }
 
     /**
@@ -188,8 +189,9 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
         boolean oldTypeESet = typeESet;
         type = TYPE_EDEFAULT;
         typeESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TRANSFORMER_WINDING__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TRANSFORMER_WINDING__TYPE, oldType,
+                    TYPE_EDEFAULT, oldTypeESet ) );
     }
 
     /**
@@ -208,9 +210,10 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      * @generated
      */
     @Override
-    public EList<EqFunction> getEqFunction() {
-        if (eqFunction == null) {
-            eqFunction = new EObjectContainmentWithInverseEList.Unsettable<EqFunction>(EqFunction.class, this, SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION, SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING);
+    public EList< EqFunction > getEqFunction() {
+        if( eqFunction == null ) {
+            eqFunction = new EObjectContainmentWithInverseEList.Unsettable< EqFunction >( EqFunction.class, this,
+                    SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION, SclPackage.EQ_FUNCTION__PARENT_TRANSFORMER_WINDING );
         }
         return eqFunction;
     }
@@ -222,7 +225,7 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      */
     @Override
     public void unsetEqFunction() {
-        if (eqFunction != null) ((InternalEList.Unsettable<?>)eqFunction).unset();
+        if( eqFunction != null ) ( ( InternalEList.Unsettable< ? > ) eqFunction ).unset();
     }
 
     /**
@@ -232,7 +235,7 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      */
     @Override
     public boolean isSetEqFunction() {
-        return eqFunction != null && ((InternalEList.Unsettable<?>)eqFunction).isSet();
+        return eqFunction != null && ( ( InternalEList.Unsettable< ? > ) eqFunction ).isSet();
     }
 
     /**
@@ -255,9 +258,14 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
         neutralPoint = newNeutralPoint;
         boolean oldNeutralPointESet = neutralPointESet;
         neutralPointESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT, oldNeutralPoint, newNeutralPoint, !oldNeutralPointESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT, oldNeutralPoint, newNeutralPoint,
+                    !oldNeutralPointESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -269,20 +277,23 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      */
     @Override
     public void setNeutralPoint( NeutralPoint newNeutralPoint ) {
-        if (newNeutralPoint != neutralPoint) {
+        if( newNeutralPoint != neutralPoint ) {
             NotificationChain msgs = null;
-            if (neutralPoint != null)
-                msgs = ((InternalEObject)neutralPoint).eInverseRemove(this, SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING, NeutralPoint.class, msgs);
-            if (newNeutralPoint != null)
-                msgs = ((InternalEObject)newNeutralPoint).eInverseAdd(this, SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING, NeutralPoint.class, msgs);
-            msgs = basicSetNeutralPoint(newNeutralPoint, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( neutralPoint != null )
+                msgs = ( ( InternalEObject ) neutralPoint ).eInverseRemove( this,
+                        SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING, NeutralPoint.class, msgs );
+            if( newNeutralPoint != null )
+                msgs = ( ( InternalEObject ) newNeutralPoint ).eInverseAdd( this,
+                        SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING, NeutralPoint.class, msgs );
+            msgs = basicSetNeutralPoint( newNeutralPoint, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldNeutralPointESet = neutralPointESet;
             neutralPointESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT, newNeutralPoint, newNeutralPoint, !oldNeutralPointESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT,
+                        newNeutralPoint, newNeutralPoint, !oldNeutralPointESet ) );
         }
     }
 
@@ -296,9 +307,13 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
         neutralPoint = null;
         boolean oldNeutralPointESet = neutralPointESet;
         neutralPointESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT, oldNeutralPoint, null, oldNeutralPointESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT, oldNeutralPoint, null, oldNeutralPointESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -310,17 +325,19 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      */
     @Override
     public void unsetNeutralPoint() {
-        if (neutralPoint != null) {
+        if( neutralPoint != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)neutralPoint).eInverseRemove(this, SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING, NeutralPoint.class, msgs);
-            msgs = basicUnsetNeutralPoint(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) neutralPoint ).eInverseRemove( this,
+                    SclPackage.NEUTRAL_POINT__PARENT_TRANSFORMER_WINDING, NeutralPoint.class, msgs );
+            msgs = basicUnsetNeutralPoint( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldNeutralPointESet = neutralPointESet;
             neutralPointESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT, null, null, oldNeutralPointESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT,
+                        null, null, oldNeutralPointESet ) );
         }
     }
 
@@ -341,8 +358,8 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      */
     @Override
     public PowerTransformer getParentPowerTransformer() {
-        if (eContainerFeatureID() != SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER) return null;
-        return (PowerTransformer)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER ) return null;
+        return ( PowerTransformer ) eInternalContainer();
     }
 
     /**
@@ -350,8 +367,10 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentPowerTransformer(PowerTransformer newParentPowerTransformer, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentPowerTransformer, SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER, msgs);
+    public NotificationChain basicSetParentPowerTransformer( PowerTransformer newParentPowerTransformer,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentPowerTransformer,
+                SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER, msgs );
         return msgs;
     }
 
@@ -361,20 +380,25 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      * @generated
      */
     @Override
-    public void setParentPowerTransformer(PowerTransformer newParentPowerTransformer) {
-        if (newParentPowerTransformer != eInternalContainer() || (eContainerFeatureID() != SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER && newParentPowerTransformer != null)) {
-            if (EcoreUtil.isAncestor(this, newParentPowerTransformer))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentPowerTransformer( PowerTransformer newParentPowerTransformer ) {
+        if( newParentPowerTransformer != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER
+                        && newParentPowerTransformer != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentPowerTransformer ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentPowerTransformer != null)
-                msgs = ((InternalEObject)newParentPowerTransformer).eInverseAdd(this, SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING, PowerTransformer.class, msgs);
-            msgs = basicSetParentPowerTransformer(newParentPowerTransformer, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentPowerTransformer != null )
+                msgs = ( ( InternalEObject ) newParentPowerTransformer ).eInverseAdd( this,
+                        SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING, PowerTransformer.class, msgs );
+            msgs = basicSetParentPowerTransformer( newParentPowerTransformer, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER, newParentPowerTransformer, newParentPowerTransformer));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET,
+                    SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER, newParentPowerTransformer,
+                    newParentPowerTransformer ) );
     }
 
     /**
@@ -397,9 +421,13 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
         tapChanger = newTapChanger;
         boolean oldTapChangerESet = tapChangerESet;
         tapChangerESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.TRANSFORMER_WINDING__TAP_CHANGER, oldTapChanger, newTapChanger, !oldTapChangerESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.TRANSFORMER_WINDING__TAP_CHANGER, oldTapChanger, newTapChanger, !oldTapChangerESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -411,20 +439,23 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      */
     @Override
     public void setTapChanger( TapChanger newTapChanger ) {
-        if (newTapChanger != tapChanger) {
+        if( newTapChanger != tapChanger ) {
             NotificationChain msgs = null;
-            if (tapChanger != null)
-                msgs = ((InternalEObject)tapChanger).eInverseRemove(this, SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING, TapChanger.class, msgs);
-            if (newTapChanger != null)
-                msgs = ((InternalEObject)newTapChanger).eInverseAdd(this, SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING, TapChanger.class, msgs);
-            msgs = basicSetTapChanger(newTapChanger, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( tapChanger != null )
+                msgs = ( ( InternalEObject ) tapChanger ).eInverseRemove( this,
+                        SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING, TapChanger.class, msgs );
+            if( newTapChanger != null )
+                msgs = ( ( InternalEObject ) newTapChanger ).eInverseAdd( this,
+                        SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING, TapChanger.class, msgs );
+            msgs = basicSetTapChanger( newTapChanger, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldTapChangerESet = tapChangerESet;
             tapChangerESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TRANSFORMER_WINDING__TAP_CHANGER, newTapChanger, newTapChanger, !oldTapChangerESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TRANSFORMER_WINDING__TAP_CHANGER,
+                        newTapChanger, newTapChanger, !oldTapChangerESet ) );
         }
     }
 
@@ -438,9 +469,13 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
         tapChanger = null;
         boolean oldTapChangerESet = tapChangerESet;
         tapChangerESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.TRANSFORMER_WINDING__TAP_CHANGER, oldTapChanger, null, oldTapChangerESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.TRANSFORMER_WINDING__TAP_CHANGER, oldTapChanger, null, oldTapChangerESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -452,17 +487,19 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      */
     @Override
     public void unsetTapChanger() {
-        if (tapChanger != null) {
+        if( tapChanger != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)tapChanger).eInverseRemove(this, SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING, TapChanger.class, msgs);
-            msgs = basicUnsetTapChanger(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) tapChanger ).eInverseRemove( this,
+                    SclPackage.TAP_CHANGER__PARENT_TRANSFORMER_WINDING, TapChanger.class, msgs );
+            msgs = basicUnsetTapChanger( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldTapChangerESet = tapChangerESet;
             tapChangerESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TRANSFORMER_WINDING__TAP_CHANGER, null, null, oldTapChangerESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TRANSFORMER_WINDING__TAP_CHANGER,
+                        null, null, oldTapChangerESet ) );
         }
     }
 
@@ -484,23 +521,26 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getEqFunction()).basicAdd(otherEnd, msgs);
-            case SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT:
-                if (neutralPoint != null)
-                    msgs = ((InternalEObject)neutralPoint).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT, null, msgs);
-                return basicSetNeutralPoint((NeutralPoint)otherEnd, msgs);
-            case SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentPowerTransformer((PowerTransformer)otherEnd, msgs);
-            case SclPackage.TRANSFORMER_WINDING__TAP_CHANGER:
-                if (tapChanger != null)
-                    msgs = ((InternalEObject)tapChanger).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.TRANSFORMER_WINDING__TAP_CHANGER, null, msgs);
-                return basicSetTapChanger((TapChanger)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getEqFunction() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT:
+            if( neutralPoint != null )
+                msgs = ( ( InternalEObject ) neutralPoint ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT, null, msgs );
+            return basicSetNeutralPoint( ( NeutralPoint ) otherEnd, msgs );
+        case SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentPowerTransformer( ( PowerTransformer ) otherEnd, msgs );
+        case SclPackage.TRANSFORMER_WINDING__TAP_CHANGER:
+            if( tapChanger != null )
+                msgs = ( ( InternalEObject ) tapChanger ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.TRANSFORMER_WINDING__TAP_CHANGER, null, msgs );
+            return basicSetTapChanger( ( TapChanger ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -510,17 +550,17 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION:
-                return ((InternalEList<?>)getEqFunction()).basicRemove(otherEnd, msgs);
-            case SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT:
-                return basicUnsetNeutralPoint(msgs);
-            case SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER:
-                return basicSetParentPowerTransformer(null, msgs);
-            case SclPackage.TRANSFORMER_WINDING__TAP_CHANGER:
-                return basicUnsetTapChanger(msgs);
+        switch( featureID ) {
+        case SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION:
+            return ( ( InternalEList< ? > ) getEqFunction() ).basicRemove( otherEnd, msgs );
+        case SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT:
+            return basicUnsetNeutralPoint( msgs );
+        case SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER:
+            return basicSetParentPowerTransformer( null, msgs );
+        case SclPackage.TRANSFORMER_WINDING__TAP_CHANGER:
+            return basicUnsetTapChanger( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -530,11 +570,12 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER:
-                return eInternalContainer().eInverseRemove(this, SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING, PowerTransformer.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER:
+            return eInternalContainer().eInverseRemove( this, SclPackage.POWER_TRANSFORMER__TRANSFORMER_WINDING,
+                    PowerTransformer.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -544,19 +585,19 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.TRANSFORMER_WINDING__TYPE:
-                return getType();
-            case SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION:
-                return getEqFunction();
-            case SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT:
-                return getNeutralPoint();
-            case SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER:
-                return getParentPowerTransformer();
-            case SclPackage.TRANSFORMER_WINDING__TAP_CHANGER:
-                return getTapChanger();
+        switch( featureID ) {
+        case SclPackage.TRANSFORMER_WINDING__TYPE:
+            return getType();
+        case SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION:
+            return getEqFunction();
+        case SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT:
+            return getNeutralPoint();
+        case SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER:
+            return getParentPowerTransformer();
+        case SclPackage.TRANSFORMER_WINDING__TAP_CHANGER:
+            return getTapChanger();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -567,25 +608,25 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.TRANSFORMER_WINDING__TYPE:
-                setType((String)newValue);
-                return;
-            case SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION:
-                getEqFunction().clear();
-                getEqFunction().addAll((Collection<? extends EqFunction>)newValue);
-                return;
-            case SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT:
-                setNeutralPoint((NeutralPoint)newValue);
-                return;
-            case SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER:
-                setParentPowerTransformer((PowerTransformer)newValue);
-                return;
-            case SclPackage.TRANSFORMER_WINDING__TAP_CHANGER:
-                setTapChanger((TapChanger)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.TRANSFORMER_WINDING__TYPE:
+            setType( ( String ) newValue );
+            return;
+        case SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION:
+            getEqFunction().clear();
+            getEqFunction().addAll( ( Collection< ? extends EqFunction > ) newValue );
+            return;
+        case SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT:
+            setNeutralPoint( ( NeutralPoint ) newValue );
+            return;
+        case SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER:
+            setParentPowerTransformer( ( PowerTransformer ) newValue );
+            return;
+        case SclPackage.TRANSFORMER_WINDING__TAP_CHANGER:
+            setTapChanger( ( TapChanger ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -595,24 +636,24 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.TRANSFORMER_WINDING__TYPE:
-                unsetType();
-                return;
-            case SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION:
-                unsetEqFunction();
-                return;
-            case SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT:
-                unsetNeutralPoint();
-                return;
-            case SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER:
-                setParentPowerTransformer((PowerTransformer)null);
-                return;
-            case SclPackage.TRANSFORMER_WINDING__TAP_CHANGER:
-                unsetTapChanger();
-                return;
+        switch( featureID ) {
+        case SclPackage.TRANSFORMER_WINDING__TYPE:
+            unsetType();
+            return;
+        case SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION:
+            unsetEqFunction();
+            return;
+        case SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT:
+            unsetNeutralPoint();
+            return;
+        case SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER:
+            setParentPowerTransformer( ( PowerTransformer ) null );
+            return;
+        case SclPackage.TRANSFORMER_WINDING__TAP_CHANGER:
+            unsetTapChanger();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -622,19 +663,19 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.TRANSFORMER_WINDING__TYPE:
-                return isSetType();
-            case SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION:
-                return isSetEqFunction();
-            case SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT:
-                return isSetNeutralPoint();
-            case SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER:
-                return getParentPowerTransformer() != null;
-            case SclPackage.TRANSFORMER_WINDING__TAP_CHANGER:
-                return isSetTapChanger();
+        switch( featureID ) {
+        case SclPackage.TRANSFORMER_WINDING__TYPE:
+            return isSetType();
+        case SclPackage.TRANSFORMER_WINDING__EQ_FUNCTION:
+            return isSetEqFunction();
+        case SclPackage.TRANSFORMER_WINDING__NEUTRAL_POINT:
+            return isSetNeutralPoint();
+        case SclPackage.TRANSFORMER_WINDING__PARENT_POWER_TRANSFORMER:
+            return getParentPowerTransformer() != null;
+        case SclPackage.TRANSFORMER_WINDING__TAP_CHANGER:
+            return isSetTapChanger();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -644,12 +685,15 @@ public class TransformerWindingImpl extends AbstractConductingEquipmentImpl impl
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (type: ");
-        if (typeESet) result.append(type); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (type: " );
+        if( typeESet )
+            result.append( type );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TrgOpsImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TrgOpsImpl.java
index 3a49ea9..52a70ec 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TrgOpsImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TrgOpsImpl.java
@@ -235,8 +235,9 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
         dchg = newDchg;
         boolean oldDchgESet = dchgESet;
         dchgESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TRG_OPS__DCHG, oldDchg, dchg, !oldDchgESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TRG_OPS__DCHG, oldDchg, dchg,
+                    !oldDchgESet ) );
     }
 
     /**
@@ -250,8 +251,9 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
         boolean oldDchgESet = dchgESet;
         dchg = DCHG_EDEFAULT;
         dchgESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TRG_OPS__DCHG, oldDchg, DCHG_EDEFAULT, oldDchgESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TRG_OPS__DCHG, oldDchg, DCHG_EDEFAULT,
+                    oldDchgESet ) );
     }
 
     /**
@@ -285,8 +287,9 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
         dupd = newDupd;
         boolean oldDupdESet = dupdESet;
         dupdESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TRG_OPS__DUPD, oldDupd, dupd, !oldDupdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TRG_OPS__DUPD, oldDupd, dupd,
+                    !oldDupdESet ) );
     }
 
     /**
@@ -300,8 +303,9 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
         boolean oldDupdESet = dupdESet;
         dupd = DUPD_EDEFAULT;
         dupdESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TRG_OPS__DUPD, oldDupd, DUPD_EDEFAULT, oldDupdESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TRG_OPS__DUPD, oldDupd, DUPD_EDEFAULT,
+                    oldDupdESet ) );
     }
 
     /**
@@ -335,8 +339,8 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
         gi = newGi;
         boolean oldGiESet = giESet;
         giESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TRG_OPS__GI, oldGi, gi, !oldGiESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TRG_OPS__GI, oldGi, gi, !oldGiESet ) );
     }
 
     /**
@@ -350,8 +354,9 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
         boolean oldGiESet = giESet;
         gi = GI_EDEFAULT;
         giESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TRG_OPS__GI, oldGi, GI_EDEFAULT, oldGiESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TRG_OPS__GI, oldGi, GI_EDEFAULT,
+                    oldGiESet ) );
     }
 
     /**
@@ -385,8 +390,9 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
         period = newPeriod;
         boolean oldPeriodESet = periodESet;
         periodESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TRG_OPS__PERIOD, oldPeriod, period, !oldPeriodESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TRG_OPS__PERIOD, oldPeriod, period,
+                    !oldPeriodESet ) );
     }
 
     /**
@@ -400,8 +406,9 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
         boolean oldPeriodESet = periodESet;
         period = PERIOD_EDEFAULT;
         periodESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TRG_OPS__PERIOD, oldPeriod, PERIOD_EDEFAULT, oldPeriodESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TRG_OPS__PERIOD, oldPeriod,
+                    PERIOD_EDEFAULT, oldPeriodESet ) );
     }
 
     /**
@@ -435,8 +442,9 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
         qchg = newQchg;
         boolean oldQchgESet = qchgESet;
         qchgESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TRG_OPS__QCHG, oldQchg, qchg, !oldQchgESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TRG_OPS__QCHG, oldQchg, qchg,
+                    !oldQchgESet ) );
     }
 
     /**
@@ -450,8 +458,9 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
         boolean oldQchgESet = qchgESet;
         qchg = QCHG_EDEFAULT;
         qchgESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.TRG_OPS__QCHG, oldQchg, QCHG_EDEFAULT, oldQchgESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.TRG_OPS__QCHG, oldQchg, QCHG_EDEFAULT,
+                    oldQchgESet ) );
     }
 
     /**
@@ -471,8 +480,8 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
      */
     @Override
     public ControlWithTriggerOpt getParentControlWithTriggerOpt() {
-        if (eContainerFeatureID() != SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT) return null;
-        return (ControlWithTriggerOpt)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT ) return null;
+        return ( ControlWithTriggerOpt ) eInternalContainer();
     }
 
     /**
@@ -480,8 +489,10 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentControlWithTriggerOpt(ControlWithTriggerOpt newParentControlWithTriggerOpt, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentControlWithTriggerOpt, SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT, msgs);
+    public NotificationChain basicSetParentControlWithTriggerOpt( ControlWithTriggerOpt newParentControlWithTriggerOpt,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentControlWithTriggerOpt,
+                SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT, msgs );
         return msgs;
     }
 
@@ -491,20 +502,24 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
      * @generated
      */
     @Override
-    public void setParentControlWithTriggerOpt(ControlWithTriggerOpt newParentControlWithTriggerOpt) {
-        if (newParentControlWithTriggerOpt != eInternalContainer() || (eContainerFeatureID() != SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT && newParentControlWithTriggerOpt != null)) {
-            if (EcoreUtil.isAncestor(this, newParentControlWithTriggerOpt))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentControlWithTriggerOpt( ControlWithTriggerOpt newParentControlWithTriggerOpt ) {
+        if( newParentControlWithTriggerOpt != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT
+                        && newParentControlWithTriggerOpt != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentControlWithTriggerOpt ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentControlWithTriggerOpt != null)
-                msgs = ((InternalEObject)newParentControlWithTriggerOpt).eInverseAdd(this, SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS, ControlWithTriggerOpt.class, msgs);
-            msgs = basicSetParentControlWithTriggerOpt(newParentControlWithTriggerOpt, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentControlWithTriggerOpt != null )
+                msgs = ( ( InternalEObject ) newParentControlWithTriggerOpt ).eInverseAdd( this,
+                        SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS, ControlWithTriggerOpt.class, msgs );
+            msgs = basicSetParentControlWithTriggerOpt( newParentControlWithTriggerOpt, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT, newParentControlWithTriggerOpt, newParentControlWithTriggerOpt));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT,
+                    newParentControlWithTriggerOpt, newParentControlWithTriggerOpt ) );
     }
 
     /**
@@ -514,13 +529,13 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentControlWithTriggerOpt((ControlWithTriggerOpt)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentControlWithTriggerOpt( ( ControlWithTriggerOpt ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -530,11 +545,11 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT:
-                return basicSetParentControlWithTriggerOpt(null, msgs);
+        switch( featureID ) {
+        case SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT:
+            return basicSetParentControlWithTriggerOpt( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -544,11 +559,12 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT:
-                return eInternalContainer().eInverseRemove(this, SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS, ControlWithTriggerOpt.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT:
+            return eInternalContainer().eInverseRemove( this, SclPackage.CONTROL_WITH_TRIGGER_OPT__TRG_OPS,
+                    ControlWithTriggerOpt.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -558,21 +574,21 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.TRG_OPS__DCHG:
-                return getDchg();
-            case SclPackage.TRG_OPS__DUPD:
-                return getDupd();
-            case SclPackage.TRG_OPS__GI:
-                return getGi();
-            case SclPackage.TRG_OPS__PERIOD:
-                return getPeriod();
-            case SclPackage.TRG_OPS__QCHG:
-                return getQchg();
-            case SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT:
-                return getParentControlWithTriggerOpt();
+        switch( featureID ) {
+        case SclPackage.TRG_OPS__DCHG:
+            return getDchg();
+        case SclPackage.TRG_OPS__DUPD:
+            return getDupd();
+        case SclPackage.TRG_OPS__GI:
+            return getGi();
+        case SclPackage.TRG_OPS__PERIOD:
+            return getPeriod();
+        case SclPackage.TRG_OPS__QCHG:
+            return getQchg();
+        case SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT:
+            return getParentControlWithTriggerOpt();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -582,27 +598,27 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.TRG_OPS__DCHG:
-                setDchg((Boolean)newValue);
-                return;
-            case SclPackage.TRG_OPS__DUPD:
-                setDupd((Boolean)newValue);
-                return;
-            case SclPackage.TRG_OPS__GI:
-                setGi((Boolean)newValue);
-                return;
-            case SclPackage.TRG_OPS__PERIOD:
-                setPeriod((Boolean)newValue);
-                return;
-            case SclPackage.TRG_OPS__QCHG:
-                setQchg((Boolean)newValue);
-                return;
-            case SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT:
-                setParentControlWithTriggerOpt((ControlWithTriggerOpt)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.TRG_OPS__DCHG:
+            setDchg( ( Boolean ) newValue );
+            return;
+        case SclPackage.TRG_OPS__DUPD:
+            setDupd( ( Boolean ) newValue );
+            return;
+        case SclPackage.TRG_OPS__GI:
+            setGi( ( Boolean ) newValue );
+            return;
+        case SclPackage.TRG_OPS__PERIOD:
+            setPeriod( ( Boolean ) newValue );
+            return;
+        case SclPackage.TRG_OPS__QCHG:
+            setQchg( ( Boolean ) newValue );
+            return;
+        case SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT:
+            setParentControlWithTriggerOpt( ( ControlWithTriggerOpt ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -612,27 +628,27 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.TRG_OPS__DCHG:
-                unsetDchg();
-                return;
-            case SclPackage.TRG_OPS__DUPD:
-                unsetDupd();
-                return;
-            case SclPackage.TRG_OPS__GI:
-                unsetGi();
-                return;
-            case SclPackage.TRG_OPS__PERIOD:
-                unsetPeriod();
-                return;
-            case SclPackage.TRG_OPS__QCHG:
-                unsetQchg();
-                return;
-            case SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT:
-                setParentControlWithTriggerOpt((ControlWithTriggerOpt)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.TRG_OPS__DCHG:
+            unsetDchg();
+            return;
+        case SclPackage.TRG_OPS__DUPD:
+            unsetDupd();
+            return;
+        case SclPackage.TRG_OPS__GI:
+            unsetGi();
+            return;
+        case SclPackage.TRG_OPS__PERIOD:
+            unsetPeriod();
+            return;
+        case SclPackage.TRG_OPS__QCHG:
+            unsetQchg();
+            return;
+        case SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT:
+            setParentControlWithTriggerOpt( ( ControlWithTriggerOpt ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -642,21 +658,21 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.TRG_OPS__DCHG:
-                return isSetDchg();
-            case SclPackage.TRG_OPS__DUPD:
-                return isSetDupd();
-            case SclPackage.TRG_OPS__GI:
-                return isSetGi();
-            case SclPackage.TRG_OPS__PERIOD:
-                return isSetPeriod();
-            case SclPackage.TRG_OPS__QCHG:
-                return isSetQchg();
-            case SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT:
-                return getParentControlWithTriggerOpt() != null;
+        switch( featureID ) {
+        case SclPackage.TRG_OPS__DCHG:
+            return isSetDchg();
+        case SclPackage.TRG_OPS__DUPD:
+            return isSetDupd();
+        case SclPackage.TRG_OPS__GI:
+            return isSetGi();
+        case SclPackage.TRG_OPS__PERIOD:
+            return isSetPeriod();
+        case SclPackage.TRG_OPS__QCHG:
+            return isSetQchg();
+        case SclPackage.TRG_OPS__PARENT_CONTROL_WITH_TRIGGER_OPT:
+            return getParentControlWithTriggerOpt() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -666,20 +682,35 @@ public class TrgOpsImpl extends SclObjectImpl implements TrgOps {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (dchg: ");
-        if (dchgESet) result.append(dchg); else result.append("<unset>");
-        result.append(", dupd: ");
-        if (dupdESet) result.append(dupd); else result.append("<unset>");
-        result.append(", gi: ");
-        if (giESet) result.append(gi); else result.append("<unset>");
-        result.append(", period: ");
-        if (periodESet) result.append(period); else result.append("<unset>");
-        result.append(", qchg: ");
-        if (qchgESet) result.append(qchg); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (dchg: " );
+        if( dchgESet )
+            result.append( dchg );
+        else
+            result.append( "<unset>" );
+        result.append( ", dupd: " );
+        if( dupdESet )
+            result.append( dupd );
+        else
+            result.append( "<unset>" );
+        result.append( ", gi: " );
+        if( giESet )
+            result.append( gi );
+        else
+            result.append( "<unset>" );
+        result.append( ", period: " );
+        if( periodESet )
+            result.append( period );
+        else
+            result.append( "<unset>" );
+        result.append( ", qchg: " );
+        if( qchgESet )
+            result.append( qchg );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/UnNamingImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/UnNamingImpl.java
index 94e3cb0..a6a543d 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/UnNamingImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/UnNamingImpl.java
@@ -108,13 +108,14 @@ public abstract class UnNamingImpl extends BaseElementImpl implements UnNaming {
      * @generated
      */
     @Override
-    public void setDesc(String newDesc) {
+    public void setDesc( String newDesc ) {
         String oldDesc = desc;
         desc = newDesc;
         boolean oldDescESet = descESet;
         descESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.UN_NAMING__DESC, oldDesc, desc, !oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.UN_NAMING__DESC, oldDesc, desc,
+                    !oldDescESet ) );
     }
 
     /**
@@ -128,8 +129,9 @@ public abstract class UnNamingImpl extends BaseElementImpl implements UnNaming {
         boolean oldDescESet = descESet;
         desc = DESC_EDEFAULT;
         descESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.UN_NAMING__DESC, oldDesc, DESC_EDEFAULT, oldDescESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.UN_NAMING__DESC, oldDesc,
+                    DESC_EDEFAULT, oldDescESet ) );
     }
 
     /**
@@ -148,12 +150,12 @@ public abstract class UnNamingImpl extends BaseElementImpl implements UnNaming {
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.UN_NAMING__DESC:
-                return getDesc();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.UN_NAMING__DESC:
+            return getDesc();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -162,13 +164,13 @@ public abstract class UnNamingImpl extends BaseElementImpl implements UnNaming {
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.UN_NAMING__DESC:
-                setDesc((String)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.UN_NAMING__DESC:
+            setDesc( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -177,13 +179,13 @@ public abstract class UnNamingImpl extends BaseElementImpl implements UnNaming {
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.UN_NAMING__DESC:
-                unsetDesc();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.UN_NAMING__DESC:
+            unsetDesc();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -192,12 +194,12 @@ public abstract class UnNamingImpl extends BaseElementImpl implements UnNaming {
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.UN_NAMING__DESC:
-                return isSetDesc();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.UN_NAMING__DESC:
+            return isSetDesc();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -206,14 +208,16 @@ public abstract class UnNamingImpl extends BaseElementImpl implements UnNaming {
      * @generated
      */
     @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDesc.class) {
-            switch (derivedFeatureID) {
-                case SclPackage.UN_NAMING__DESC: return SclPackage.AG_DESC__DESC;
-                default: return -1;
+    public int eBaseStructuralFeatureID( int derivedFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDesc.class ) {
+            switch( derivedFeatureID ) {
+            case SclPackage.UN_NAMING__DESC:
+                return SclPackage.AG_DESC__DESC;
+            default:
+                return -1;
             }
         }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        return super.eBaseStructuralFeatureID( derivedFeatureID, baseClass );
     }
 
     /**
@@ -222,14 +226,16 @@ public abstract class UnNamingImpl extends BaseElementImpl implements UnNaming {
      * @generated
      */
     @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == AgDesc.class) {
-            switch (baseFeatureID) {
-                case SclPackage.AG_DESC__DESC: return SclPackage.UN_NAMING__DESC;
-                default: return -1;
+    public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass ) {
+        if( baseClass == AgDesc.class ) {
+            switch( baseFeatureID ) {
+            case SclPackage.AG_DESC__DESC:
+                return SclPackage.UN_NAMING__DESC;
+            default:
+                return -1;
             }
         }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        return super.eDerivedStructuralFeatureID( baseFeatureID, baseClass );
     }
 
     /**
@@ -239,12 +245,15 @@ public abstract class UnNamingImpl extends BaseElementImpl implements UnNaming {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (desc: ");
-        if (descESet) result.append(desc); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (desc: " );
+        if( descESet )
+            result.append( desc );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ValImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ValImpl.java
index 6380cd2..7c42cb8 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ValImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ValImpl.java
@@ -138,8 +138,9 @@ public class ValImpl extends SclObjectImpl implements Val {
         sGroup = newSGroup;
         boolean oldSGroupESet = sGroupESet;
         sGroupESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VAL__SGROUP, oldSGroup, sGroup, !oldSGroupESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VAL__SGROUP, oldSGroup, sGroup,
+                    !oldSGroupESet ) );
     }
 
     /**
@@ -153,8 +154,9 @@ public class ValImpl extends SclObjectImpl implements Val {
         boolean oldSGroupESet = sGroupESet;
         sGroup = SGROUP_EDEFAULT;
         sGroupESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.VAL__SGROUP, oldSGroup, SGROUP_EDEFAULT, oldSGroupESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.VAL__SGROUP, oldSGroup,
+                    SGROUP_EDEFAULT, oldSGroupESet ) );
     }
 
     /**
@@ -174,8 +176,8 @@ public class ValImpl extends SclObjectImpl implements Val {
      */
     @Override
     public AbstractDataAttribute getParentAbstractDataAttribute() {
-        if (eContainerFeatureID() != SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE) return null;
-        return (AbstractDataAttribute)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE ) return null;
+        return ( AbstractDataAttribute ) eInternalContainer();
     }
 
     /**
@@ -183,8 +185,10 @@ public class ValImpl extends SclObjectImpl implements Val {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentAbstractDataAttribute(AbstractDataAttribute newParentAbstractDataAttribute, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentAbstractDataAttribute, SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE, msgs);
+    public NotificationChain basicSetParentAbstractDataAttribute( AbstractDataAttribute newParentAbstractDataAttribute,
+            NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentAbstractDataAttribute,
+                SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE, msgs );
         return msgs;
     }
 
@@ -194,20 +198,24 @@ public class ValImpl extends SclObjectImpl implements Val {
      * @generated
      */
     @Override
-    public void setParentAbstractDataAttribute(AbstractDataAttribute newParentAbstractDataAttribute) {
-        if (newParentAbstractDataAttribute != eInternalContainer() || (eContainerFeatureID() != SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE && newParentAbstractDataAttribute != null)) {
-            if (EcoreUtil.isAncestor(this, newParentAbstractDataAttribute))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentAbstractDataAttribute( AbstractDataAttribute newParentAbstractDataAttribute ) {
+        if( newParentAbstractDataAttribute != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE
+                        && newParentAbstractDataAttribute != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentAbstractDataAttribute ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentAbstractDataAttribute != null)
-                msgs = ((InternalEObject)newParentAbstractDataAttribute).eInverseAdd(this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL, AbstractDataAttribute.class, msgs);
-            msgs = basicSetParentAbstractDataAttribute(newParentAbstractDataAttribute, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentAbstractDataAttribute != null )
+                msgs = ( ( InternalEObject ) newParentAbstractDataAttribute ).eInverseAdd( this,
+                        SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL, AbstractDataAttribute.class, msgs );
+            msgs = basicSetParentAbstractDataAttribute( newParentAbstractDataAttribute, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE, newParentAbstractDataAttribute, newParentAbstractDataAttribute));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE,
+                    newParentAbstractDataAttribute, newParentAbstractDataAttribute ) );
     }
 
     /**
@@ -217,8 +225,8 @@ public class ValImpl extends SclObjectImpl implements Val {
      */
     @Override
     public DAI getParentDAI() {
-        if (eContainerFeatureID() != SclPackage.VAL__PARENT_DAI) return null;
-        return (DAI)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.VAL__PARENT_DAI ) return null;
+        return ( DAI ) eInternalContainer();
     }
 
     /**
@@ -226,8 +234,8 @@ public class ValImpl extends SclObjectImpl implements Val {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentDAI(DAI newParentDAI, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentDAI, SclPackage.VAL__PARENT_DAI, msgs);
+    public NotificationChain basicSetParentDAI( DAI newParentDAI, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentDAI, SclPackage.VAL__PARENT_DAI, msgs );
         return msgs;
     }
 
@@ -237,20 +245,22 @@ public class ValImpl extends SclObjectImpl implements Val {
      * @generated
      */
     @Override
-    public void setParentDAI(DAI newParentDAI) {
-        if (newParentDAI != eInternalContainer() || (eContainerFeatureID() != SclPackage.VAL__PARENT_DAI && newParentDAI != null)) {
-            if (EcoreUtil.isAncestor(this, newParentDAI))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentDAI( DAI newParentDAI ) {
+        if( newParentDAI != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.VAL__PARENT_DAI && newParentDAI != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentDAI ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentDAI != null)
-                msgs = ((InternalEObject)newParentDAI).eInverseAdd(this, SclPackage.DAI__VAL, DAI.class, msgs);
-            msgs = basicSetParentDAI(newParentDAI, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentDAI != null )
+                msgs = ( ( InternalEObject ) newParentDAI ).eInverseAdd( this, SclPackage.DAI__VAL, DAI.class, msgs );
+            msgs = basicSetParentDAI( newParentDAI, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VAL__PARENT_DAI, newParentDAI, newParentDAI));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VAL__PARENT_DAI, newParentDAI,
+                    newParentDAI ) );
     }
 
     /**
@@ -272,8 +282,8 @@ public class ValImpl extends SclObjectImpl implements Val {
     public void setValue( String newValue ) {
         String oldValue = value;
         value = newValue;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VAL__VALUE, oldValue, value));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VAL__VALUE, oldValue, value ) );
     }
 
     /**
@@ -283,17 +293,17 @@ public class ValImpl extends SclObjectImpl implements Val {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentAbstractDataAttribute((AbstractDataAttribute)otherEnd, msgs);
-            case SclPackage.VAL__PARENT_DAI:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentDAI((DAI)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentAbstractDataAttribute( ( AbstractDataAttribute ) otherEnd, msgs );
+        case SclPackage.VAL__PARENT_DAI:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentDAI( ( DAI ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -303,13 +313,13 @@ public class ValImpl extends SclObjectImpl implements Val {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE:
-                return basicSetParentAbstractDataAttribute(null, msgs);
-            case SclPackage.VAL__PARENT_DAI:
-                return basicSetParentDAI(null, msgs);
+        switch( featureID ) {
+        case SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE:
+            return basicSetParentAbstractDataAttribute( null, msgs );
+        case SclPackage.VAL__PARENT_DAI:
+            return basicSetParentDAI( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -319,13 +329,14 @@ public class ValImpl extends SclObjectImpl implements Val {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL, AbstractDataAttribute.class, msgs);
-            case SclPackage.VAL__PARENT_DAI:
-                return eInternalContainer().eInverseRemove(this, SclPackage.DAI__VAL, DAI.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL,
+                    AbstractDataAttribute.class, msgs );
+        case SclPackage.VAL__PARENT_DAI:
+            return eInternalContainer().eInverseRemove( this, SclPackage.DAI__VAL, DAI.class, msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -335,17 +346,17 @@ public class ValImpl extends SclObjectImpl implements Val {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.VAL__SGROUP:
-                return getSGroup();
-            case SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE:
-                return getParentAbstractDataAttribute();
-            case SclPackage.VAL__PARENT_DAI:
-                return getParentDAI();
-            case SclPackage.VAL__VALUE:
-                return getValue();
+        switch( featureID ) {
+        case SclPackage.VAL__SGROUP:
+            return getSGroup();
+        case SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE:
+            return getParentAbstractDataAttribute();
+        case SclPackage.VAL__PARENT_DAI:
+            return getParentDAI();
+        case SclPackage.VAL__VALUE:
+            return getValue();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -355,21 +366,21 @@ public class ValImpl extends SclObjectImpl implements Val {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.VAL__SGROUP:
-                setSGroup((Integer)newValue);
-                return;
-            case SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE:
-                setParentAbstractDataAttribute((AbstractDataAttribute)newValue);
-                return;
-            case SclPackage.VAL__PARENT_DAI:
-                setParentDAI((DAI)newValue);
-                return;
-            case SclPackage.VAL__VALUE:
-                setValue((String)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.VAL__SGROUP:
+            setSGroup( ( Integer ) newValue );
+            return;
+        case SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE:
+            setParentAbstractDataAttribute( ( AbstractDataAttribute ) newValue );
+            return;
+        case SclPackage.VAL__PARENT_DAI:
+            setParentDAI( ( DAI ) newValue );
+            return;
+        case SclPackage.VAL__VALUE:
+            setValue( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -379,21 +390,21 @@ public class ValImpl extends SclObjectImpl implements Val {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.VAL__SGROUP:
-                unsetSGroup();
-                return;
-            case SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE:
-                setParentAbstractDataAttribute((AbstractDataAttribute)null);
-                return;
-            case SclPackage.VAL__PARENT_DAI:
-                setParentDAI((DAI)null);
-                return;
-            case SclPackage.VAL__VALUE:
-                setValue(VALUE_EDEFAULT);
-                return;
+        switch( featureID ) {
+        case SclPackage.VAL__SGROUP:
+            unsetSGroup();
+            return;
+        case SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE:
+            setParentAbstractDataAttribute( ( AbstractDataAttribute ) null );
+            return;
+        case SclPackage.VAL__PARENT_DAI:
+            setParentDAI( ( DAI ) null );
+            return;
+        case SclPackage.VAL__VALUE:
+            setValue( VALUE_EDEFAULT );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -403,17 +414,17 @@ public class ValImpl extends SclObjectImpl implements Val {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.VAL__SGROUP:
-                return isSetSGroup();
-            case SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE:
-                return getParentAbstractDataAttribute() != null;
-            case SclPackage.VAL__PARENT_DAI:
-                return getParentDAI() != null;
-            case SclPackage.VAL__VALUE:
-                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+        switch( featureID ) {
+        case SclPackage.VAL__SGROUP:
+            return isSetSGroup();
+        case SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE:
+            return getParentAbstractDataAttribute() != null;
+        case SclPackage.VAL__PARENT_DAI:
+            return getParentDAI() != null;
+        case SclPackage.VAL__VALUE:
+            return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals( value );
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -423,14 +434,17 @@ public class ValImpl extends SclObjectImpl implements Val {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (sGroup: ");
-        if (sGroupESet) result.append(sGroup); else result.append("<unset>");
-        result.append(", value: ");
-        result.append(value);
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (sGroup: " );
+        if( sGroupESet )
+            result.append( sGroup );
+        else
+            result.append( "<unset>" );
+        result.append( ", value: " );
+        result.append( value );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ValueHandlingImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ValueHandlingImpl.java
index 07ba578..baa9f6a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ValueHandlingImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ValueHandlingImpl.java
@@ -115,8 +115,9 @@ public class ValueHandlingImpl extends SclObjectImpl implements ValueHandling {
         setToRO = newSetToRO;
         boolean oldSetToROESet = setToROESet;
         setToROESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VALUE_HANDLING__SET_TO_RO, oldSetToRO, setToRO, !oldSetToROESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VALUE_HANDLING__SET_TO_RO, oldSetToRO,
+                    setToRO, !oldSetToROESet ) );
     }
 
     /**
@@ -130,8 +131,9 @@ public class ValueHandlingImpl extends SclObjectImpl implements ValueHandling {
         boolean oldSetToROESet = setToROESet;
         setToRO = SET_TO_RO_EDEFAULT;
         setToROESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.VALUE_HANDLING__SET_TO_RO, oldSetToRO, SET_TO_RO_EDEFAULT, oldSetToROESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.VALUE_HANDLING__SET_TO_RO, oldSetToRO,
+                    SET_TO_RO_EDEFAULT, oldSetToROESet ) );
     }
 
     /**
@@ -151,8 +153,8 @@ public class ValueHandlingImpl extends SclObjectImpl implements ValueHandling {
      */
     @Override
     public Services getParentServices() {
-        if (eContainerFeatureID() != SclPackage.VALUE_HANDLING__PARENT_SERVICES) return null;
-        return (Services)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.VALUE_HANDLING__PARENT_SERVICES ) return null;
+        return ( Services ) eInternalContainer();
     }
 
     /**
@@ -160,8 +162,9 @@ public class ValueHandlingImpl extends SclObjectImpl implements ValueHandling {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentServices(Services newParentServices, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentServices, SclPackage.VALUE_HANDLING__PARENT_SERVICES, msgs);
+    public NotificationChain basicSetParentServices( Services newParentServices, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentServices, SclPackage.VALUE_HANDLING__PARENT_SERVICES,
+                msgs );
         return msgs;
     }
 
@@ -171,20 +174,24 @@ public class ValueHandlingImpl extends SclObjectImpl implements ValueHandling {
      * @generated
      */
     @Override
-    public void setParentServices(Services newParentServices) {
-        if (newParentServices != eInternalContainer() || (eContainerFeatureID() != SclPackage.VALUE_HANDLING__PARENT_SERVICES && newParentServices != null)) {
-            if (EcoreUtil.isAncestor(this, newParentServices))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentServices( Services newParentServices ) {
+        if( newParentServices != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.VALUE_HANDLING__PARENT_SERVICES
+                        && newParentServices != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentServices ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentServices != null)
-                msgs = ((InternalEObject)newParentServices).eInverseAdd(this, SclPackage.SERVICES__VALUE_HANDLING, Services.class, msgs);
-            msgs = basicSetParentServices(newParentServices, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentServices != null )
+                msgs = ( ( InternalEObject ) newParentServices ).eInverseAdd( this, SclPackage.SERVICES__VALUE_HANDLING,
+                        Services.class, msgs );
+            msgs = basicSetParentServices( newParentServices, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VALUE_HANDLING__PARENT_SERVICES, newParentServices, newParentServices));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VALUE_HANDLING__PARENT_SERVICES,
+                    newParentServices, newParentServices ) );
     }
 
     /**
@@ -194,13 +201,13 @@ public class ValueHandlingImpl extends SclObjectImpl implements ValueHandling {
      */
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.VALUE_HANDLING__PARENT_SERVICES:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentServices((Services)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.VALUE_HANDLING__PARENT_SERVICES:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentServices( ( Services ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -210,11 +217,11 @@ public class ValueHandlingImpl extends SclObjectImpl implements ValueHandling {
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.VALUE_HANDLING__PARENT_SERVICES:
-                return basicSetParentServices(null, msgs);
+        switch( featureID ) {
+        case SclPackage.VALUE_HANDLING__PARENT_SERVICES:
+            return basicSetParentServices( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -224,11 +231,12 @@ public class ValueHandlingImpl extends SclObjectImpl implements ValueHandling {
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.VALUE_HANDLING__PARENT_SERVICES:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SERVICES__VALUE_HANDLING, Services.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.VALUE_HANDLING__PARENT_SERVICES:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SERVICES__VALUE_HANDLING, Services.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -238,13 +246,13 @@ public class ValueHandlingImpl extends SclObjectImpl implements ValueHandling {
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.VALUE_HANDLING__SET_TO_RO:
-                return getSetToRO();
-            case SclPackage.VALUE_HANDLING__PARENT_SERVICES:
-                return getParentServices();
+        switch( featureID ) {
+        case SclPackage.VALUE_HANDLING__SET_TO_RO:
+            return getSetToRO();
+        case SclPackage.VALUE_HANDLING__PARENT_SERVICES:
+            return getParentServices();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -254,15 +262,15 @@ public class ValueHandlingImpl extends SclObjectImpl implements ValueHandling {
      */
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.VALUE_HANDLING__SET_TO_RO:
-                setSetToRO((Boolean)newValue);
-                return;
-            case SclPackage.VALUE_HANDLING__PARENT_SERVICES:
-                setParentServices((Services)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.VALUE_HANDLING__SET_TO_RO:
+            setSetToRO( ( Boolean ) newValue );
+            return;
+        case SclPackage.VALUE_HANDLING__PARENT_SERVICES:
+            setParentServices( ( Services ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -272,15 +280,15 @@ public class ValueHandlingImpl extends SclObjectImpl implements ValueHandling {
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.VALUE_HANDLING__SET_TO_RO:
-                unsetSetToRO();
-                return;
-            case SclPackage.VALUE_HANDLING__PARENT_SERVICES:
-                setParentServices((Services)null);
-                return;
+        switch( featureID ) {
+        case SclPackage.VALUE_HANDLING__SET_TO_RO:
+            unsetSetToRO();
+            return;
+        case SclPackage.VALUE_HANDLING__PARENT_SERVICES:
+            setParentServices( ( Services ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -290,13 +298,13 @@ public class ValueHandlingImpl extends SclObjectImpl implements ValueHandling {
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.VALUE_HANDLING__SET_TO_RO:
-                return isSetSetToRO();
-            case SclPackage.VALUE_HANDLING__PARENT_SERVICES:
-                return getParentServices() != null;
+        switch( featureID ) {
+        case SclPackage.VALUE_HANDLING__SET_TO_RO:
+            return isSetSetToRO();
+        case SclPackage.VALUE_HANDLING__PARENT_SERVICES:
+            return getParentServices() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -306,12 +314,15 @@ public class ValueHandlingImpl extends SclObjectImpl implements ValueHandling {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if( eIsProxy() ) return super.toString();
 
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (setToRO: ");
-        if (setToROESet) result.append(setToRO); else result.append("<unset>");
-        result.append(')');
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (setToRO: " );
+        if( setToROESet )
+            result.append( setToRO );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ValueWithUnitImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ValueWithUnitImpl.java
index 6e670cc..fb79b1e 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ValueWithUnitImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ValueWithUnitImpl.java
@@ -161,11 +161,12 @@ public class ValueWithUnitImpl extends SclObjectImpl implements ValueWithUnit {
      * @generated
      */
     @Override
-    public void setValue(BigDecimal newValue) {
+    public void setValue( BigDecimal newValue ) {
         BigDecimal oldValue = value;
         value = newValue;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VALUE_WITH_UNIT__VALUE, oldValue, value));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VALUE_WITH_UNIT__VALUE, oldValue,
+                    value ) );
     }
 
     /**
@@ -184,13 +185,14 @@ public class ValueWithUnitImpl extends SclObjectImpl implements ValueWithUnit {
      * @generated
      */
     @Override
-    public void setMultiplier(UnitMultiplierEnum newMultiplier) {
+    public void setMultiplier( UnitMultiplierEnum newMultiplier ) {
         UnitMultiplierEnum oldMultiplier = multiplier;
         multiplier = newMultiplier == null ? MULTIPLIER_EDEFAULT : newMultiplier;
         boolean oldMultiplierESet = multiplierESet;
         multiplierESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VALUE_WITH_UNIT__MULTIPLIER, oldMultiplier, multiplier, !oldMultiplierESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VALUE_WITH_UNIT__MULTIPLIER,
+                    oldMultiplier, multiplier, !oldMultiplierESet ) );
     }
 
     /**
@@ -204,8 +206,9 @@ public class ValueWithUnitImpl extends SclObjectImpl implements ValueWithUnit {
         boolean oldMultiplierESet = multiplierESet;
         multiplier = MULTIPLIER_EDEFAULT;
         multiplierESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.VALUE_WITH_UNIT__MULTIPLIER, oldMultiplier, MULTIPLIER_EDEFAULT, oldMultiplierESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.VALUE_WITH_UNIT__MULTIPLIER,
+                    oldMultiplier, MULTIPLIER_EDEFAULT, oldMultiplierESet ) );
     }
 
     /**
@@ -234,13 +237,14 @@ public class ValueWithUnitImpl extends SclObjectImpl implements ValueWithUnit {
      * @generated
      */
     @Override
-    public void setUnit(String newUnit) {
+    public void setUnit( String newUnit ) {
         String oldUnit = unit;
         unit = newUnit;
         boolean oldUnitESet = unitESet;
         unitESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VALUE_WITH_UNIT__UNIT, oldUnit, unit, !oldUnitESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VALUE_WITH_UNIT__UNIT, oldUnit, unit,
+                    !oldUnitESet ) );
     }
 
     /**
@@ -254,8 +258,9 @@ public class ValueWithUnitImpl extends SclObjectImpl implements ValueWithUnit {
         boolean oldUnitESet = unitESet;
         unit = UNIT_EDEFAULT;
         unitESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.VALUE_WITH_UNIT__UNIT, oldUnit, UNIT_EDEFAULT, oldUnitESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.VALUE_WITH_UNIT__UNIT, oldUnit,
+                    UNIT_EDEFAULT, oldUnitESet ) );
     }
 
     /**
@@ -274,16 +279,16 @@ public class ValueWithUnitImpl extends SclObjectImpl implements ValueWithUnit {
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.VALUE_WITH_UNIT__VALUE:
-                return getValue();
-            case SclPackage.VALUE_WITH_UNIT__MULTIPLIER:
-                return getMultiplier();
-            case SclPackage.VALUE_WITH_UNIT__UNIT:
-                return getUnit();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.VALUE_WITH_UNIT__VALUE:
+            return getValue();
+        case SclPackage.VALUE_WITH_UNIT__MULTIPLIER:
+            return getMultiplier();
+        case SclPackage.VALUE_WITH_UNIT__UNIT:
+            return getUnit();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -292,19 +297,19 @@ public class ValueWithUnitImpl extends SclObjectImpl implements ValueWithUnit {
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.VALUE_WITH_UNIT__VALUE:
-                setValue((BigDecimal)newValue);
-                return;
-            case SclPackage.VALUE_WITH_UNIT__MULTIPLIER:
-                setMultiplier((UnitMultiplierEnum)newValue);
-                return;
-            case SclPackage.VALUE_WITH_UNIT__UNIT:
-                setUnit((String)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.VALUE_WITH_UNIT__VALUE:
+            setValue( ( BigDecimal ) newValue );
+            return;
+        case SclPackage.VALUE_WITH_UNIT__MULTIPLIER:
+            setMultiplier( ( UnitMultiplierEnum ) newValue );
+            return;
+        case SclPackage.VALUE_WITH_UNIT__UNIT:
+            setUnit( ( String ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -313,19 +318,19 @@ public class ValueWithUnitImpl extends SclObjectImpl implements ValueWithUnit {
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.VALUE_WITH_UNIT__VALUE:
-                setValue(VALUE_EDEFAULT);
-                return;
-            case SclPackage.VALUE_WITH_UNIT__MULTIPLIER:
-                unsetMultiplier();
-                return;
-            case SclPackage.VALUE_WITH_UNIT__UNIT:
-                unsetUnit();
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.VALUE_WITH_UNIT__VALUE:
+            setValue( VALUE_EDEFAULT );
+            return;
+        case SclPackage.VALUE_WITH_UNIT__MULTIPLIER:
+            unsetMultiplier();
+            return;
+        case SclPackage.VALUE_WITH_UNIT__UNIT:
+            unsetUnit();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -334,16 +339,16 @@ public class ValueWithUnitImpl extends SclObjectImpl implements ValueWithUnit {
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.VALUE_WITH_UNIT__VALUE:
-                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-            case SclPackage.VALUE_WITH_UNIT__MULTIPLIER:
-                return isSetMultiplier();
-            case SclPackage.VALUE_WITH_UNIT__UNIT:
-                return isSetUnit();
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.VALUE_WITH_UNIT__VALUE:
+            return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals( value );
+        case SclPackage.VALUE_WITH_UNIT__MULTIPLIER:
+            return isSetMultiplier();
+        case SclPackage.VALUE_WITH_UNIT__UNIT:
+            return isSetUnit();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -353,16 +358,22 @@ public class ValueWithUnitImpl extends SclObjectImpl implements ValueWithUnit {
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (value: ");
-        result.append(value);
-        result.append(", multiplier: ");
-        if (multiplierESet) result.append(multiplier); else result.append("<unset>");
-        result.append(", unit: ");
-        if (unitESet) result.append(unit); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (value: " );
+        result.append( value );
+        result.append( ", multiplier: " );
+        if( multiplierESet )
+            result.append( multiplier );
+        else
+            result.append( "<unset>" );
+        result.append( ", unit: " );
+        if( unitESet )
+            result.append( unit );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/VoltageImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/VoltageImpl.java
index 00b9664..2c87a60 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/VoltageImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/VoltageImpl.java
@@ -73,8 +73,8 @@ public class VoltageImpl extends ValueWithUnitImpl implements Voltage {
      */
     @Override
     public Line getParentLine() {
-        if (eContainerFeatureID() != SclPackage.VOLTAGE__PARENT_LINE) return null;
-        return (Line)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.VOLTAGE__PARENT_LINE ) return null;
+        return ( Line ) eInternalContainer();
     }
 
     /**
@@ -82,8 +82,8 @@ public class VoltageImpl extends ValueWithUnitImpl implements Voltage {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentLine(Line newParentLine, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentLine, SclPackage.VOLTAGE__PARENT_LINE, msgs);
+    public NotificationChain basicSetParentLine( Line newParentLine, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentLine, SclPackage.VOLTAGE__PARENT_LINE, msgs );
         return msgs;
     }
 
@@ -93,20 +93,23 @@ public class VoltageImpl extends ValueWithUnitImpl implements Voltage {
      * @generated
      */
     @Override
-    public void setParentLine(Line newParentLine) {
-        if (newParentLine != eInternalContainer() || (eContainerFeatureID() != SclPackage.VOLTAGE__PARENT_LINE && newParentLine != null)) {
-            if (EcoreUtil.isAncestor(this, newParentLine))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentLine( Line newParentLine ) {
+        if( newParentLine != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.VOLTAGE__PARENT_LINE && newParentLine != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentLine ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentLine != null)
-                msgs = ((InternalEObject)newParentLine).eInverseAdd(this, SclPackage.LINE__VOLTAGE, Line.class, msgs);
-            msgs = basicSetParentLine(newParentLine, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentLine != null )
+                msgs = ( ( InternalEObject ) newParentLine ).eInverseAdd( this, SclPackage.LINE__VOLTAGE, Line.class,
+                        msgs );
+            msgs = basicSetParentLine( newParentLine, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VOLTAGE__PARENT_LINE, newParentLine, newParentLine));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VOLTAGE__PARENT_LINE, newParentLine,
+                    newParentLine ) );
     }
 
     /**
@@ -116,8 +119,8 @@ public class VoltageImpl extends ValueWithUnitImpl implements Voltage {
      */
     @Override
     public VoltageLevel getParentVoltageLevel() {
-        if (eContainerFeatureID() != SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL) return null;
-        return (VoltageLevel)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL ) return null;
+        return ( VoltageLevel ) eInternalContainer();
     }
 
     /**
@@ -125,8 +128,9 @@ public class VoltageImpl extends ValueWithUnitImpl implements Voltage {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentVoltageLevel(VoltageLevel newParentVoltageLevel, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentVoltageLevel, SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL, msgs);
+    public NotificationChain basicSetParentVoltageLevel( VoltageLevel newParentVoltageLevel, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentVoltageLevel, SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL,
+                msgs );
         return msgs;
     }
 
@@ -136,20 +140,24 @@ public class VoltageImpl extends ValueWithUnitImpl implements Voltage {
      * @generated
      */
     @Override
-    public void setParentVoltageLevel(VoltageLevel newParentVoltageLevel) {
-        if (newParentVoltageLevel != eInternalContainer() || (eContainerFeatureID() != SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL && newParentVoltageLevel != null)) {
-            if (EcoreUtil.isAncestor(this, newParentVoltageLevel))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentVoltageLevel( VoltageLevel newParentVoltageLevel ) {
+        if( newParentVoltageLevel != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL
+                        && newParentVoltageLevel != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentVoltageLevel ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentVoltageLevel != null)
-                msgs = ((InternalEObject)newParentVoltageLevel).eInverseAdd(this, SclPackage.VOLTAGE_LEVEL__VOLTAGE, VoltageLevel.class, msgs);
-            msgs = basicSetParentVoltageLevel(newParentVoltageLevel, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentVoltageLevel != null )
+                msgs = ( ( InternalEObject ) newParentVoltageLevel ).eInverseAdd( this,
+                        SclPackage.VOLTAGE_LEVEL__VOLTAGE, VoltageLevel.class, msgs );
+            msgs = basicSetParentVoltageLevel( newParentVoltageLevel, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL, newParentVoltageLevel, newParentVoltageLevel));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL,
+                    newParentVoltageLevel, newParentVoltageLevel ) );
     }
 
     /**
@@ -158,18 +166,18 @@ public class VoltageImpl extends ValueWithUnitImpl implements Voltage {
      * @generated
      */
     @Override
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.VOLTAGE__PARENT_LINE:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentLine((Line)otherEnd, msgs);
-            case SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentVoltageLevel((VoltageLevel)otherEnd, msgs);
+    public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.VOLTAGE__PARENT_LINE:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentLine( ( Line ) otherEnd, msgs );
+        case SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentVoltageLevel( ( VoltageLevel ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -178,14 +186,14 @@ public class VoltageImpl extends ValueWithUnitImpl implements Voltage {
      * @generated
      */
     @Override
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case SclPackage.VOLTAGE__PARENT_LINE:
-                return basicSetParentLine(null, msgs);
-            case SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL:
-                return basicSetParentVoltageLevel(null, msgs);
+    public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
+        switch( featureID ) {
+        case SclPackage.VOLTAGE__PARENT_LINE:
+            return basicSetParentLine( null, msgs );
+        case SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL:
+            return basicSetParentVoltageLevel( null, msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -194,14 +202,15 @@ public class VoltageImpl extends ValueWithUnitImpl implements Voltage {
      * @generated
      */
     @Override
-    public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.VOLTAGE__PARENT_LINE:
-                return eInternalContainer().eInverseRemove(this, SclPackage.LINE__VOLTAGE, Line.class, msgs);
-            case SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL:
-                return eInternalContainer().eInverseRemove(this, SclPackage.VOLTAGE_LEVEL__VOLTAGE, VoltageLevel.class, msgs);
+    public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
+        switch( eContainerFeatureID() ) {
+        case SclPackage.VOLTAGE__PARENT_LINE:
+            return eInternalContainer().eInverseRemove( this, SclPackage.LINE__VOLTAGE, Line.class, msgs );
+        case SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL:
+            return eInternalContainer().eInverseRemove( this, SclPackage.VOLTAGE_LEVEL__VOLTAGE, VoltageLevel.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -210,14 +219,14 @@ public class VoltageImpl extends ValueWithUnitImpl implements Voltage {
      * @generated
      */
     @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case SclPackage.VOLTAGE__PARENT_LINE:
-                return getParentLine();
-            case SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL:
-                return getParentVoltageLevel();
+    public Object eGet( int featureID, boolean resolve, boolean coreType ) {
+        switch( featureID ) {
+        case SclPackage.VOLTAGE__PARENT_LINE:
+            return getParentLine();
+        case SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL:
+            return getParentVoltageLevel();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -226,16 +235,16 @@ public class VoltageImpl extends ValueWithUnitImpl implements Voltage {
      * @generated
      */
     @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case SclPackage.VOLTAGE__PARENT_LINE:
-                setParentLine((Line)newValue);
-                return;
-            case SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL:
-                setParentVoltageLevel((VoltageLevel)newValue);
-                return;
+    public void eSet( int featureID, Object newValue ) {
+        switch( featureID ) {
+        case SclPackage.VOLTAGE__PARENT_LINE:
+            setParentLine( ( Line ) newValue );
+            return;
+        case SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL:
+            setParentVoltageLevel( ( VoltageLevel ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -244,16 +253,16 @@ public class VoltageImpl extends ValueWithUnitImpl implements Voltage {
      * @generated
      */
     @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case SclPackage.VOLTAGE__PARENT_LINE:
-                setParentLine((Line)null);
-                return;
-            case SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL:
-                setParentVoltageLevel((VoltageLevel)null);
-                return;
+    public void eUnset( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.VOLTAGE__PARENT_LINE:
+            setParentLine( ( Line ) null );
+            return;
+        case SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL:
+            setParentVoltageLevel( ( VoltageLevel ) null );
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -262,14 +271,14 @@ public class VoltageImpl extends ValueWithUnitImpl implements Voltage {
      * @generated
      */
     @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case SclPackage.VOLTAGE__PARENT_LINE:
-                return getParentLine() != null;
-            case SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL:
-                return getParentVoltageLevel() != null;
+    public boolean eIsSet( int featureID ) {
+        switch( featureID ) {
+        case SclPackage.VOLTAGE__PARENT_LINE:
+            return getParentLine() != null;
+        case SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL:
+            return getParentVoltageLevel() != null;
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
 } //VoltageImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/VoltageLevelImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/VoltageLevelImpl.java
index 2f0d813..8cf320a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/VoltageLevelImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/VoltageLevelImpl.java
@@ -124,7 +124,7 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      * @generated
      * @ordered
      */
-    protected EList<Bay> bay;
+    protected EList< Bay > bay;
 
     /**
      * The cached value of the '{@link #getFunction() <em>Function</em>}' containment reference list.
@@ -134,7 +134,7 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      * @generated
      * @ordered
      */
-    protected EList<Function> function;
+    protected EList< Function > function;
 
     /**
      * The cached value of the '{@link #getVoltage() <em>Voltage</em>}' containment reference.
@@ -195,8 +195,9 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
         nomFreq = newNomFreq;
         boolean oldNomFreqESet = nomFreqESet;
         nomFreqESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VOLTAGE_LEVEL__NOM_FREQ, oldNomFreq, nomFreq, !oldNomFreqESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VOLTAGE_LEVEL__NOM_FREQ, oldNomFreq,
+                    nomFreq, !oldNomFreqESet ) );
     }
 
     /**
@@ -210,8 +211,9 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
         boolean oldNomFreqESet = nomFreqESet;
         nomFreq = NOM_FREQ_EDEFAULT;
         nomFreqESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.VOLTAGE_LEVEL__NOM_FREQ, oldNomFreq, NOM_FREQ_EDEFAULT, oldNomFreqESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.VOLTAGE_LEVEL__NOM_FREQ, oldNomFreq,
+                    NOM_FREQ_EDEFAULT, oldNomFreqESet ) );
     }
 
     /**
@@ -240,13 +242,14 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      * @generated
      */
     @Override
-    public void setNumPhases(Integer newNumPhases) {
+    public void setNumPhases( Integer newNumPhases ) {
         Integer oldNumPhases = numPhases;
         numPhases = newNumPhases;
         boolean oldNumPhasesESet = numPhasesESet;
         numPhasesESet = true;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VOLTAGE_LEVEL__NUM_PHASES, oldNumPhases, numPhases, !oldNumPhasesESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VOLTAGE_LEVEL__NUM_PHASES, oldNumPhases,
+                    numPhases, !oldNumPhasesESet ) );
     }
 
     /**
@@ -260,8 +263,9 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
         boolean oldNumPhasesESet = numPhasesESet;
         numPhases = NUM_PHASES_EDEFAULT;
         numPhasesESet = false;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.VOLTAGE_LEVEL__NUM_PHASES, oldNumPhases, NUM_PHASES_EDEFAULT, oldNumPhasesESet));
+        if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.VOLTAGE_LEVEL__NUM_PHASES,
+                    oldNumPhases, NUM_PHASES_EDEFAULT, oldNumPhasesESet ) );
     }
 
     /**
@@ -280,9 +284,10 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      * @generated
      */
     @Override
-    public EList<Bay> getBay() {
-        if (bay == null) {
-            bay = new EObjectContainmentWithInverseEList.Unsettable<Bay>(Bay.class, this, SclPackage.VOLTAGE_LEVEL__BAY, SclPackage.BAY__PARENT_VOLTAGE_LEVEL);
+    public EList< Bay > getBay() {
+        if( bay == null ) {
+            bay = new EObjectContainmentWithInverseEList.Unsettable< Bay >( Bay.class, this,
+                    SclPackage.VOLTAGE_LEVEL__BAY, SclPackage.BAY__PARENT_VOLTAGE_LEVEL );
         }
         return bay;
     }
@@ -294,7 +299,7 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      */
     @Override
     public void unsetBay() {
-        if (bay != null) ((InternalEList.Unsettable<?>)bay).unset();
+        if( bay != null ) ( ( InternalEList.Unsettable< ? > ) bay ).unset();
     }
 
     /**
@@ -304,7 +309,7 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      */
     @Override
     public boolean isSetBay() {
-        return bay != null && ((InternalEList.Unsettable<?>)bay).isSet();
+        return bay != null && ( ( InternalEList.Unsettable< ? > ) bay ).isSet();
     }
 
     /**
@@ -313,9 +318,10 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      * @generated
      */
     @Override
-    public EList<Function> getFunction() {
-        if (function == null) {
-            function = new EObjectContainmentWithInverseEList.Unsettable<Function>(Function.class, this, SclPackage.VOLTAGE_LEVEL__FUNCTION, SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL);
+    public EList< Function > getFunction() {
+        if( function == null ) {
+            function = new EObjectContainmentWithInverseEList.Unsettable< Function >( Function.class, this,
+                    SclPackage.VOLTAGE_LEVEL__FUNCTION, SclPackage.FUNCTION__PARENT_VOLTAGE_LEVEL );
         }
         return function;
     }
@@ -327,7 +333,7 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      */
     @Override
     public void unsetFunction() {
-        if (function != null) ((InternalEList.Unsettable<?>)function).unset();
+        if( function != null ) ( ( InternalEList.Unsettable< ? > ) function ).unset();
     }
 
     /**
@@ -337,7 +343,7 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      */
     @Override
     public boolean isSetFunction() {
-        return function != null && ((InternalEList.Unsettable<?>)function).isSet();
+        return function != null && ( ( InternalEList.Unsettable< ? > ) function ).isSet();
     }
 
     /**
@@ -347,8 +353,8 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      */
     @Override
     public Substation getParentSubstation() {
-        if (eContainerFeatureID() != SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION) return null;
-        return (Substation)eInternalContainer();
+        if( eContainerFeatureID() != SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION ) return null;
+        return ( Substation ) eInternalContainer();
     }
 
     /**
@@ -356,8 +362,9 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetParentSubstation(Substation newParentSubstation, NotificationChain msgs) {
-        msgs = eBasicSetContainer((InternalEObject)newParentSubstation, SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION, msgs);
+    public NotificationChain basicSetParentSubstation( Substation newParentSubstation, NotificationChain msgs ) {
+        msgs = eBasicSetContainer( ( InternalEObject ) newParentSubstation, SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION,
+                msgs );
         return msgs;
     }
 
@@ -367,20 +374,24 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      * @generated
      */
     @Override
-    public void setParentSubstation(Substation newParentSubstation) {
-        if (newParentSubstation != eInternalContainer() || (eContainerFeatureID() != SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION && newParentSubstation != null)) {
-            if (EcoreUtil.isAncestor(this, newParentSubstation))
-                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+    public void setParentSubstation( Substation newParentSubstation ) {
+        if( newParentSubstation != eInternalContainer()
+                || ( eContainerFeatureID() != SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION
+                        && newParentSubstation != null ) ) {
+            if( EcoreUtil.isAncestor( this, newParentSubstation ) )
+                throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() );
             NotificationChain msgs = null;
-            if (eInternalContainer() != null)
-                msgs = eBasicRemoveFromContainer(msgs);
-            if (newParentSubstation != null)
-                msgs = ((InternalEObject)newParentSubstation).eInverseAdd(this, SclPackage.SUBSTATION__VOLTAGE_LEVEL, Substation.class, msgs);
-            msgs = basicSetParentSubstation(newParentSubstation, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            if( newParentSubstation != null )
+                msgs = ( ( InternalEObject ) newParentSubstation ).eInverseAdd( this,
+                        SclPackage.SUBSTATION__VOLTAGE_LEVEL, Substation.class, msgs );
+            msgs = basicSetParentSubstation( newParentSubstation, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION, newParentSubstation, newParentSubstation));
+        else if( eNotificationRequired() )
+            eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION,
+                    newParentSubstation, newParentSubstation ) );
     }
 
     /**
@@ -403,9 +414,13 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
         voltage = newVoltage;
         boolean oldVoltageESet = voltageESet;
         voltageESet = true;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SclPackage.VOLTAGE_LEVEL__VOLTAGE, oldVoltage, newVoltage, !oldVoltageESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.SET,
+                    SclPackage.VOLTAGE_LEVEL__VOLTAGE, oldVoltage, newVoltage, !oldVoltageESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -417,20 +432,23 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      */
     @Override
     public void setVoltage( Voltage newVoltage ) {
-        if (newVoltage != voltage) {
+        if( newVoltage != voltage ) {
             NotificationChain msgs = null;
-            if (voltage != null)
-                msgs = ((InternalEObject)voltage).eInverseRemove(this, SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL, Voltage.class, msgs);
-            if (newVoltage != null)
-                msgs = ((InternalEObject)newVoltage).eInverseAdd(this, SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL, Voltage.class, msgs);
-            msgs = basicSetVoltage(newVoltage, msgs);
-            if (msgs != null) msgs.dispatch();
+            if( voltage != null )
+                msgs = ( ( InternalEObject ) voltage ).eInverseRemove( this, SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL,
+                        Voltage.class, msgs );
+            if( newVoltage != null )
+                msgs = ( ( InternalEObject ) newVoltage ).eInverseAdd( this, SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL,
+                        Voltage.class, msgs );
+            msgs = basicSetVoltage( newVoltage, msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldVoltageESet = voltageESet;
             voltageESet = true;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.SET, SclPackage.VOLTAGE_LEVEL__VOLTAGE, newVoltage, newVoltage, !oldVoltageESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.VOLTAGE_LEVEL__VOLTAGE, newVoltage,
+                        newVoltage, !oldVoltageESet ) );
         }
     }
 
@@ -444,9 +462,13 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
         voltage = null;
         boolean oldVoltageESet = voltageESet;
         voltageESet = false;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, SclPackage.VOLTAGE_LEVEL__VOLTAGE, oldVoltage, null, oldVoltageESet);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
+        if( eNotificationRequired() ) {
+            ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET,
+                    SclPackage.VOLTAGE_LEVEL__VOLTAGE, oldVoltage, null, oldVoltageESet );
+            if( msgs == null )
+                msgs = notification;
+            else
+                msgs.add( notification );
         }
         return msgs;
     }
@@ -458,17 +480,19 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      */
     @Override
     public void unsetVoltage() {
-        if (voltage != null) {
+        if( voltage != null ) {
             NotificationChain msgs = null;
-            msgs = ((InternalEObject)voltage).eInverseRemove(this, SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL, Voltage.class, msgs);
-            msgs = basicUnsetVoltage(msgs);
-            if (msgs != null) msgs.dispatch();
+            msgs = ( ( InternalEObject ) voltage ).eInverseRemove( this, SclPackage.VOLTAGE__PARENT_VOLTAGE_LEVEL,
+                    Voltage.class, msgs );
+            msgs = basicUnsetVoltage( msgs );
+            if( msgs != null ) msgs.dispatch();
         }
         else {
             boolean oldVoltageESet = voltageESet;
             voltageESet = false;
-            if (eNotificationRequired())
-                eNotify(new ENotificationImpl(this, Notification.UNSET, SclPackage.VOLTAGE_LEVEL__VOLTAGE, null, null, oldVoltageESet));
+            if( eNotificationRequired() )
+                eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.VOLTAGE_LEVEL__VOLTAGE, null, null,
+                        oldVoltageESet ) );
         }
     }
 
@@ -490,21 +514,23 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
     @SuppressWarnings( "unchecked" )
     @Override
     public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.VOLTAGE_LEVEL__BAY:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getBay()).basicAdd(otherEnd, msgs);
-            case SclPackage.VOLTAGE_LEVEL__FUNCTION:
-                return ((InternalEList<InternalEObject>)(InternalEList<?>)getFunction()).basicAdd(otherEnd, msgs);
-            case SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION:
-                if (eInternalContainer() != null)
-                    msgs = eBasicRemoveFromContainer(msgs);
-                return basicSetParentSubstation((Substation)otherEnd, msgs);
-            case SclPackage.VOLTAGE_LEVEL__VOLTAGE:
-                if (voltage != null)
-                    msgs = ((InternalEObject)voltage).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SclPackage.VOLTAGE_LEVEL__VOLTAGE, null, msgs);
-                return basicSetVoltage((Voltage)otherEnd, msgs);
+        switch( featureID ) {
+        case SclPackage.VOLTAGE_LEVEL__BAY:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getBay() ).basicAdd( otherEnd, msgs );
+        case SclPackage.VOLTAGE_LEVEL__FUNCTION:
+            return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getFunction() ).basicAdd( otherEnd,
+                    msgs );
+        case SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION:
+            if( eInternalContainer() != null )
+                msgs = eBasicRemoveFromContainer( msgs );
+            return basicSetParentSubstation( ( Substation ) otherEnd, msgs );
+        case SclPackage.VOLTAGE_LEVEL__VOLTAGE:
+            if( voltage != null )
+                msgs = ( ( InternalEObject ) voltage ).eInverseRemove( this,
+                        EOPPOSITE_FEATURE_BASE - SclPackage.VOLTAGE_LEVEL__VOLTAGE, null, msgs );
+            return basicSetVoltage( ( Voltage ) otherEnd, msgs );
         }
-        return super.eInverseAdd(otherEnd, featureID, msgs);
+        return super.eInverseAdd( otherEnd, featureID, msgs );
     }
 
     /**
@@ -514,17 +540,17 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      */
     @Override
     public NotificationChain eInverseRemove( InternalEObject otherEnd, int featureID, NotificationChain msgs ) {
-        switch (featureID) {
-            case SclPackage.VOLTAGE_LEVEL__BAY:
-                return ((InternalEList<?>)getBay()).basicRemove(otherEnd, msgs);
-            case SclPackage.VOLTAGE_LEVEL__FUNCTION:
-                return ((InternalEList<?>)getFunction()).basicRemove(otherEnd, msgs);
-            case SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION:
-                return basicSetParentSubstation(null, msgs);
-            case SclPackage.VOLTAGE_LEVEL__VOLTAGE:
-                return basicUnsetVoltage(msgs);
+        switch( featureID ) {
+        case SclPackage.VOLTAGE_LEVEL__BAY:
+            return ( ( InternalEList< ? > ) getBay() ).basicRemove( otherEnd, msgs );
+        case SclPackage.VOLTAGE_LEVEL__FUNCTION:
+            return ( ( InternalEList< ? > ) getFunction() ).basicRemove( otherEnd, msgs );
+        case SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION:
+            return basicSetParentSubstation( null, msgs );
+        case SclPackage.VOLTAGE_LEVEL__VOLTAGE:
+            return basicUnsetVoltage( msgs );
         }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
+        return super.eInverseRemove( otherEnd, featureID, msgs );
     }
 
     /**
@@ -534,11 +560,12 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      */
     @Override
     public NotificationChain eBasicRemoveFromContainerFeature( NotificationChain msgs ) {
-        switch (eContainerFeatureID()) {
-            case SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION:
-                return eInternalContainer().eInverseRemove(this, SclPackage.SUBSTATION__VOLTAGE_LEVEL, Substation.class, msgs);
+        switch( eContainerFeatureID() ) {
+        case SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION:
+            return eInternalContainer().eInverseRemove( this, SclPackage.SUBSTATION__VOLTAGE_LEVEL, Substation.class,
+                    msgs );
         }
-        return super.eBasicRemoveFromContainerFeature(msgs);
+        return super.eBasicRemoveFromContainerFeature( msgs );
     }
 
     /**
@@ -548,21 +575,21 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      */
     @Override
     public Object eGet( int featureID, boolean resolve, boolean coreType ) {
-        switch (featureID) {
-            case SclPackage.VOLTAGE_LEVEL__NOM_FREQ:
-                return getNomFreq();
-            case SclPackage.VOLTAGE_LEVEL__NUM_PHASES:
-                return getNumPhases();
-            case SclPackage.VOLTAGE_LEVEL__BAY:
-                return getBay();
-            case SclPackage.VOLTAGE_LEVEL__FUNCTION:
-                return getFunction();
-            case SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION:
-                return getParentSubstation();
-            case SclPackage.VOLTAGE_LEVEL__VOLTAGE:
-                return getVoltage();
+        switch( featureID ) {
+        case SclPackage.VOLTAGE_LEVEL__NOM_FREQ:
+            return getNomFreq();
+        case SclPackage.VOLTAGE_LEVEL__NUM_PHASES:
+            return getNumPhases();
+        case SclPackage.VOLTAGE_LEVEL__BAY:
+            return getBay();
+        case SclPackage.VOLTAGE_LEVEL__FUNCTION:
+            return getFunction();
+        case SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION:
+            return getParentSubstation();
+        case SclPackage.VOLTAGE_LEVEL__VOLTAGE:
+            return getVoltage();
         }
-        return super.eGet(featureID, resolve, coreType);
+        return super.eGet( featureID, resolve, coreType );
     }
 
     /**
@@ -573,29 +600,29 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
     @SuppressWarnings( "unchecked" )
     @Override
     public void eSet( int featureID, Object newValue ) {
-        switch (featureID) {
-            case SclPackage.VOLTAGE_LEVEL__NOM_FREQ:
-                setNomFreq((BigDecimal)newValue);
-                return;
-            case SclPackage.VOLTAGE_LEVEL__NUM_PHASES:
-                setNumPhases((Integer)newValue);
-                return;
-            case SclPackage.VOLTAGE_LEVEL__BAY:
-                getBay().clear();
-                getBay().addAll((Collection<? extends Bay>)newValue);
-                return;
-            case SclPackage.VOLTAGE_LEVEL__FUNCTION:
-                getFunction().clear();
-                getFunction().addAll((Collection<? extends Function>)newValue);
-                return;
-            case SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION:
-                setParentSubstation((Substation)newValue);
-                return;
-            case SclPackage.VOLTAGE_LEVEL__VOLTAGE:
-                setVoltage((Voltage)newValue);
-                return;
+        switch( featureID ) {
+        case SclPackage.VOLTAGE_LEVEL__NOM_FREQ:
+            setNomFreq( ( BigDecimal ) newValue );
+            return;
+        case SclPackage.VOLTAGE_LEVEL__NUM_PHASES:
+            setNumPhases( ( Integer ) newValue );
+            return;
+        case SclPackage.VOLTAGE_LEVEL__BAY:
+            getBay().clear();
+            getBay().addAll( ( Collection< ? extends Bay > ) newValue );
+            return;
+        case SclPackage.VOLTAGE_LEVEL__FUNCTION:
+            getFunction().clear();
+            getFunction().addAll( ( Collection< ? extends Function > ) newValue );
+            return;
+        case SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION:
+            setParentSubstation( ( Substation ) newValue );
+            return;
+        case SclPackage.VOLTAGE_LEVEL__VOLTAGE:
+            setVoltage( ( Voltage ) newValue );
+            return;
         }
-        super.eSet(featureID, newValue);
+        super.eSet( featureID, newValue );
     }
 
     /**
@@ -605,27 +632,27 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      */
     @Override
     public void eUnset( int featureID ) {
-        switch (featureID) {
-            case SclPackage.VOLTAGE_LEVEL__NOM_FREQ:
-                unsetNomFreq();
-                return;
-            case SclPackage.VOLTAGE_LEVEL__NUM_PHASES:
-                unsetNumPhases();
-                return;
-            case SclPackage.VOLTAGE_LEVEL__BAY:
-                unsetBay();
-                return;
-            case SclPackage.VOLTAGE_LEVEL__FUNCTION:
-                unsetFunction();
-                return;
-            case SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION:
-                setParentSubstation((Substation)null);
-                return;
-            case SclPackage.VOLTAGE_LEVEL__VOLTAGE:
-                unsetVoltage();
-                return;
+        switch( featureID ) {
+        case SclPackage.VOLTAGE_LEVEL__NOM_FREQ:
+            unsetNomFreq();
+            return;
+        case SclPackage.VOLTAGE_LEVEL__NUM_PHASES:
+            unsetNumPhases();
+            return;
+        case SclPackage.VOLTAGE_LEVEL__BAY:
+            unsetBay();
+            return;
+        case SclPackage.VOLTAGE_LEVEL__FUNCTION:
+            unsetFunction();
+            return;
+        case SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION:
+            setParentSubstation( ( Substation ) null );
+            return;
+        case SclPackage.VOLTAGE_LEVEL__VOLTAGE:
+            unsetVoltage();
+            return;
         }
-        super.eUnset(featureID);
+        super.eUnset( featureID );
     }
 
     /**
@@ -635,21 +662,21 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      */
     @Override
     public boolean eIsSet( int featureID ) {
-        switch (featureID) {
-            case SclPackage.VOLTAGE_LEVEL__NOM_FREQ:
-                return isSetNomFreq();
-            case SclPackage.VOLTAGE_LEVEL__NUM_PHASES:
-                return isSetNumPhases();
-            case SclPackage.VOLTAGE_LEVEL__BAY:
-                return isSetBay();
-            case SclPackage.VOLTAGE_LEVEL__FUNCTION:
-                return isSetFunction();
-            case SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION:
-                return getParentSubstation() != null;
-            case SclPackage.VOLTAGE_LEVEL__VOLTAGE:
-                return isSetVoltage();
+        switch( featureID ) {
+        case SclPackage.VOLTAGE_LEVEL__NOM_FREQ:
+            return isSetNomFreq();
+        case SclPackage.VOLTAGE_LEVEL__NUM_PHASES:
+            return isSetNumPhases();
+        case SclPackage.VOLTAGE_LEVEL__BAY:
+            return isSetBay();
+        case SclPackage.VOLTAGE_LEVEL__FUNCTION:
+            return isSetFunction();
+        case SclPackage.VOLTAGE_LEVEL__PARENT_SUBSTATION:
+            return getParentSubstation() != null;
+        case SclPackage.VOLTAGE_LEVEL__VOLTAGE:
+            return isSetVoltage();
         }
-        return super.eIsSet(featureID);
+        return super.eIsSet( featureID );
     }
 
     /**
@@ -659,14 +686,20 @@ public class VoltageLevelImpl extends EquipmentContainerImpl implements VoltageL
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuilder result = new StringBuilder(super.toString());
-        result.append(" (nomFreq: ");
-        if (nomFreqESet) result.append(nomFreq); else result.append("<unset>");
-        result.append(", numPhases: ");
-        if (numPhasesESet) result.append(numPhases); else result.append("<unset>");
-        result.append(')');
+        if( eIsProxy() ) return super.toString();
+
+        StringBuilder result = new StringBuilder( super.toString() );
+        result.append( " (nomFreq: " );
+        if( nomFreqESet )
+            result.append( nomFreq );
+        else
+            result.append( "<unset>" );
+        result.append( ", numPhases: " );
+        if( numPhasesESet )
+            result.append( numPhases );
+        else
+            result.append( "<unset>" );
+        result.append( ')' );
         return result.toString();
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclAdapterFactory.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclAdapterFactory.java
index 122745b..8f9b8bc 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclAdapterFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclAdapterFactory.java
@@ -52,7 +52,7 @@ public class SclAdapterFactory extends AdapterFactoryImpl {
      * @generated
      */
     public SclAdapterFactory() {
-        if (modelPackage == null) {
+        if( modelPackage == null ) {
             modelPackage = SclPackage.eINSTANCE;
         }
     }
@@ -67,11 +67,11 @@ public class SclAdapterFactory extends AdapterFactoryImpl {
      */
     @Override
     public boolean isFactoryForType( Object object ) {
-        if (object == modelPackage) {
+        if( object == modelPackage ) {
             return true;
         }
-        if (object instanceof EObject) {
-            return ((EObject)object).eClass().getEPackage() == modelPackage;
+        if( object instanceof EObject ) {
+            return ( ( EObject ) object ).eClass().getEPackage() == modelPackage;
         }
         return false;
     }
@@ -82,692 +82,862 @@ public class SclAdapterFactory extends AdapterFactoryImpl {
      * 
      * @generated
      */
-    protected SclSwitch<Adapter> modelSwitch = new SclSwitch<Adapter>() {
-            @Override
-            public Adapter caseAnyContentFromOtherNamespace(AnyContentFromOtherNamespace object) {
-                return createAnyContentFromOtherNamespaceAdapter();
-            }
-            @Override
-            public Adapter caseBaseElement(BaseElement object) {
-                return createBaseElementAdapter();
-            }
-            @Override
-            public Adapter caseHeader(Header object) {
-                return createHeaderAdapter();
-            }
-            @Override
-            public Adapter caseHistory(History object) {
-                return createHistoryAdapter();
-            }
-            @Override
-            public Adapter caseHitem(Hitem object) {
-                return createHitemAdapter();
-            }
-            @Override
-            public Adapter caseIDNaming(IDNaming object) {
-                return createIDNamingAdapter();
-            }
-            @Override
-            public Adapter caseLine(Line object) {
-                return createLineAdapter();
-            }
-            @Override
-            public Adapter caseNaming(Naming object) {
-                return createNamingAdapter();
-            }
-            @Override
-            public Adapter casePrivate(Private object) {
-                return createPrivateAdapter();
-            }
-            @Override
-            public Adapter caseProcess(fr.centralesupelec.edf.riseclipse.iec61850.scl.Process object) {
-                return createProcessAdapter();
-            }
-            @Override
-            public Adapter caseSCL(SCL object) {
-                return createSCLAdapter();
-            }
-            @Override
-            public Adapter caseText(Text object) {
-                return createTextAdapter();
-            }
-            @Override
-            public Adapter caseAddress(Address object) {
-                return createAddressAdapter();
-            }
-            @Override
-            public Adapter caseCommunication(Communication object) {
-                return createCommunicationAdapter();
-            }
-            @Override
-            public Adapter caseConnectedAP(ConnectedAP object) {
-                return createConnectedAPAdapter();
-            }
-            @Override
-            public Adapter caseControlBlock(ControlBlock object) {
-                return createControlBlockAdapter();
-            }
-            @Override
-            public Adapter caseGSE(GSE object) {
-                return createGSEAdapter();
-            }
-            @Override
-            public Adapter caseP(P object) {
-                return createPAdapter();
-            }
-            @Override
-            public Adapter casePAddr(PAddr object) {
-                return createPAddrAdapter();
-            }
-            @Override
-            public Adapter caseP_PhysConn(P_PhysConn object) {
-                return createP_PhysConnAdapter();
-            }
-            @Override
-            public Adapter casePhysConn(PhysConn object) {
-                return createPhysConnAdapter();
-            }
-            @Override
-            public Adapter caseSMV(SMV object) {
-                return createSMVAdapter();
-            }
-            @Override
-            public Adapter caseSubNetwork(SubNetwork object) {
-                return createSubNetworkAdapter();
-            }
-            @Override
-            public Adapter caseAbstractDataAttribute(AbstractDataAttribute object) {
-                return createAbstractDataAttributeAdapter();
-            }
-            @Override
-            public Adapter caseBDA(BDA object) {
-                return createBDAAdapter();
-            }
-            @Override
-            public Adapter caseDA(DA object) {
-                return createDAAdapter();
-            }
-            @Override
-            public Adapter caseDAType(DAType object) {
-                return createDATypeAdapter();
-            }
-            @Override
-            public Adapter caseDO(DO object) {
-                return createDOAdapter();
-            }
-            @Override
-            public Adapter caseDOType(DOType object) {
-                return createDOTypeAdapter();
-            }
-            @Override
-            public Adapter caseDataTypeTemplates(DataTypeTemplates object) {
-                return createDataTypeTemplatesAdapter();
-            }
-            @Override
-            public Adapter caseEnumType(EnumType object) {
-                return createEnumTypeAdapter();
-            }
-            @Override
-            public Adapter caseEnumVal(EnumVal object) {
-                return createEnumValAdapter();
-            }
-            @Override
-            public Adapter caseLNodeType(LNodeType object) {
-                return createLNodeTypeAdapter();
-            }
-            @Override
-            public Adapter caseProtNs(ProtNs object) {
-                return createProtNsAdapter();
-            }
-            @Override
-            public Adapter caseSDO(SDO object) {
-                return createSDOAdapter();
-            }
-            @Override
-            public Adapter caseVal(Val object) {
-                return createValAdapter();
-            }
-            @Override
-            public Adapter caseAccessControl(AccessControl object) {
-                return createAccessControlAdapter();
-            }
-            @Override
-            public Adapter caseAccessPoint(AccessPoint object) {
-                return createAccessPointAdapter();
-            }
-            @Override
-            public Adapter caseAnyLN(AnyLN object) {
-                return createAnyLNAdapter();
-            }
-            @Override
-            public Adapter caseAssociation(Association object) {
-                return createAssociationAdapter();
-            }
-            @Override
-            public Adapter caseAuthentication(Authentication object) {
-                return createAuthenticationAdapter();
-            }
-            @Override
-            public Adapter caseCertificate(Certificate object) {
-                return createCertificateAdapter();
-            }
-            @Override
-            public Adapter caseClientLN(ClientLN object) {
-                return createClientLNAdapter();
-            }
-            @Override
-            public Adapter caseClientServices(ClientServices object) {
-                return createClientServicesAdapter();
-            }
-            @Override
-            public Adapter caseCommProt(CommProt object) {
-                return createCommProtAdapter();
-            }
-            @Override
-            public Adapter caseConfDataSet(ConfDataSet object) {
-                return createConfDataSetAdapter();
-            }
-            @Override
-            public Adapter caseConfLNs(ConfLNs object) {
-                return createConfLNsAdapter();
-            }
-            @Override
-            public Adapter caseConfLdName(ConfLdName object) {
-                return createConfLdNameAdapter();
-            }
-            @Override
-            public Adapter caseConfLogControl(ConfLogControl object) {
-                return createConfLogControlAdapter();
-            }
-            @Override
-            public Adapter caseConfReportControl(ConfReportControl object) {
-                return createConfReportControlAdapter();
-            }
-            @Override
-            public Adapter caseConfSG(ConfSG object) {
-                return createConfSGAdapter();
-            }
-            @Override
-            public Adapter caseConfSigRef(ConfSigRef object) {
-                return createConfSigRefAdapter();
-            }
-            @Override
-            public Adapter caseControl(Control object) {
-                return createControlAdapter();
-            }
-            @Override
-            public Adapter caseControlWithIEDName(ControlWithIEDName object) {
-                return createControlWithIEDNameAdapter();
-            }
-            @Override
-            public Adapter caseControlWithTriggerOpt(ControlWithTriggerOpt object) {
-                return createControlWithTriggerOptAdapter();
-            }
-            @Override
-            public Adapter caseDAI(DAI object) {
-                return createDAIAdapter();
-            }
-            @Override
-            public Adapter caseDOI(DOI object) {
-                return createDOIAdapter();
-            }
-            @Override
-            public Adapter caseDataObjectDirectory(DataObjectDirectory object) {
-                return createDataObjectDirectoryAdapter();
-            }
-            @Override
-            public Adapter caseDataSet(DataSet object) {
-                return createDataSetAdapter();
-            }
-            @Override
-            public Adapter caseDataSetDirectory(DataSetDirectory object) {
-                return createDataSetDirectoryAdapter();
-            }
-            @Override
-            public Adapter caseDynAssociation(DynAssociation object) {
-                return createDynAssociationAdapter();
-            }
-            @Override
-            public Adapter caseDynDataSet(DynDataSet object) {
-                return createDynDataSetAdapter();
-            }
-            @Override
-            public Adapter caseExtRef(ExtRef object) {
-                return createExtRefAdapter();
-            }
-            @Override
-            public Adapter caseFCDA(FCDA object) {
-                return createFCDAAdapter();
-            }
-            @Override
-            public Adapter caseFileHandling(FileHandling object) {
-                return createFileHandlingAdapter();
-            }
-            @Override
-            public Adapter caseGOOSE(GOOSE object) {
-                return createGOOSEAdapter();
-            }
-            @Override
-            public Adapter caseGOOSESecurity(GOOSESecurity object) {
-                return createGOOSESecurityAdapter();
-            }
-            @Override
-            public Adapter caseGSEControl(GSEControl object) {
-                return createGSEControlAdapter();
-            }
-            @Override
-            public Adapter caseGSEDir(GSEDir object) {
-                return createGSEDirAdapter();
-            }
-            @Override
-            public Adapter caseGSESettings(GSESettings object) {
-                return createGSESettingsAdapter();
-            }
-            @Override
-            public Adapter caseGSSE(GSSE object) {
-                return createGSSEAdapter();
-            }
-            @Override
-            public Adapter caseGetCBValues(GetCBValues object) {
-                return createGetCBValuesAdapter();
-            }
-            @Override
-            public Adapter caseGetDataObjectDefinition(GetDataObjectDefinition object) {
-                return createGetDataObjectDefinitionAdapter();
-            }
-            @Override
-            public Adapter caseGetDataSetValue(GetDataSetValue object) {
-                return createGetDataSetValueAdapter();
-            }
-            @Override
-            public Adapter caseGetDirectory(GetDirectory object) {
-                return createGetDirectoryAdapter();
-            }
-            @Override
-            public Adapter caseIED(IED object) {
-                return createIEDAdapter();
-            }
-            @Override
-            public Adapter caseIEDName(IEDName object) {
-                return createIEDNameAdapter();
-            }
-            @Override
-            public Adapter caseInputs(Inputs object) {
-                return createInputsAdapter();
-            }
-            @Override
-            public Adapter caseIssuerName(IssuerName object) {
-                return createIssuerNameAdapter();
-            }
-            @Override
-            public Adapter caseKDC(KDC object) {
-                return createKDCAdapter();
-            }
-            @Override
-            public Adapter caseLDevice(LDevice object) {
-                return createLDeviceAdapter();
-            }
-            @Override
-            public Adapter caseLN(LN object) {
-                return createLNAdapter();
-            }
-            @Override
-            public Adapter caseLN0(LN0 object) {
-                return createLN0Adapter();
-            }
-            @Override
-            public Adapter caseLog(Log object) {
-                return createLogAdapter();
-            }
-            @Override
-            public Adapter caseLogControl(LogControl object) {
-                return createLogControlAdapter();
-            }
-            @Override
-            public Adapter caseLogSettings(LogSettings object) {
-                return createLogSettingsAdapter();
-            }
-            @Override
-            public Adapter caseOptFields(OptFields object) {
-                return createOptFieldsAdapter();
-            }
-            @Override
-            public Adapter caseProtocol(Protocol object) {
-                return createProtocolAdapter();
-            }
-            @Override
-            public Adapter caseReadWrite(ReadWrite object) {
-                return createReadWriteAdapter();
-            }
-            @Override
-            public Adapter caseRedProt(RedProt object) {
-                return createRedProtAdapter();
-            }
-            @Override
-            public Adapter caseReportControl(ReportControl object) {
-                return createReportControlAdapter();
-            }
-            @Override
-            public Adapter caseReportSettings(ReportSettings object) {
-                return createReportSettingsAdapter();
-            }
-            @Override
-            public Adapter caseRptEnabled(RptEnabled object) {
-                return createRptEnabledAdapter();
-            }
-            @Override
-            public Adapter caseSDI(SDI object) {
-                return createSDIAdapter();
-            }
-            @Override
-            public Adapter caseSGEdit(SGEdit object) {
-                return createSGEditAdapter();
-            }
-            @Override
-            public Adapter caseSMVSecurity(SMVSecurity object) {
-                return createSMVSecurityAdapter();
-            }
-            @Override
-            public Adapter caseSMVSettings(SMVSettings object) {
-                return createSMVSettingsAdapter();
-            }
-            @Override
-            public Adapter caseSMVsc(SMVsc object) {
-                return createSMVscAdapter();
-            }
-            @Override
-            public Adapter caseSampledValueControl(SampledValueControl object) {
-                return createSampledValueControlAdapter();
-            }
-            @Override
-            public Adapter caseServer(Server object) {
-                return createServerAdapter();
-            }
-            @Override
-            public Adapter caseServerAt(ServerAt object) {
-                return createServerAtAdapter();
-            }
-            @Override
-            public Adapter caseServiceSettings(ServiceSettings object) {
-                return createServiceSettingsAdapter();
-            }
-            @Override
-            public Adapter caseServiceWithMax(ServiceWithMax object) {
-                return createServiceWithMaxAdapter();
-            }
-            @Override
-            public Adapter caseServices(Services object) {
-                return createServicesAdapter();
-            }
-            @Override
-            public Adapter caseSetDataSetValue(SetDataSetValue object) {
-                return createSetDataSetValueAdapter();
-            }
-            @Override
-            public Adapter caseSettingControl(SettingControl object) {
-                return createSettingControlAdapter();
-            }
-            @Override
-            public Adapter caseSettingGroups(SettingGroups object) {
-                return createSettingGroupsAdapter();
-            }
-            @Override
-            public Adapter caseSmvOpts(SmvOpts object) {
-                return createSmvOptsAdapter();
-            }
-            @Override
-            public Adapter caseSubject(Subject object) {
-                return createSubjectAdapter();
-            }
-            @Override
-            public Adapter caseSupSubscription(SupSubscription object) {
-                return createSupSubscriptionAdapter();
-            }
-            @Override
-            public Adapter caseTimeSyncProt(TimeSyncProt object) {
-                return createTimeSyncProtAdapter();
-            }
-            @Override
-            public Adapter caseTimerActivatedControl(TimerActivatedControl object) {
-                return createTimerActivatedControlAdapter();
-            }
-            @Override
-            public Adapter caseTrgOps(TrgOps object) {
-                return createTrgOpsAdapter();
-            }
-            @Override
-            public Adapter caseValueHandling(ValueHandling object) {
-                return createValueHandlingAdapter();
-            }
-            @Override
-            public Adapter caseAbstractConductingEquipment(AbstractConductingEquipment object) {
-                return createAbstractConductingEquipmentAdapter();
-            }
-            @Override
-            public Adapter caseAbstractEqFuncSubFunc(AbstractEqFuncSubFunc object) {
-                return createAbstractEqFuncSubFuncAdapter();
-            }
-            @Override
-            public Adapter caseBay(Bay object) {
-                return createBayAdapter();
-            }
-            @Override
-            public Adapter caseConductingEquipment(ConductingEquipment object) {
-                return createConductingEquipmentAdapter();
-            }
-            @Override
-            public Adapter caseConnectivityNode(ConnectivityNode object) {
-                return createConnectivityNodeAdapter();
-            }
-            @Override
-            public Adapter caseEqFunction(EqFunction object) {
-                return createEqFunctionAdapter();
-            }
-            @Override
-            public Adapter caseEqSubFunction(EqSubFunction object) {
-                return createEqSubFunctionAdapter();
-            }
-            @Override
-            public Adapter caseEquipment(Equipment object) {
-                return createEquipmentAdapter();
-            }
-            @Override
-            public Adapter caseEquipmentContainer(EquipmentContainer object) {
-                return createEquipmentContainerAdapter();
-            }
-            @Override
-            public Adapter caseFunction(Function object) {
-                return createFunctionAdapter();
-            }
-            @Override
-            public Adapter caseGeneralEquipment(GeneralEquipment object) {
-                return createGeneralEquipmentAdapter();
-            }
-            @Override
-            public Adapter caseGeneralEquipmentContainer(GeneralEquipmentContainer object) {
-                return createGeneralEquipmentContainerAdapter();
-            }
-            @Override
-            public Adapter caseLNode(LNode object) {
-                return createLNodeAdapter();
-            }
-            @Override
-            public Adapter caseLNodeContainer(LNodeContainer object) {
-                return createLNodeContainerAdapter();
-            }
-            @Override
-            public Adapter caseNeutralPoint(NeutralPoint object) {
-                return createNeutralPointAdapter();
-            }
-            @Override
-            public Adapter casePowerSystemResource(PowerSystemResource object) {
-                return createPowerSystemResourceAdapter();
-            }
-            @Override
-            public Adapter casePowerTransformer(PowerTransformer object) {
-                return createPowerTransformerAdapter();
-            }
-            @Override
-            public Adapter caseSubEquipment(SubEquipment object) {
-                return createSubEquipmentAdapter();
-            }
-            @Override
-            public Adapter caseSubFunction(SubFunction object) {
-                return createSubFunctionAdapter();
-            }
-            @Override
-            public Adapter caseSubstation(Substation object) {
-                return createSubstationAdapter();
-            }
-            @Override
-            public Adapter caseTapChanger(TapChanger object) {
-                return createTapChangerAdapter();
-            }
-            @Override
-            public Adapter caseTerminal(Terminal object) {
-                return createTerminalAdapter();
-            }
-            @Override
-            public Adapter caseTransformerWinding(TransformerWinding object) {
-                return createTransformerWindingAdapter();
-            }
-            @Override
-            public Adapter caseVoltage(Voltage object) {
-                return createVoltageAdapter();
-            }
-            @Override
-            public Adapter caseVoltageLevel(VoltageLevel object) {
-                return createVoltageLevelAdapter();
-            }
-            @Override
-            public Adapter caseAbstractDataObject(AbstractDataObject object) {
-                return createAbstractDataObjectAdapter();
-            }
-            @Override
-            public Adapter caseSclObject(SclObject object) {
-                return createSclObjectAdapter();
-            }
-            @Override
-            public Adapter caseUnNaming(UnNaming object) {
-                return createUnNamingAdapter();
-            }
-            @Override
-            public Adapter caseServiceYesNo(ServiceYesNo object) {
-                return createServiceYesNoAdapter();
-            }
-            @Override
-            public Adapter caseServiceWithOptionalMax(ServiceWithOptionalMax object) {
-                return createServiceWithOptionalMaxAdapter();
-            }
-            @Override
-            public Adapter caseServiceWithMaxNonZero(ServiceWithMaxNonZero object) {
-                return createServiceWithMaxNonZeroAdapter();
-            }
-            @Override
-            public Adapter caseServiceConfReportControl(ServiceConfReportControl object) {
-                return createServiceConfReportControlAdapter();
-            }
-            @Override
-            public Adapter caseServiceWithMaxAndMaxAttributes(ServiceWithMaxAndMaxAttributes object) {
-                return createServiceWithMaxAndMaxAttributesAdapter();
-            }
-            @Override
-            public Adapter caseServiceWithMaxAndModify(ServiceWithMaxAndModify object) {
-                return createServiceWithMaxAndModifyAdapter();
-            }
-            @Override
-            public Adapter caseServiceForConfDataSet(ServiceForConfDataSet object) {
-                return createServiceForConfDataSetAdapter();
-            }
-            @Override
-            public Adapter caseCert(Cert object) {
-                return createCertAdapter();
-            }
-            @Override
-            public Adapter caseValueWithUnit(ValueWithUnit object) {
-                return createValueWithUnitAdapter();
-            }
-            @Override
-            public Adapter caseDurationInSec(DurationInSec object) {
-                return createDurationInSecAdapter();
-            }
-            @Override
-            public Adapter caseDurationInMilliSec(DurationInMilliSec object) {
-                return createDurationInMilliSecAdapter();
-            }
-            @Override
-            public Adapter caseBitRateInMbPerSec(BitRateInMbPerSec object) {
-                return createBitRateInMbPerSecAdapter();
-            }
-            @Override
-            public Adapter caseMinTime(MinTime object) {
-                return createMinTimeAdapter();
-            }
-            @Override
-            public Adapter caseMaxTime(MaxTime object) {
-                return createMaxTimeAdapter();
-            }
-            @Override
-            public Adapter caseBitRate(BitRate object) {
-                return createBitRateAdapter();
-            }
-            @Override
-            public Adapter caseSmpRate(SmpRate object) {
-                return createSmpRateAdapter();
-            }
-            @Override
-            public Adapter caseSamplesPerSec(SamplesPerSec object) {
-                return createSamplesPerSecAdapter();
-            }
-            @Override
-            public Adapter caseSecPerSamples(SecPerSamples object) {
-                return createSecPerSamplesAdapter();
-            }
-            @Override
-            public Adapter caseMcSecurity(McSecurity object) {
-                return createMcSecurityAdapter();
-            }
-            @Override
-            public Adapter caseAgAuthentication(AgAuthentication object) {
-                return createAgAuthenticationAdapter();
-            }
-            @Override
-            public Adapter caseAgSmvOpts(AgSmvOpts object) {
-                return createAgSmvOptsAdapter();
-            }
-            @Override
-            public Adapter caseAgOptFields(AgOptFields object) {
-                return createAgOptFieldsAdapter();
-            }
-            @Override
-            public Adapter caseAgDesc(AgDesc object) {
-                return createAgDescAdapter();
-            }
-            @Override
-            public Adapter caseAgLDRef(AgLDRef object) {
-                return createAgLDRefAdapter();
-            }
-            @Override
-            public Adapter caseAgLNRef(AgLNRef object) {
-                return createAgLNRefAdapter();
-            }
-            @Override
-            public Adapter caseAgDATrgOp(AgDATrgOp object) {
-                return createAgDATrgOpAdapter();
-            }
-            @Override
-            public Adapter caseAgVirtual(AgVirtual object) {
-                return createAgVirtualAdapter();
-            }
-            @Override
-            public Adapter caseIRiseClipseConsole(IRiseClipseConsole object) {
-                return createIRiseClipseConsoleAdapter();
-            }
-            @Override
-            public Adapter defaultCase(EObject object) {
-                return createEObjectAdapter();
-            }
-        };
+    protected SclSwitch< Adapter > modelSwitch = new SclSwitch< Adapter >() {
+        @Override
+        public Adapter caseAnyContentFromOtherNamespace( AnyContentFromOtherNamespace object ) {
+            return createAnyContentFromOtherNamespaceAdapter();
+        }
+
+        @Override
+        public Adapter caseBaseElement( BaseElement object ) {
+            return createBaseElementAdapter();
+        }
+
+        @Override
+        public Adapter caseHeader( Header object ) {
+            return createHeaderAdapter();
+        }
+
+        @Override
+        public Adapter caseHistory( History object ) {
+            return createHistoryAdapter();
+        }
+
+        @Override
+        public Adapter caseHitem( Hitem object ) {
+            return createHitemAdapter();
+        }
+
+        @Override
+        public Adapter caseIDNaming( IDNaming object ) {
+            return createIDNamingAdapter();
+        }
+
+        @Override
+        public Adapter caseLine( Line object ) {
+            return createLineAdapter();
+        }
+
+        @Override
+        public Adapter caseNaming( Naming object ) {
+            return createNamingAdapter();
+        }
+
+        @Override
+        public Adapter casePrivate( Private object ) {
+            return createPrivateAdapter();
+        }
+
+        @Override
+        public Adapter caseProcess( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process object ) {
+            return createProcessAdapter();
+        }
+
+        @Override
+        public Adapter caseSCL( SCL object ) {
+            return createSCLAdapter();
+        }
+
+        @Override
+        public Adapter caseText( Text object ) {
+            return createTextAdapter();
+        }
+
+        @Override
+        public Adapter caseAddress( Address object ) {
+            return createAddressAdapter();
+        }
+
+        @Override
+        public Adapter caseCommunication( Communication object ) {
+            return createCommunicationAdapter();
+        }
+
+        @Override
+        public Adapter caseConnectedAP( ConnectedAP object ) {
+            return createConnectedAPAdapter();
+        }
+
+        @Override
+        public Adapter caseControlBlock( ControlBlock object ) {
+            return createControlBlockAdapter();
+        }
+
+        @Override
+        public Adapter caseGSE( GSE object ) {
+            return createGSEAdapter();
+        }
+
+        @Override
+        public Adapter caseP( P object ) {
+            return createPAdapter();
+        }
+
+        @Override
+        public Adapter casePAddr( PAddr object ) {
+            return createPAddrAdapter();
+        }
+
+        @Override
+        public Adapter caseP_PhysConn( P_PhysConn object ) {
+            return createP_PhysConnAdapter();
+        }
+
+        @Override
+        public Adapter casePhysConn( PhysConn object ) {
+            return createPhysConnAdapter();
+        }
+
+        @Override
+        public Adapter caseSMV( SMV object ) {
+            return createSMVAdapter();
+        }
+
+        @Override
+        public Adapter caseSubNetwork( SubNetwork object ) {
+            return createSubNetworkAdapter();
+        }
+
+        @Override
+        public Adapter caseAbstractDataAttribute( AbstractDataAttribute object ) {
+            return createAbstractDataAttributeAdapter();
+        }
+
+        @Override
+        public Adapter caseBDA( BDA object ) {
+            return createBDAAdapter();
+        }
+
+        @Override
+        public Adapter caseDA( DA object ) {
+            return createDAAdapter();
+        }
+
+        @Override
+        public Adapter caseDAType( DAType object ) {
+            return createDATypeAdapter();
+        }
+
+        @Override
+        public Adapter caseDO( DO object ) {
+            return createDOAdapter();
+        }
+
+        @Override
+        public Adapter caseDOType( DOType object ) {
+            return createDOTypeAdapter();
+        }
+
+        @Override
+        public Adapter caseDataTypeTemplates( DataTypeTemplates object ) {
+            return createDataTypeTemplatesAdapter();
+        }
+
+        @Override
+        public Adapter caseEnumType( EnumType object ) {
+            return createEnumTypeAdapter();
+        }
+
+        @Override
+        public Adapter caseEnumVal( EnumVal object ) {
+            return createEnumValAdapter();
+        }
+
+        @Override
+        public Adapter caseLNodeType( LNodeType object ) {
+            return createLNodeTypeAdapter();
+        }
+
+        @Override
+        public Adapter caseProtNs( ProtNs object ) {
+            return createProtNsAdapter();
+        }
+
+        @Override
+        public Adapter caseSDO( SDO object ) {
+            return createSDOAdapter();
+        }
+
+        @Override
+        public Adapter caseVal( Val object ) {
+            return createValAdapter();
+        }
+
+        @Override
+        public Adapter caseAccessControl( AccessControl object ) {
+            return createAccessControlAdapter();
+        }
+
+        @Override
+        public Adapter caseAccessPoint( AccessPoint object ) {
+            return createAccessPointAdapter();
+        }
+
+        @Override
+        public Adapter caseAnyLN( AnyLN object ) {
+            return createAnyLNAdapter();
+        }
+
+        @Override
+        public Adapter caseAssociation( Association object ) {
+            return createAssociationAdapter();
+        }
+
+        @Override
+        public Adapter caseAuthentication( Authentication object ) {
+            return createAuthenticationAdapter();
+        }
+
+        @Override
+        public Adapter caseCertificate( Certificate object ) {
+            return createCertificateAdapter();
+        }
+
+        @Override
+        public Adapter caseClientLN( ClientLN object ) {
+            return createClientLNAdapter();
+        }
+
+        @Override
+        public Adapter caseClientServices( ClientServices object ) {
+            return createClientServicesAdapter();
+        }
+
+        @Override
+        public Adapter caseCommProt( CommProt object ) {
+            return createCommProtAdapter();
+        }
+
+        @Override
+        public Adapter caseConfDataSet( ConfDataSet object ) {
+            return createConfDataSetAdapter();
+        }
+
+        @Override
+        public Adapter caseConfLNs( ConfLNs object ) {
+            return createConfLNsAdapter();
+        }
+
+        @Override
+        public Adapter caseConfLdName( ConfLdName object ) {
+            return createConfLdNameAdapter();
+        }
+
+        @Override
+        public Adapter caseConfLogControl( ConfLogControl object ) {
+            return createConfLogControlAdapter();
+        }
+
+        @Override
+        public Adapter caseConfReportControl( ConfReportControl object ) {
+            return createConfReportControlAdapter();
+        }
+
+        @Override
+        public Adapter caseConfSG( ConfSG object ) {
+            return createConfSGAdapter();
+        }
+
+        @Override
+        public Adapter caseConfSigRef( ConfSigRef object ) {
+            return createConfSigRefAdapter();
+        }
+
+        @Override
+        public Adapter caseControl( Control object ) {
+            return createControlAdapter();
+        }
+
+        @Override
+        public Adapter caseControlWithIEDName( ControlWithIEDName object ) {
+            return createControlWithIEDNameAdapter();
+        }
+
+        @Override
+        public Adapter caseControlWithTriggerOpt( ControlWithTriggerOpt object ) {
+            return createControlWithTriggerOptAdapter();
+        }
+
+        @Override
+        public Adapter caseDAI( DAI object ) {
+            return createDAIAdapter();
+        }
+
+        @Override
+        public Adapter caseDOI( DOI object ) {
+            return createDOIAdapter();
+        }
+
+        @Override
+        public Adapter caseDataObjectDirectory( DataObjectDirectory object ) {
+            return createDataObjectDirectoryAdapter();
+        }
+
+        @Override
+        public Adapter caseDataSet( DataSet object ) {
+            return createDataSetAdapter();
+        }
+
+        @Override
+        public Adapter caseDataSetDirectory( DataSetDirectory object ) {
+            return createDataSetDirectoryAdapter();
+        }
+
+        @Override
+        public Adapter caseDynAssociation( DynAssociation object ) {
+            return createDynAssociationAdapter();
+        }
+
+        @Override
+        public Adapter caseDynDataSet( DynDataSet object ) {
+            return createDynDataSetAdapter();
+        }
+
+        @Override
+        public Adapter caseExtRef( ExtRef object ) {
+            return createExtRefAdapter();
+        }
+
+        @Override
+        public Adapter caseFCDA( FCDA object ) {
+            return createFCDAAdapter();
+        }
+
+        @Override
+        public Adapter caseFileHandling( FileHandling object ) {
+            return createFileHandlingAdapter();
+        }
+
+        @Override
+        public Adapter caseGOOSE( GOOSE object ) {
+            return createGOOSEAdapter();
+        }
+
+        @Override
+        public Adapter caseGOOSESecurity( GOOSESecurity object ) {
+            return createGOOSESecurityAdapter();
+        }
+
+        @Override
+        public Adapter caseGSEControl( GSEControl object ) {
+            return createGSEControlAdapter();
+        }
+
+        @Override
+        public Adapter caseGSEDir( GSEDir object ) {
+            return createGSEDirAdapter();
+        }
+
+        @Override
+        public Adapter caseGSESettings( GSESettings object ) {
+            return createGSESettingsAdapter();
+        }
+
+        @Override
+        public Adapter caseGSSE( GSSE object ) {
+            return createGSSEAdapter();
+        }
+
+        @Override
+        public Adapter caseGetCBValues( GetCBValues object ) {
+            return createGetCBValuesAdapter();
+        }
+
+        @Override
+        public Adapter caseGetDataObjectDefinition( GetDataObjectDefinition object ) {
+            return createGetDataObjectDefinitionAdapter();
+        }
+
+        @Override
+        public Adapter caseGetDataSetValue( GetDataSetValue object ) {
+            return createGetDataSetValueAdapter();
+        }
+
+        @Override
+        public Adapter caseGetDirectory( GetDirectory object ) {
+            return createGetDirectoryAdapter();
+        }
+
+        @Override
+        public Adapter caseIED( IED object ) {
+            return createIEDAdapter();
+        }
+
+        @Override
+        public Adapter caseIEDName( IEDName object ) {
+            return createIEDNameAdapter();
+        }
+
+        @Override
+        public Adapter caseInputs( Inputs object ) {
+            return createInputsAdapter();
+        }
+
+        @Override
+        public Adapter caseIssuerName( IssuerName object ) {
+            return createIssuerNameAdapter();
+        }
+
+        @Override
+        public Adapter caseKDC( KDC object ) {
+            return createKDCAdapter();
+        }
+
+        @Override
+        public Adapter caseLDevice( LDevice object ) {
+            return createLDeviceAdapter();
+        }
+
+        @Override
+        public Adapter caseLN( LN object ) {
+            return createLNAdapter();
+        }
+
+        @Override
+        public Adapter caseLN0( LN0 object ) {
+            return createLN0Adapter();
+        }
+
+        @Override
+        public Adapter caseLog( Log object ) {
+            return createLogAdapter();
+        }
+
+        @Override
+        public Adapter caseLogControl( LogControl object ) {
+            return createLogControlAdapter();
+        }
+
+        @Override
+        public Adapter caseLogSettings( LogSettings object ) {
+            return createLogSettingsAdapter();
+        }
+
+        @Override
+        public Adapter caseOptFields( OptFields object ) {
+            return createOptFieldsAdapter();
+        }
+
+        @Override
+        public Adapter caseProtocol( Protocol object ) {
+            return createProtocolAdapter();
+        }
+
+        @Override
+        public Adapter caseReadWrite( ReadWrite object ) {
+            return createReadWriteAdapter();
+        }
+
+        @Override
+        public Adapter caseRedProt( RedProt object ) {
+            return createRedProtAdapter();
+        }
+
+        @Override
+        public Adapter caseReportControl( ReportControl object ) {
+            return createReportControlAdapter();
+        }
+
+        @Override
+        public Adapter caseReportSettings( ReportSettings object ) {
+            return createReportSettingsAdapter();
+        }
+
+        @Override
+        public Adapter caseRptEnabled( RptEnabled object ) {
+            return createRptEnabledAdapter();
+        }
+
+        @Override
+        public Adapter caseSDI( SDI object ) {
+            return createSDIAdapter();
+        }
+
+        @Override
+        public Adapter caseSGEdit( SGEdit object ) {
+            return createSGEditAdapter();
+        }
+
+        @Override
+        public Adapter caseSMVSecurity( SMVSecurity object ) {
+            return createSMVSecurityAdapter();
+        }
+
+        @Override
+        public Adapter caseSMVSettings( SMVSettings object ) {
+            return createSMVSettingsAdapter();
+        }
+
+        @Override
+        public Adapter caseSMVsc( SMVsc object ) {
+            return createSMVscAdapter();
+        }
+
+        @Override
+        public Adapter caseSampledValueControl( SampledValueControl object ) {
+            return createSampledValueControlAdapter();
+        }
+
+        @Override
+        public Adapter caseServer( Server object ) {
+            return createServerAdapter();
+        }
+
+        @Override
+        public Adapter caseServerAt( ServerAt object ) {
+            return createServerAtAdapter();
+        }
+
+        @Override
+        public Adapter caseServiceSettings( ServiceSettings object ) {
+            return createServiceSettingsAdapter();
+        }
+
+        @Override
+        public Adapter caseServiceWithMax( ServiceWithMax object ) {
+            return createServiceWithMaxAdapter();
+        }
+
+        @Override
+        public Adapter caseServices( Services object ) {
+            return createServicesAdapter();
+        }
+
+        @Override
+        public Adapter caseSetDataSetValue( SetDataSetValue object ) {
+            return createSetDataSetValueAdapter();
+        }
+
+        @Override
+        public Adapter caseSettingControl( SettingControl object ) {
+            return createSettingControlAdapter();
+        }
+
+        @Override
+        public Adapter caseSettingGroups( SettingGroups object ) {
+            return createSettingGroupsAdapter();
+        }
+
+        @Override
+        public Adapter caseSmvOpts( SmvOpts object ) {
+            return createSmvOptsAdapter();
+        }
+
+        @Override
+        public Adapter caseSubject( Subject object ) {
+            return createSubjectAdapter();
+        }
+
+        @Override
+        public Adapter caseSupSubscription( SupSubscription object ) {
+            return createSupSubscriptionAdapter();
+        }
+
+        @Override
+        public Adapter caseTimeSyncProt( TimeSyncProt object ) {
+            return createTimeSyncProtAdapter();
+        }
+
+        @Override
+        public Adapter caseTimerActivatedControl( TimerActivatedControl object ) {
+            return createTimerActivatedControlAdapter();
+        }
+
+        @Override
+        public Adapter caseTrgOps( TrgOps object ) {
+            return createTrgOpsAdapter();
+        }
+
+        @Override
+        public Adapter caseValueHandling( ValueHandling object ) {
+            return createValueHandlingAdapter();
+        }
+
+        @Override
+        public Adapter caseAbstractConductingEquipment( AbstractConductingEquipment object ) {
+            return createAbstractConductingEquipmentAdapter();
+        }
+
+        @Override
+        public Adapter caseAbstractEqFuncSubFunc( AbstractEqFuncSubFunc object ) {
+            return createAbstractEqFuncSubFuncAdapter();
+        }
+
+        @Override
+        public Adapter caseBay( Bay object ) {
+            return createBayAdapter();
+        }
+
+        @Override
+        public Adapter caseConductingEquipment( ConductingEquipment object ) {
+            return createConductingEquipmentAdapter();
+        }
+
+        @Override
+        public Adapter caseConnectivityNode( ConnectivityNode object ) {
+            return createConnectivityNodeAdapter();
+        }
+
+        @Override
+        public Adapter caseEqFunction( EqFunction object ) {
+            return createEqFunctionAdapter();
+        }
+
+        @Override
+        public Adapter caseEqSubFunction( EqSubFunction object ) {
+            return createEqSubFunctionAdapter();
+        }
+
+        @Override
+        public Adapter caseEquipment( Equipment object ) {
+            return createEquipmentAdapter();
+        }
+
+        @Override
+        public Adapter caseEquipmentContainer( EquipmentContainer object ) {
+            return createEquipmentContainerAdapter();
+        }
+
+        @Override
+        public Adapter caseFunction( Function object ) {
+            return createFunctionAdapter();
+        }
+
+        @Override
+        public Adapter caseGeneralEquipment( GeneralEquipment object ) {
+            return createGeneralEquipmentAdapter();
+        }
+
+        @Override
+        public Adapter caseGeneralEquipmentContainer( GeneralEquipmentContainer object ) {
+            return createGeneralEquipmentContainerAdapter();
+        }
+
+        @Override
+        public Adapter caseLNode( LNode object ) {
+            return createLNodeAdapter();
+        }
+
+        @Override
+        public Adapter caseLNodeContainer( LNodeContainer object ) {
+            return createLNodeContainerAdapter();
+        }
+
+        @Override
+        public Adapter caseNeutralPoint( NeutralPoint object ) {
+            return createNeutralPointAdapter();
+        }
+
+        @Override
+        public Adapter casePowerSystemResource( PowerSystemResource object ) {
+            return createPowerSystemResourceAdapter();
+        }
+
+        @Override
+        public Adapter casePowerTransformer( PowerTransformer object ) {
+            return createPowerTransformerAdapter();
+        }
+
+        @Override
+        public Adapter caseSubEquipment( SubEquipment object ) {
+            return createSubEquipmentAdapter();
+        }
+
+        @Override
+        public Adapter caseSubFunction( SubFunction object ) {
+            return createSubFunctionAdapter();
+        }
+
+        @Override
+        public Adapter caseSubstation( Substation object ) {
+            return createSubstationAdapter();
+        }
+
+        @Override
+        public Adapter caseTapChanger( TapChanger object ) {
+            return createTapChangerAdapter();
+        }
+
+        @Override
+        public Adapter caseTerminal( Terminal object ) {
+            return createTerminalAdapter();
+        }
+
+        @Override
+        public Adapter caseTransformerWinding( TransformerWinding object ) {
+            return createTransformerWindingAdapter();
+        }
+
+        @Override
+        public Adapter caseVoltage( Voltage object ) {
+            return createVoltageAdapter();
+        }
+
+        @Override
+        public Adapter caseVoltageLevel( VoltageLevel object ) {
+            return createVoltageLevelAdapter();
+        }
+
+        @Override
+        public Adapter caseAbstractDataObject( AbstractDataObject object ) {
+            return createAbstractDataObjectAdapter();
+        }
+
+        @Override
+        public Adapter caseSclObject( SclObject object ) {
+            return createSclObjectAdapter();
+        }
+
+        @Override
+        public Adapter caseUnNaming( UnNaming object ) {
+            return createUnNamingAdapter();
+        }
+
+        @Override
+        public Adapter caseServiceYesNo( ServiceYesNo object ) {
+            return createServiceYesNoAdapter();
+        }
+
+        @Override
+        public Adapter caseServiceWithOptionalMax( ServiceWithOptionalMax object ) {
+            return createServiceWithOptionalMaxAdapter();
+        }
+
+        @Override
+        public Adapter caseServiceWithMaxNonZero( ServiceWithMaxNonZero object ) {
+            return createServiceWithMaxNonZeroAdapter();
+        }
+
+        @Override
+        public Adapter caseServiceConfReportControl( ServiceConfReportControl object ) {
+            return createServiceConfReportControlAdapter();
+        }
+
+        @Override
+        public Adapter caseServiceWithMaxAndMaxAttributes( ServiceWithMaxAndMaxAttributes object ) {
+            return createServiceWithMaxAndMaxAttributesAdapter();
+        }
+
+        @Override
+        public Adapter caseServiceWithMaxAndModify( ServiceWithMaxAndModify object ) {
+            return createServiceWithMaxAndModifyAdapter();
+        }
+
+        @Override
+        public Adapter caseServiceForConfDataSet( ServiceForConfDataSet object ) {
+            return createServiceForConfDataSetAdapter();
+        }
+
+        @Override
+        public Adapter caseCert( Cert object ) {
+            return createCertAdapter();
+        }
+
+        @Override
+        public Adapter caseValueWithUnit( ValueWithUnit object ) {
+            return createValueWithUnitAdapter();
+        }
+
+        @Override
+        public Adapter caseDurationInSec( DurationInSec object ) {
+            return createDurationInSecAdapter();
+        }
+
+        @Override
+        public Adapter caseDurationInMilliSec( DurationInMilliSec object ) {
+            return createDurationInMilliSecAdapter();
+        }
+
+        @Override
+        public Adapter caseBitRateInMbPerSec( BitRateInMbPerSec object ) {
+            return createBitRateInMbPerSecAdapter();
+        }
+
+        @Override
+        public Adapter caseMinTime( MinTime object ) {
+            return createMinTimeAdapter();
+        }
+
+        @Override
+        public Adapter caseMaxTime( MaxTime object ) {
+            return createMaxTimeAdapter();
+        }
+
+        @Override
+        public Adapter caseBitRate( BitRate object ) {
+            return createBitRateAdapter();
+        }
+
+        @Override
+        public Adapter caseSmpRate( SmpRate object ) {
+            return createSmpRateAdapter();
+        }
+
+        @Override
+        public Adapter caseSamplesPerSec( SamplesPerSec object ) {
+            return createSamplesPerSecAdapter();
+        }
+
+        @Override
+        public Adapter caseSecPerSamples( SecPerSamples object ) {
+            return createSecPerSamplesAdapter();
+        }
+
+        @Override
+        public Adapter caseMcSecurity( McSecurity object ) {
+            return createMcSecurityAdapter();
+        }
+
+        @Override
+        public Adapter caseAgAuthentication( AgAuthentication object ) {
+            return createAgAuthenticationAdapter();
+        }
+
+        @Override
+        public Adapter caseAgSmvOpts( AgSmvOpts object ) {
+            return createAgSmvOptsAdapter();
+        }
+
+        @Override
+        public Adapter caseAgOptFields( AgOptFields object ) {
+            return createAgOptFieldsAdapter();
+        }
+
+        @Override
+        public Adapter caseAgDesc( AgDesc object ) {
+            return createAgDescAdapter();
+        }
+
+        @Override
+        public Adapter caseAgLDRef( AgLDRef object ) {
+            return createAgLDRefAdapter();
+        }
+
+        @Override
+        public Adapter caseAgLNRef( AgLNRef object ) {
+            return createAgLNRefAdapter();
+        }
+
+        @Override
+        public Adapter caseAgDATrgOp( AgDATrgOp object ) {
+            return createAgDATrgOpAdapter();
+        }
+
+        @Override
+        public Adapter caseAgVirtual( AgVirtual object ) {
+            return createAgVirtualAdapter();
+        }
+
+        @Override
+        public Adapter caseIRiseClipseConsole( IRiseClipseConsole object ) {
+            return createIRiseClipseConsoleAdapter();
+        }
+
+        @Override
+        public Adapter defaultCase( EObject object ) {
+            return createEObjectAdapter();
+        }
+    };
 
     /**
      * Creates an adapter for the <code>target</code>.
@@ -779,7 +949,7 @@ public class SclAdapterFactory extends AdapterFactoryImpl {
      */
     @Override
     public Adapter createAdapter( Notifier target ) {
-        return modelSwitch.doSwitch((EObject)target);
+        return modelSwitch.doSwitch( ( EObject ) target );
     }
 
     /**
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclResourceFactoryImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclResourceFactoryImpl.java
index 90f0273..c5df59f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclResourceFactoryImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclResourceFactoryImpl.java
@@ -53,7 +53,7 @@ public class SclResourceFactoryImpl extends ResourceFactoryImpl implements IRise
      */
     @Override
     public SclResourceImpl createResource( URI uri ) {
-        SclResourceImpl result = new SclResourceImpl(uri);
+        SclResourceImpl result = new SclResourceImpl( uri );
         result.getDefaultSaveOptions().put( XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE );
         result.getDefaultLoadOptions().put( XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE );
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclResourceImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclResourceImpl.java
index 88f4fb4..032efde 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclResourceImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclResourceImpl.java
@@ -63,5 +63,5 @@ public class SclResourceImpl extends XMLResourceImpl implements IRiseClipseResou
             scl.buildExplicitLinks( console, false );
         }
     }
-    
+
 } // SclResourceImpl
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclSwitch.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclSwitch.java
index da45ec3..23b4ad1 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclSwitch.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclSwitch.java
@@ -20,8 +20,176 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.util;
 
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractConductingEquipment;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataObject;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractEqFuncSubFunc;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessControl;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Address;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgAuthentication;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgDATrgOp;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgDesc;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgLDRef;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgLNRef;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgOptFields;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgSmvOpts;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgVirtual;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyContentFromOtherNamespace;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Association;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Authentication;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.BDA;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.BaseElement;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.BitRate;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.BitRateInMbPerSec;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Cert;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Certificate;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ClientLN;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ClientServices;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.CommProt;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Communication;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConductingEquipment;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConfDataSet;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConfLNs;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConfLdName;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConfLogControl;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConfReportControl;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConfSG;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConfSigRef;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectedAP;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Control;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlBlock;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlWithIEDName;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlWithTriggerOpt;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.DA;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.DAI;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.DO;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.DOI;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.DOType;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataObjectDirectory;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataSet;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataSetDirectory;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataTypeTemplates;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.DurationInMilliSec;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.DurationInSec;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.DynAssociation;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.DynDataSet;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.EnumType;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.EnumVal;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.EqFunction;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.EqSubFunction;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Equipment;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.EquipmentContainer;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ExtRef;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.FCDA;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.FileHandling;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Function;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.GOOSE;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.GOOSESecurity;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.GSE;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.GSEControl;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.GSEDir;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.GSESettings;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.GSSE;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.GeneralEquipment;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.GeneralEquipmentContainer;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.GetCBValues;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.GetDataObjectDefinition;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.GetDataSetValue;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.GetDirectory;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Header;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.History;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Hitem;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.IDNaming;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.IED;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.IEDName;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Inputs;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.IssuerName;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.KDC;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.LN;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.LN0;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.LNodeContainer;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.LNodeType;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Line;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Log;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.LogControl;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.LogSettings;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.MaxTime;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.McSecurity;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.MinTime;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Naming;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.NeutralPoint;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.OptFields;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.P;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.PAddr;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.P_PhysConn;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.PhysConn;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.PowerSystemResource;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.PowerTransformer;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Private;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ProtNs;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Protocol;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ReadWrite;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.RedProt;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ReportControl;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ReportSettings;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.RptEnabled;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SCL;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SDI;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SDO;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SGEdit;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SMV;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSecurity;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVsc;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SampledValueControl;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SamplesPerSec;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclObject;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SecPerSamples;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Server;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServerAt;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceConfReportControl;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceForConfDataSet;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceSettings;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceWithMax;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceWithMaxAndMaxAttributes;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceWithMaxAndModify;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceWithMaxNonZero;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceWithOptionalMax;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceYesNo;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Services;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SetDataSetValue;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SettingControl;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SettingGroups;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SmpRate;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SmvOpts;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SubEquipment;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SubFunction;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SubNetwork;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Subject;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Substation;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.SupSubscription;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.TapChanger;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Text;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.TimeSyncProt;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.TimerActivatedControl;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.TransformerWinding;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.TrgOps;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.UnNaming;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Val;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ValueHandling;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.ValueWithUnit;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.Voltage;
+import fr.centralesupelec.edf.riseclipse.iec61850.scl.VoltageLevel;
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
-import fr.centralesupelec.edf.riseclipse.iec61850.scl.*;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
@@ -41,7 +209,7 @@ import org.eclipse.emf.ecore.util.Switch;
  * @generated
  */
 @SuppressWarnings( "null" )
-public class SclSwitch<T> extends Switch<T> {
+public class SclSwitch< T > extends Switch< T > {
     /**
      * The cached model package
      * <!-- begin-user-doc -->
@@ -57,7 +225,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @generated
      */
     public SclSwitch() {
-        if (modelPackage == null) {
+        if( modelPackage == null ) {
             modelPackage = SclPackage.eINSTANCE;
         }
     }
@@ -71,7 +239,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @generated
      */
     @Override
-    protected boolean isSwitchFor(EPackage ePackage) {
+    protected boolean isSwitchFor( EPackage ePackage ) {
         return ePackage == modelPackage;
     }
 
@@ -83,1548 +251,1549 @@ public class SclSwitch<T> extends Switch<T> {
      * @generated
      */
     @Override
-    protected T doSwitch(int classifierID, EObject theEObject) {
-        switch (classifierID) {
-            case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE: {
-                AnyContentFromOtherNamespace anyContentFromOtherNamespace = (AnyContentFromOtherNamespace)theEObject;
-                T result = caseAnyContentFromOtherNamespace(anyContentFromOtherNamespace);
-                if (result == null) result = caseSclObject(anyContentFromOtherNamespace);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.BASE_ELEMENT: {
-                BaseElement baseElement = (BaseElement)theEObject;
-                T result = caseBaseElement(baseElement);
-                if (result == null) result = caseSclObject(baseElement);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.HEADER: {
-                Header header = (Header)theEObject;
-                T result = caseHeader(header);
-                if (result == null) result = caseSclObject(header);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.HISTORY: {
-                History history = (History)theEObject;
-                T result = caseHistory(history);
-                if (result == null) result = caseSclObject(history);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.HITEM: {
-                Hitem hitem = (Hitem)theEObject;
-                T result = caseHitem(hitem);
-                if (result == null) result = caseSclObject(hitem);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.ID_NAMING: {
-                IDNaming idNaming = (IDNaming)theEObject;
-                T result = caseIDNaming(idNaming);
-                if (result == null) result = caseBaseElement(idNaming);
-                if (result == null) result = caseAgDesc(idNaming);
-                if (result == null) result = caseSclObject(idNaming);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.LINE: {
-                Line line = (Line)theEObject;
-                T result = caseLine(line);
-                if (result == null) result = caseGeneralEquipmentContainer(line);
-                if (result == null) result = casePowerSystemResource(line);
-                if (result == null) result = caseLNodeContainer(line);
-                if (result == null) result = caseNaming(line);
-                if (result == null) result = caseBaseElement(line);
-                if (result == null) result = caseAgDesc(line);
-                if (result == null) result = caseSclObject(line);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.NAMING: {
-                Naming naming = (Naming)theEObject;
-                T result = caseNaming(naming);
-                if (result == null) result = caseBaseElement(naming);
-                if (result == null) result = caseAgDesc(naming);
-                if (result == null) result = caseSclObject(naming);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.PRIVATE: {
-                Private private_ = (Private)theEObject;
-                T result = casePrivate(private_);
-                if (result == null) result = caseAnyContentFromOtherNamespace(private_);
-                if (result == null) result = caseSclObject(private_);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.PROCESS: {
-                fr.centralesupelec.edf.riseclipse.iec61850.scl.Process process = (fr.centralesupelec.edf.riseclipse.iec61850.scl.Process)theEObject;
-                T result = caseProcess(process);
-                if (result == null) result = caseGeneralEquipmentContainer(process);
-                if (result == null) result = casePowerSystemResource(process);
-                if (result == null) result = caseLNodeContainer(process);
-                if (result == null) result = caseNaming(process);
-                if (result == null) result = caseBaseElement(process);
-                if (result == null) result = caseAgDesc(process);
-                if (result == null) result = caseSclObject(process);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SCL: {
-                SCL scl = (SCL)theEObject;
-                T result = caseSCL(scl);
-                if (result == null) result = caseBaseElement(scl);
-                if (result == null) result = caseSclObject(scl);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.TEXT: {
-                Text text = (Text)theEObject;
-                T result = caseText(text);
-                if (result == null) result = caseSclObject(text);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.ADDRESS: {
-                Address address = (Address)theEObject;
-                T result = caseAddress(address);
-                if (result == null) result = caseSclObject(address);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.COMMUNICATION: {
-                Communication communication = (Communication)theEObject;
-                T result = caseCommunication(communication);
-                if (result == null) result = caseUnNaming(communication);
-                if (result == null) result = caseBaseElement(communication);
-                if (result == null) result = caseAgDesc(communication);
-                if (result == null) result = caseSclObject(communication);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CONNECTED_AP: {
-                ConnectedAP connectedAP = (ConnectedAP)theEObject;
-                T result = caseConnectedAP(connectedAP);
-                if (result == null) result = caseUnNaming(connectedAP);
-                if (result == null) result = caseBaseElement(connectedAP);
-                if (result == null) result = caseAgDesc(connectedAP);
-                if (result == null) result = caseSclObject(connectedAP);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CONTROL_BLOCK: {
-                ControlBlock controlBlock = (ControlBlock)theEObject;
-                T result = caseControlBlock(controlBlock);
-                if (result == null) result = caseUnNaming(controlBlock);
-                if (result == null) result = caseBaseElement(controlBlock);
-                if (result == null) result = caseAgDesc(controlBlock);
-                if (result == null) result = caseSclObject(controlBlock);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.GSE: {
-                GSE gse = (GSE)theEObject;
-                T result = caseGSE(gse);
-                if (result == null) result = caseControlBlock(gse);
-                if (result == null) result = caseUnNaming(gse);
-                if (result == null) result = caseBaseElement(gse);
-                if (result == null) result = caseAgDesc(gse);
-                if (result == null) result = caseSclObject(gse);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.P: {
-                P p = (P)theEObject;
-                T result = caseP(p);
-                if (result == null) result = casePAddr(p);
-                if (result == null) result = caseSclObject(p);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.PADDR: {
-                PAddr pAddr = (PAddr)theEObject;
-                T result = casePAddr(pAddr);
-                if (result == null) result = caseSclObject(pAddr);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.PPHYS_CONN: {
-                P_PhysConn p_PhysConn = (P_PhysConn)theEObject;
-                T result = caseP_PhysConn(p_PhysConn);
-                if (result == null) result = casePAddr(p_PhysConn);
-                if (result == null) result = caseSclObject(p_PhysConn);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.PHYS_CONN: {
-                PhysConn physConn = (PhysConn)theEObject;
-                T result = casePhysConn(physConn);
-                if (result == null) result = caseUnNaming(physConn);
-                if (result == null) result = caseBaseElement(physConn);
-                if (result == null) result = caseAgDesc(physConn);
-                if (result == null) result = caseSclObject(physConn);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SMV: {
-                SMV smv = (SMV)theEObject;
-                T result = caseSMV(smv);
-                if (result == null) result = caseControlBlock(smv);
-                if (result == null) result = caseUnNaming(smv);
-                if (result == null) result = caseBaseElement(smv);
-                if (result == null) result = caseAgDesc(smv);
-                if (result == null) result = caseSclObject(smv);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SUB_NETWORK: {
-                SubNetwork subNetwork = (SubNetwork)theEObject;
-                T result = caseSubNetwork(subNetwork);
-                if (result == null) result = caseNaming(subNetwork);
-                if (result == null) result = caseBaseElement(subNetwork);
-                if (result == null) result = caseAgDesc(subNetwork);
-                if (result == null) result = caseSclObject(subNetwork);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.ABSTRACT_DATA_ATTRIBUTE: {
-                AbstractDataAttribute abstractDataAttribute = (AbstractDataAttribute)theEObject;
-                T result = caseAbstractDataAttribute(abstractDataAttribute);
-                if (result == null) result = caseUnNaming(abstractDataAttribute);
-                if (result == null) result = caseBaseElement(abstractDataAttribute);
-                if (result == null) result = caseAgDesc(abstractDataAttribute);
-                if (result == null) result = caseSclObject(abstractDataAttribute);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.BDA: {
-                BDA bda = (BDA)theEObject;
-                T result = caseBDA(bda);
-                if (result == null) result = caseAbstractDataAttribute(bda);
-                if (result == null) result = caseUnNaming(bda);
-                if (result == null) result = caseBaseElement(bda);
-                if (result == null) result = caseAgDesc(bda);
-                if (result == null) result = caseSclObject(bda);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.DA: {
-                DA da = (DA)theEObject;
-                T result = caseDA(da);
-                if (result == null) result = caseAbstractDataAttribute(da);
-                if (result == null) result = caseAgDATrgOp(da);
-                if (result == null) result = caseUnNaming(da);
-                if (result == null) result = caseBaseElement(da);
-                if (result == null) result = caseAgDesc(da);
-                if (result == null) result = caseSclObject(da);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.DA_TYPE: {
-                DAType daType = (DAType)theEObject;
-                T result = caseDAType(daType);
-                if (result == null) result = caseIDNaming(daType);
-                if (result == null) result = caseBaseElement(daType);
-                if (result == null) result = caseAgDesc(daType);
-                if (result == null) result = caseSclObject(daType);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.DO: {
-                DO do_ = (DO)theEObject;
-                T result = caseDO(do_);
-                if (result == null) result = caseAbstractDataObject(do_);
-                if (result == null) result = caseUnNaming(do_);
-                if (result == null) result = caseBaseElement(do_);
-                if (result == null) result = caseAgDesc(do_);
-                if (result == null) result = caseSclObject(do_);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.DO_TYPE: {
-                DOType doType = (DOType)theEObject;
-                T result = caseDOType(doType);
-                if (result == null) result = caseIDNaming(doType);
-                if (result == null) result = caseBaseElement(doType);
-                if (result == null) result = caseAgDesc(doType);
-                if (result == null) result = caseSclObject(doType);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.DATA_TYPE_TEMPLATES: {
-                DataTypeTemplates dataTypeTemplates = (DataTypeTemplates)theEObject;
-                T result = caseDataTypeTemplates(dataTypeTemplates);
-                if (result == null) result = caseSclObject(dataTypeTemplates);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.ENUM_TYPE: {
-                EnumType enumType = (EnumType)theEObject;
-                T result = caseEnumType(enumType);
-                if (result == null) result = caseIDNaming(enumType);
-                if (result == null) result = caseBaseElement(enumType);
-                if (result == null) result = caseAgDesc(enumType);
-                if (result == null) result = caseSclObject(enumType);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.ENUM_VAL: {
-                EnumVal enumVal = (EnumVal)theEObject;
-                T result = caseEnumVal(enumVal);
-                if (result == null) result = caseSclObject(enumVal);
-                if (result == null) result = caseAgDesc(enumVal);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.LNODE_TYPE: {
-                LNodeType lNodeType = (LNodeType)theEObject;
-                T result = caseLNodeType(lNodeType);
-                if (result == null) result = caseIDNaming(lNodeType);
-                if (result == null) result = caseBaseElement(lNodeType);
-                if (result == null) result = caseAgDesc(lNodeType);
-                if (result == null) result = caseSclObject(lNodeType);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.PROT_NS: {
-                ProtNs protNs = (ProtNs)theEObject;
-                T result = caseProtNs(protNs);
-                if (result == null) result = caseSclObject(protNs);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SDO: {
-                SDO sdo = (SDO)theEObject;
-                T result = caseSDO(sdo);
-                if (result == null) result = caseAbstractDataObject(sdo);
-                if (result == null) result = caseUnNaming(sdo);
-                if (result == null) result = caseBaseElement(sdo);
-                if (result == null) result = caseAgDesc(sdo);
-                if (result == null) result = caseSclObject(sdo);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.VAL: {
-                Val val = (Val)theEObject;
-                T result = caseVal(val);
-                if (result == null) result = caseSclObject(val);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.ACCESS_CONTROL: {
-                AccessControl accessControl = (AccessControl)theEObject;
-                T result = caseAccessControl(accessControl);
-                if (result == null) result = caseSclObject(accessControl);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.ACCESS_POINT: {
-                AccessPoint accessPoint = (AccessPoint)theEObject;
-                T result = caseAccessPoint(accessPoint);
-                if (result == null) result = caseUnNaming(accessPoint);
-                if (result == null) result = caseBaseElement(accessPoint);
-                if (result == null) result = caseAgDesc(accessPoint);
-                if (result == null) result = caseSclObject(accessPoint);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.ANY_LN: {
-                AnyLN anyLN = (AnyLN)theEObject;
-                T result = caseAnyLN(anyLN);
-                if (result == null) result = caseUnNaming(anyLN);
-                if (result == null) result = caseBaseElement(anyLN);
-                if (result == null) result = caseAgDesc(anyLN);
-                if (result == null) result = caseSclObject(anyLN);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.ASSOCIATION: {
-                Association association = (Association)theEObject;
-                T result = caseAssociation(association);
-                if (result == null) result = caseBaseElement(association);
-                if (result == null) result = caseAgLNRef(association);
-                if (result == null) result = caseSclObject(association);
-                if (result == null) result = caseAgLDRef(association);
-                if (result == null) result = caseAgDesc(association);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.AUTHENTICATION: {
-                Authentication authentication = (Authentication)theEObject;
-                T result = caseAuthentication(authentication);
-                if (result == null) result = caseSclObject(authentication);
-                if (result == null) result = caseAgAuthentication(authentication);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CERTIFICATE: {
-                Certificate certificate = (Certificate)theEObject;
-                T result = caseCertificate(certificate);
-                if (result == null) result = caseNaming(certificate);
-                if (result == null) result = caseBaseElement(certificate);
-                if (result == null) result = caseAgDesc(certificate);
-                if (result == null) result = caseSclObject(certificate);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CLIENT_LN: {
-                ClientLN clientLN = (ClientLN)theEObject;
-                T result = caseClientLN(clientLN);
-                if (result == null) result = caseSclObject(clientLN);
-                if (result == null) result = caseAgLNRef(clientLN);
-                if (result == null) result = caseAgLDRef(clientLN);
-                if (result == null) result = caseAgDesc(clientLN);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CLIENT_SERVICES: {
-                ClientServices clientServices = (ClientServices)theEObject;
-                T result = caseClientServices(clientServices);
-                if (result == null) result = caseSclObject(clientServices);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.COMM_PROT: {
-                CommProt commProt = (CommProt)theEObject;
-                T result = caseCommProt(commProt);
-                if (result == null) result = caseSclObject(commProt);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CONF_DATA_SET: {
-                ConfDataSet confDataSet = (ConfDataSet)theEObject;
-                T result = caseConfDataSet(confDataSet);
-                if (result == null) result = caseServiceForConfDataSet(confDataSet);
-                if (result == null) result = caseServiceWithMaxAndMaxAttributes(confDataSet);
-                if (result == null) result = caseServiceWithMax(confDataSet);
-                if (result == null) result = caseSclObject(confDataSet);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CONF_LNS: {
-                ConfLNs confLNs = (ConfLNs)theEObject;
-                T result = caseConfLNs(confLNs);
-                if (result == null) result = caseSclObject(confLNs);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CONF_LD_NAME: {
-                ConfLdName confLdName = (ConfLdName)theEObject;
-                T result = caseConfLdName(confLdName);
-                if (result == null) result = caseServiceYesNo(confLdName);
-                if (result == null) result = caseSclObject(confLdName);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CONF_LOG_CONTROL: {
-                ConfLogControl confLogControl = (ConfLogControl)theEObject;
-                T result = caseConfLogControl(confLogControl);
-                if (result == null) result = caseServiceWithMaxNonZero(confLogControl);
-                if (result == null) result = caseSclObject(confLogControl);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CONF_REPORT_CONTROL: {
-                ConfReportControl confReportControl = (ConfReportControl)theEObject;
-                T result = caseConfReportControl(confReportControl);
-                if (result == null) result = caseServiceConfReportControl(confReportControl);
-                if (result == null) result = caseServiceWithMax(confReportControl);
-                if (result == null) result = caseSclObject(confReportControl);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CONF_SG: {
-                ConfSG confSG = (ConfSG)theEObject;
-                T result = caseConfSG(confSG);
-                if (result == null) result = caseSclObject(confSG);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CONF_SIG_REF: {
-                ConfSigRef confSigRef = (ConfSigRef)theEObject;
-                T result = caseConfSigRef(confSigRef);
-                if (result == null) result = caseServiceWithMaxNonZero(confSigRef);
-                if (result == null) result = caseSclObject(confSigRef);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CONTROL: {
-                Control control = (Control)theEObject;
-                T result = caseControl(control);
-                if (result == null) result = caseUnNaming(control);
-                if (result == null) result = caseBaseElement(control);
-                if (result == null) result = caseAgDesc(control);
-                if (result == null) result = caseSclObject(control);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CONTROL_WITH_IED_NAME: {
-                ControlWithIEDName controlWithIEDName = (ControlWithIEDName)theEObject;
-                T result = caseControlWithIEDName(controlWithIEDName);
-                if (result == null) result = caseControl(controlWithIEDName);
-                if (result == null) result = caseUnNaming(controlWithIEDName);
-                if (result == null) result = caseBaseElement(controlWithIEDName);
-                if (result == null) result = caseAgDesc(controlWithIEDName);
-                if (result == null) result = caseSclObject(controlWithIEDName);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CONTROL_WITH_TRIGGER_OPT: {
-                ControlWithTriggerOpt controlWithTriggerOpt = (ControlWithTriggerOpt)theEObject;
-                T result = caseControlWithTriggerOpt(controlWithTriggerOpt);
-                if (result == null) result = caseControl(controlWithTriggerOpt);
-                if (result == null) result = caseUnNaming(controlWithTriggerOpt);
-                if (result == null) result = caseBaseElement(controlWithTriggerOpt);
-                if (result == null) result = caseAgDesc(controlWithTriggerOpt);
-                if (result == null) result = caseSclObject(controlWithTriggerOpt);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.DAI: {
-                DAI dai = (DAI)theEObject;
-                T result = caseDAI(dai);
-                if (result == null) result = caseUnNaming(dai);
-                if (result == null) result = caseBaseElement(dai);
-                if (result == null) result = caseAgDesc(dai);
-                if (result == null) result = caseSclObject(dai);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.DOI: {
-                DOI doi = (DOI)theEObject;
-                T result = caseDOI(doi);
-                if (result == null) result = caseUnNaming(doi);
-                if (result == null) result = caseBaseElement(doi);
-                if (result == null) result = caseAgDesc(doi);
-                if (result == null) result = caseSclObject(doi);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.DATA_OBJECT_DIRECTORY: {
-                DataObjectDirectory dataObjectDirectory = (DataObjectDirectory)theEObject;
-                T result = caseDataObjectDirectory(dataObjectDirectory);
-                if (result == null) result = caseServiceYesNo(dataObjectDirectory);
-                if (result == null) result = caseSclObject(dataObjectDirectory);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.DATA_SET: {
-                DataSet dataSet = (DataSet)theEObject;
-                T result = caseDataSet(dataSet);
-                if (result == null) result = caseUnNaming(dataSet);
-                if (result == null) result = caseBaseElement(dataSet);
-                if (result == null) result = caseAgDesc(dataSet);
-                if (result == null) result = caseSclObject(dataSet);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.DATA_SET_DIRECTORY: {
-                DataSetDirectory dataSetDirectory = (DataSetDirectory)theEObject;
-                T result = caseDataSetDirectory(dataSetDirectory);
-                if (result == null) result = caseServiceYesNo(dataSetDirectory);
-                if (result == null) result = caseSclObject(dataSetDirectory);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.DYN_ASSOCIATION: {
-                DynAssociation dynAssociation = (DynAssociation)theEObject;
-                T result = caseDynAssociation(dynAssociation);
-                if (result == null) result = caseServiceWithOptionalMax(dynAssociation);
-                if (result == null) result = caseSclObject(dynAssociation);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.DYN_DATA_SET: {
-                DynDataSet dynDataSet = (DynDataSet)theEObject;
-                T result = caseDynDataSet(dynDataSet);
-                if (result == null) result = caseServiceWithMaxAndMaxAttributes(dynDataSet);
-                if (result == null) result = caseServiceWithMax(dynDataSet);
-                if (result == null) result = caseSclObject(dynDataSet);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.EXT_REF: {
-                ExtRef extRef = (ExtRef)theEObject;
-                T result = caseExtRef(extRef);
-                if (result == null) result = caseBaseElement(extRef);
-                if (result == null) result = caseAgDesc(extRef);
-                if (result == null) result = caseSclObject(extRef);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.FCDA: {
-                FCDA fcda = (FCDA)theEObject;
-                T result = caseFCDA(fcda);
-                if (result == null) result = caseSclObject(fcda);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.FILE_HANDLING: {
-                FileHandling fileHandling = (FileHandling)theEObject;
-                T result = caseFileHandling(fileHandling);
-                if (result == null) result = caseSclObject(fileHandling);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.GOOSE: {
-                GOOSE goose = (GOOSE)theEObject;
-                T result = caseGOOSE(goose);
-                if (result == null) result = caseServiceWithMax(goose);
-                if (result == null) result = caseSclObject(goose);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.GOOSE_SECURITY: {
-                GOOSESecurity gooseSecurity = (GOOSESecurity)theEObject;
-                T result = caseGOOSESecurity(gooseSecurity);
-                if (result == null) result = caseCertificate(gooseSecurity);
-                if (result == null) result = caseNaming(gooseSecurity);
-                if (result == null) result = caseBaseElement(gooseSecurity);
-                if (result == null) result = caseAgDesc(gooseSecurity);
-                if (result == null) result = caseSclObject(gooseSecurity);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.GSE_CONTROL: {
-                GSEControl gseControl = (GSEControl)theEObject;
-                T result = caseGSEControl(gseControl);
-                if (result == null) result = caseControlWithIEDName(gseControl);
-                if (result == null) result = caseControl(gseControl);
-                if (result == null) result = caseUnNaming(gseControl);
-                if (result == null) result = caseBaseElement(gseControl);
-                if (result == null) result = caseAgDesc(gseControl);
-                if (result == null) result = caseSclObject(gseControl);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.GSE_DIR: {
-                GSEDir gseDir = (GSEDir)theEObject;
-                T result = caseGSEDir(gseDir);
-                if (result == null) result = caseServiceYesNo(gseDir);
-                if (result == null) result = caseSclObject(gseDir);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.GSE_SETTINGS: {
-                GSESettings gseSettings = (GSESettings)theEObject;
-                T result = caseGSESettings(gseSettings);
-                if (result == null) result = caseServiceSettings(gseSettings);
-                if (result == null) result = caseSclObject(gseSettings);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.GSSE: {
-                GSSE gsse = (GSSE)theEObject;
-                T result = caseGSSE(gsse);
-                if (result == null) result = caseServiceWithMax(gsse);
-                if (result == null) result = caseSclObject(gsse);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.GET_CB_VALUES: {
-                GetCBValues getCBValues = (GetCBValues)theEObject;
-                T result = caseGetCBValues(getCBValues);
-                if (result == null) result = caseServiceYesNo(getCBValues);
-                if (result == null) result = caseSclObject(getCBValues);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.GET_DATA_OBJECT_DEFINITION: {
-                GetDataObjectDefinition getDataObjectDefinition = (GetDataObjectDefinition)theEObject;
-                T result = caseGetDataObjectDefinition(getDataObjectDefinition);
-                if (result == null) result = caseServiceYesNo(getDataObjectDefinition);
-                if (result == null) result = caseSclObject(getDataObjectDefinition);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.GET_DATA_SET_VALUE: {
-                GetDataSetValue getDataSetValue = (GetDataSetValue)theEObject;
-                T result = caseGetDataSetValue(getDataSetValue);
-                if (result == null) result = caseServiceYesNo(getDataSetValue);
-                if (result == null) result = caseSclObject(getDataSetValue);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.GET_DIRECTORY: {
-                GetDirectory getDirectory = (GetDirectory)theEObject;
-                T result = caseGetDirectory(getDirectory);
-                if (result == null) result = caseServiceYesNo(getDirectory);
-                if (result == null) result = caseSclObject(getDirectory);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.IED: {
-                IED ied = (IED)theEObject;
-                T result = caseIED(ied);
-                if (result == null) result = caseUnNaming(ied);
-                if (result == null) result = caseBaseElement(ied);
-                if (result == null) result = caseAgDesc(ied);
-                if (result == null) result = caseSclObject(ied);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.IED_NAME: {
-                IEDName iedName = (IEDName)theEObject;
-                T result = caseIEDName(iedName);
-                if (result == null) result = caseSclObject(iedName);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.INPUTS: {
-                Inputs inputs = (Inputs)theEObject;
-                T result = caseInputs(inputs);
-                if (result == null) result = caseUnNaming(inputs);
-                if (result == null) result = caseBaseElement(inputs);
-                if (result == null) result = caseAgDesc(inputs);
-                if (result == null) result = caseSclObject(inputs);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.ISSUER_NAME: {
-                IssuerName issuerName = (IssuerName)theEObject;
-                T result = caseIssuerName(issuerName);
-                if (result == null) result = caseCert(issuerName);
-                if (result == null) result = caseSclObject(issuerName);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.KDC: {
-                KDC kdc = (KDC)theEObject;
-                T result = caseKDC(kdc);
-                if (result == null) result = caseSclObject(kdc);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.LDEVICE: {
-                LDevice lDevice = (LDevice)theEObject;
-                T result = caseLDevice(lDevice);
-                if (result == null) result = caseUnNaming(lDevice);
-                if (result == null) result = caseBaseElement(lDevice);
-                if (result == null) result = caseAgDesc(lDevice);
-                if (result == null) result = caseSclObject(lDevice);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.LN: {
-                LN ln = (LN)theEObject;
-                T result = caseLN(ln);
-                if (result == null) result = caseAnyLN(ln);
-                if (result == null) result = caseUnNaming(ln);
-                if (result == null) result = caseBaseElement(ln);
-                if (result == null) result = caseAgDesc(ln);
-                if (result == null) result = caseSclObject(ln);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.LN0: {
-                LN0 ln0 = (LN0)theEObject;
-                T result = caseLN0(ln0);
-                if (result == null) result = caseAnyLN(ln0);
-                if (result == null) result = caseUnNaming(ln0);
-                if (result == null) result = caseBaseElement(ln0);
-                if (result == null) result = caseAgDesc(ln0);
-                if (result == null) result = caseSclObject(ln0);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.LOG: {
-                Log log = (Log)theEObject;
-                T result = caseLog(log);
-                if (result == null) result = caseUnNaming(log);
-                if (result == null) result = caseBaseElement(log);
-                if (result == null) result = caseAgDesc(log);
-                if (result == null) result = caseSclObject(log);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.LOG_CONTROL: {
-                LogControl logControl = (LogControl)theEObject;
-                T result = caseLogControl(logControl);
-                if (result == null) result = caseControlWithTriggerOpt(logControl);
-                if (result == null) result = caseControl(logControl);
-                if (result == null) result = caseUnNaming(logControl);
-                if (result == null) result = caseBaseElement(logControl);
-                if (result == null) result = caseAgDesc(logControl);
-                if (result == null) result = caseSclObject(logControl);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.LOG_SETTINGS: {
-                LogSettings logSettings = (LogSettings)theEObject;
-                T result = caseLogSettings(logSettings);
-                if (result == null) result = caseServiceSettings(logSettings);
-                if (result == null) result = caseSclObject(logSettings);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.OPT_FIELDS: {
-                OptFields optFields = (OptFields)theEObject;
-                T result = caseOptFields(optFields);
-                if (result == null) result = caseSclObject(optFields);
-                if (result == null) result = caseAgOptFields(optFields);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.PROTOCOL: {
-                Protocol protocol = (Protocol)theEObject;
-                T result = caseProtocol(protocol);
-                if (result == null) result = caseSclObject(protocol);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.READ_WRITE: {
-                ReadWrite readWrite = (ReadWrite)theEObject;
-                T result = caseReadWrite(readWrite);
-                if (result == null) result = caseServiceYesNo(readWrite);
-                if (result == null) result = caseSclObject(readWrite);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.RED_PROT: {
-                RedProt redProt = (RedProt)theEObject;
-                T result = caseRedProt(redProt);
-                if (result == null) result = caseSclObject(redProt);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.REPORT_CONTROL: {
-                ReportControl reportControl = (ReportControl)theEObject;
-                T result = caseReportControl(reportControl);
-                if (result == null) result = caseControlWithTriggerOpt(reportControl);
-                if (result == null) result = caseControl(reportControl);
-                if (result == null) result = caseUnNaming(reportControl);
-                if (result == null) result = caseBaseElement(reportControl);
-                if (result == null) result = caseAgDesc(reportControl);
-                if (result == null) result = caseSclObject(reportControl);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.REPORT_SETTINGS: {
-                ReportSettings reportSettings = (ReportSettings)theEObject;
-                T result = caseReportSettings(reportSettings);
-                if (result == null) result = caseServiceSettings(reportSettings);
-                if (result == null) result = caseSclObject(reportSettings);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.RPT_ENABLED: {
-                RptEnabled rptEnabled = (RptEnabled)theEObject;
-                T result = caseRptEnabled(rptEnabled);
-                if (result == null) result = caseUnNaming(rptEnabled);
-                if (result == null) result = caseBaseElement(rptEnabled);
-                if (result == null) result = caseAgDesc(rptEnabled);
-                if (result == null) result = caseSclObject(rptEnabled);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SDI: {
-                SDI sdi = (SDI)theEObject;
-                T result = caseSDI(sdi);
-                if (result == null) result = caseUnNaming(sdi);
-                if (result == null) result = caseBaseElement(sdi);
-                if (result == null) result = caseAgDesc(sdi);
-                if (result == null) result = caseSclObject(sdi);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SG_EDIT: {
-                SGEdit sgEdit = (SGEdit)theEObject;
-                T result = caseSGEdit(sgEdit);
-                if (result == null) result = caseSclObject(sgEdit);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SMV_SECURITY: {
-                SMVSecurity smvSecurity = (SMVSecurity)theEObject;
-                T result = caseSMVSecurity(smvSecurity);
-                if (result == null) result = caseCertificate(smvSecurity);
-                if (result == null) result = caseNaming(smvSecurity);
-                if (result == null) result = caseBaseElement(smvSecurity);
-                if (result == null) result = caseAgDesc(smvSecurity);
-                if (result == null) result = caseSclObject(smvSecurity);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SMV_SETTINGS: {
-                SMVSettings smvSettings = (SMVSettings)theEObject;
-                T result = caseSMVSettings(smvSettings);
-                if (result == null) result = caseServiceSettings(smvSettings);
-                if (result == null) result = caseSclObject(smvSettings);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SM_VSC: {
-                SMVsc smVsc = (SMVsc)theEObject;
-                T result = caseSMVsc(smVsc);
-                if (result == null) result = caseServiceWithMax(smVsc);
-                if (result == null) result = caseSclObject(smVsc);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SAMPLED_VALUE_CONTROL: {
-                SampledValueControl sampledValueControl = (SampledValueControl)theEObject;
-                T result = caseSampledValueControl(sampledValueControl);
-                if (result == null) result = caseControlWithIEDName(sampledValueControl);
-                if (result == null) result = caseControl(sampledValueControl);
-                if (result == null) result = caseUnNaming(sampledValueControl);
-                if (result == null) result = caseBaseElement(sampledValueControl);
-                if (result == null) result = caseAgDesc(sampledValueControl);
-                if (result == null) result = caseSclObject(sampledValueControl);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SERVER: {
-                Server server = (Server)theEObject;
-                T result = caseServer(server);
-                if (result == null) result = caseUnNaming(server);
-                if (result == null) result = caseBaseElement(server);
-                if (result == null) result = caseAgDesc(server);
-                if (result == null) result = caseSclObject(server);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SERVER_AT: {
-                ServerAt serverAt = (ServerAt)theEObject;
-                T result = caseServerAt(serverAt);
-                if (result == null) result = caseUnNaming(serverAt);
-                if (result == null) result = caseBaseElement(serverAt);
-                if (result == null) result = caseAgDesc(serverAt);
-                if (result == null) result = caseSclObject(serverAt);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SERVICE_SETTINGS: {
-                ServiceSettings serviceSettings = (ServiceSettings)theEObject;
-                T result = caseServiceSettings(serviceSettings);
-                if (result == null) result = caseSclObject(serviceSettings);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SERVICE_WITH_MAX: {
-                ServiceWithMax serviceWithMax = (ServiceWithMax)theEObject;
-                T result = caseServiceWithMax(serviceWithMax);
-                if (result == null) result = caseSclObject(serviceWithMax);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SERVICES: {
-                Services services = (Services)theEObject;
-                T result = caseServices(services);
-                if (result == null) result = caseSclObject(services);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SET_DATA_SET_VALUE: {
-                SetDataSetValue setDataSetValue = (SetDataSetValue)theEObject;
-                T result = caseSetDataSetValue(setDataSetValue);
-                if (result == null) result = caseServiceYesNo(setDataSetValue);
-                if (result == null) result = caseSclObject(setDataSetValue);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SETTING_CONTROL: {
-                SettingControl settingControl = (SettingControl)theEObject;
-                T result = caseSettingControl(settingControl);
-                if (result == null) result = caseUnNaming(settingControl);
-                if (result == null) result = caseBaseElement(settingControl);
-                if (result == null) result = caseAgDesc(settingControl);
-                if (result == null) result = caseSclObject(settingControl);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SETTING_GROUPS: {
-                SettingGroups settingGroups = (SettingGroups)theEObject;
-                T result = caseSettingGroups(settingGroups);
-                if (result == null) result = caseSclObject(settingGroups);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SMV_OPTS: {
-                SmvOpts smvOpts = (SmvOpts)theEObject;
-                T result = caseSmvOpts(smvOpts);
-                if (result == null) result = caseSclObject(smvOpts);
-                if (result == null) result = caseAgSmvOpts(smvOpts);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SUBJECT: {
-                Subject subject = (Subject)theEObject;
-                T result = caseSubject(subject);
-                if (result == null) result = caseCert(subject);
-                if (result == null) result = caseSclObject(subject);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SUP_SUBSCRIPTION: {
-                SupSubscription supSubscription = (SupSubscription)theEObject;
-                T result = caseSupSubscription(supSubscription);
-                if (result == null) result = caseSclObject(supSubscription);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.TIME_SYNC_PROT: {
-                TimeSyncProt timeSyncProt = (TimeSyncProt)theEObject;
-                T result = caseTimeSyncProt(timeSyncProt);
-                if (result == null) result = caseSclObject(timeSyncProt);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.TIMER_ACTIVATED_CONTROL: {
-                TimerActivatedControl timerActivatedControl = (TimerActivatedControl)theEObject;
-                T result = caseTimerActivatedControl(timerActivatedControl);
-                if (result == null) result = caseServiceYesNo(timerActivatedControl);
-                if (result == null) result = caseSclObject(timerActivatedControl);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.TRG_OPS: {
-                TrgOps trgOps = (TrgOps)theEObject;
-                T result = caseTrgOps(trgOps);
-                if (result == null) result = caseSclObject(trgOps);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.VALUE_HANDLING: {
-                ValueHandling valueHandling = (ValueHandling)theEObject;
-                T result = caseValueHandling(valueHandling);
-                if (result == null) result = caseSclObject(valueHandling);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT: {
-                AbstractConductingEquipment abstractConductingEquipment = (AbstractConductingEquipment)theEObject;
-                T result = caseAbstractConductingEquipment(abstractConductingEquipment);
-                if (result == null) result = caseEquipment(abstractConductingEquipment);
-                if (result == null) result = casePowerSystemResource(abstractConductingEquipment);
-                if (result == null) result = caseAgVirtual(abstractConductingEquipment);
-                if (result == null) result = caseLNodeContainer(abstractConductingEquipment);
-                if (result == null) result = caseNaming(abstractConductingEquipment);
-                if (result == null) result = caseBaseElement(abstractConductingEquipment);
-                if (result == null) result = caseAgDesc(abstractConductingEquipment);
-                if (result == null) result = caseSclObject(abstractConductingEquipment);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC: {
-                AbstractEqFuncSubFunc abstractEqFuncSubFunc = (AbstractEqFuncSubFunc)theEObject;
-                T result = caseAbstractEqFuncSubFunc(abstractEqFuncSubFunc);
-                if (result == null) result = casePowerSystemResource(abstractEqFuncSubFunc);
-                if (result == null) result = caseLNodeContainer(abstractEqFuncSubFunc);
-                if (result == null) result = caseNaming(abstractEqFuncSubFunc);
-                if (result == null) result = caseBaseElement(abstractEqFuncSubFunc);
-                if (result == null) result = caseAgDesc(abstractEqFuncSubFunc);
-                if (result == null) result = caseSclObject(abstractEqFuncSubFunc);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.BAY: {
-                Bay bay = (Bay)theEObject;
-                T result = caseBay(bay);
-                if (result == null) result = caseEquipmentContainer(bay);
-                if (result == null) result = casePowerSystemResource(bay);
-                if (result == null) result = caseLNodeContainer(bay);
-                if (result == null) result = caseNaming(bay);
-                if (result == null) result = caseBaseElement(bay);
-                if (result == null) result = caseAgDesc(bay);
-                if (result == null) result = caseSclObject(bay);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CONDUCTING_EQUIPMENT: {
-                ConductingEquipment conductingEquipment = (ConductingEquipment)theEObject;
-                T result = caseConductingEquipment(conductingEquipment);
-                if (result == null) result = caseAbstractConductingEquipment(conductingEquipment);
-                if (result == null) result = caseEquipment(conductingEquipment);
-                if (result == null) result = casePowerSystemResource(conductingEquipment);
-                if (result == null) result = caseAgVirtual(conductingEquipment);
-                if (result == null) result = caseLNodeContainer(conductingEquipment);
-                if (result == null) result = caseNaming(conductingEquipment);
-                if (result == null) result = caseBaseElement(conductingEquipment);
-                if (result == null) result = caseAgDesc(conductingEquipment);
-                if (result == null) result = caseSclObject(conductingEquipment);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CONNECTIVITY_NODE: {
-                ConnectivityNode connectivityNode = (ConnectivityNode)theEObject;
-                T result = caseConnectivityNode(connectivityNode);
-                if (result == null) result = caseLNodeContainer(connectivityNode);
-                if (result == null) result = caseNaming(connectivityNode);
-                if (result == null) result = caseBaseElement(connectivityNode);
-                if (result == null) result = caseAgDesc(connectivityNode);
-                if (result == null) result = caseSclObject(connectivityNode);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.EQ_FUNCTION: {
-                EqFunction eqFunction = (EqFunction)theEObject;
-                T result = caseEqFunction(eqFunction);
-                if (result == null) result = caseAbstractEqFuncSubFunc(eqFunction);
-                if (result == null) result = casePowerSystemResource(eqFunction);
-                if (result == null) result = caseLNodeContainer(eqFunction);
-                if (result == null) result = caseNaming(eqFunction);
-                if (result == null) result = caseBaseElement(eqFunction);
-                if (result == null) result = caseAgDesc(eqFunction);
-                if (result == null) result = caseSclObject(eqFunction);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.EQ_SUB_FUNCTION: {
-                EqSubFunction eqSubFunction = (EqSubFunction)theEObject;
-                T result = caseEqSubFunction(eqSubFunction);
-                if (result == null) result = caseAbstractEqFuncSubFunc(eqSubFunction);
-                if (result == null) result = casePowerSystemResource(eqSubFunction);
-                if (result == null) result = caseLNodeContainer(eqSubFunction);
-                if (result == null) result = caseNaming(eqSubFunction);
-                if (result == null) result = caseBaseElement(eqSubFunction);
-                if (result == null) result = caseAgDesc(eqSubFunction);
-                if (result == null) result = caseSclObject(eqSubFunction);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.EQUIPMENT: {
-                Equipment equipment = (Equipment)theEObject;
-                T result = caseEquipment(equipment);
-                if (result == null) result = casePowerSystemResource(equipment);
-                if (result == null) result = caseAgVirtual(equipment);
-                if (result == null) result = caseLNodeContainer(equipment);
-                if (result == null) result = caseNaming(equipment);
-                if (result == null) result = caseBaseElement(equipment);
-                if (result == null) result = caseAgDesc(equipment);
-                if (result == null) result = caseSclObject(equipment);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.EQUIPMENT_CONTAINER: {
-                EquipmentContainer equipmentContainer = (EquipmentContainer)theEObject;
-                T result = caseEquipmentContainer(equipmentContainer);
-                if (result == null) result = casePowerSystemResource(equipmentContainer);
-                if (result == null) result = caseLNodeContainer(equipmentContainer);
-                if (result == null) result = caseNaming(equipmentContainer);
-                if (result == null) result = caseBaseElement(equipmentContainer);
-                if (result == null) result = caseAgDesc(equipmentContainer);
-                if (result == null) result = caseSclObject(equipmentContainer);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.FUNCTION: {
-                Function function = (Function)theEObject;
-                T result = caseFunction(function);
-                if (result == null) result = casePowerSystemResource(function);
-                if (result == null) result = caseLNodeContainer(function);
-                if (result == null) result = caseNaming(function);
-                if (result == null) result = caseBaseElement(function);
-                if (result == null) result = caseAgDesc(function);
-                if (result == null) result = caseSclObject(function);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.GENERAL_EQUIPMENT: {
-                GeneralEquipment generalEquipment = (GeneralEquipment)theEObject;
-                T result = caseGeneralEquipment(generalEquipment);
-                if (result == null) result = caseEquipment(generalEquipment);
-                if (result == null) result = casePowerSystemResource(generalEquipment);
-                if (result == null) result = caseAgVirtual(generalEquipment);
-                if (result == null) result = caseLNodeContainer(generalEquipment);
-                if (result == null) result = caseNaming(generalEquipment);
-                if (result == null) result = caseBaseElement(generalEquipment);
-                if (result == null) result = caseAgDesc(generalEquipment);
-                if (result == null) result = caseSclObject(generalEquipment);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.GENERAL_EQUIPMENT_CONTAINER: {
-                GeneralEquipmentContainer generalEquipmentContainer = (GeneralEquipmentContainer)theEObject;
-                T result = caseGeneralEquipmentContainer(generalEquipmentContainer);
-                if (result == null) result = casePowerSystemResource(generalEquipmentContainer);
-                if (result == null) result = caseLNodeContainer(generalEquipmentContainer);
-                if (result == null) result = caseNaming(generalEquipmentContainer);
-                if (result == null) result = caseBaseElement(generalEquipmentContainer);
-                if (result == null) result = caseAgDesc(generalEquipmentContainer);
-                if (result == null) result = caseSclObject(generalEquipmentContainer);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.LNODE: {
-                LNode lNode = (LNode)theEObject;
-                T result = caseLNode(lNode);
-                if (result == null) result = caseUnNaming(lNode);
-                if (result == null) result = caseBaseElement(lNode);
-                if (result == null) result = caseAgDesc(lNode);
-                if (result == null) result = caseSclObject(lNode);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.LNODE_CONTAINER: {
-                LNodeContainer lNodeContainer = (LNodeContainer)theEObject;
-                T result = caseLNodeContainer(lNodeContainer);
-                if (result == null) result = caseNaming(lNodeContainer);
-                if (result == null) result = caseBaseElement(lNodeContainer);
-                if (result == null) result = caseAgDesc(lNodeContainer);
-                if (result == null) result = caseSclObject(lNodeContainer);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.NEUTRAL_POINT: {
-                NeutralPoint neutralPoint = (NeutralPoint)theEObject;
-                T result = caseNeutralPoint(neutralPoint);
-                if (result == null) result = caseTerminal(neutralPoint);
-                if (result == null) result = caseUnNaming(neutralPoint);
-                if (result == null) result = caseBaseElement(neutralPoint);
-                if (result == null) result = caseAgDesc(neutralPoint);
-                if (result == null) result = caseSclObject(neutralPoint);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.POWER_SYSTEM_RESOURCE: {
-                PowerSystemResource powerSystemResource = (PowerSystemResource)theEObject;
-                T result = casePowerSystemResource(powerSystemResource);
-                if (result == null) result = caseLNodeContainer(powerSystemResource);
-                if (result == null) result = caseNaming(powerSystemResource);
-                if (result == null) result = caseBaseElement(powerSystemResource);
-                if (result == null) result = caseAgDesc(powerSystemResource);
-                if (result == null) result = caseSclObject(powerSystemResource);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.POWER_TRANSFORMER: {
-                PowerTransformer powerTransformer = (PowerTransformer)theEObject;
-                T result = casePowerTransformer(powerTransformer);
-                if (result == null) result = caseEquipment(powerTransformer);
-                if (result == null) result = casePowerSystemResource(powerTransformer);
-                if (result == null) result = caseAgVirtual(powerTransformer);
-                if (result == null) result = caseLNodeContainer(powerTransformer);
-                if (result == null) result = caseNaming(powerTransformer);
-                if (result == null) result = caseBaseElement(powerTransformer);
-                if (result == null) result = caseAgDesc(powerTransformer);
-                if (result == null) result = caseSclObject(powerTransformer);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SUB_EQUIPMENT: {
-                SubEquipment subEquipment = (SubEquipment)theEObject;
-                T result = caseSubEquipment(subEquipment);
-                if (result == null) result = casePowerSystemResource(subEquipment);
-                if (result == null) result = caseAgVirtual(subEquipment);
-                if (result == null) result = caseLNodeContainer(subEquipment);
-                if (result == null) result = caseNaming(subEquipment);
-                if (result == null) result = caseBaseElement(subEquipment);
-                if (result == null) result = caseAgDesc(subEquipment);
-                if (result == null) result = caseSclObject(subEquipment);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SUB_FUNCTION: {
-                SubFunction subFunction = (SubFunction)theEObject;
-                T result = caseSubFunction(subFunction);
-                if (result == null) result = casePowerSystemResource(subFunction);
-                if (result == null) result = caseLNodeContainer(subFunction);
-                if (result == null) result = caseNaming(subFunction);
-                if (result == null) result = caseBaseElement(subFunction);
-                if (result == null) result = caseAgDesc(subFunction);
-                if (result == null) result = caseSclObject(subFunction);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SUBSTATION: {
-                Substation substation = (Substation)theEObject;
-                T result = caseSubstation(substation);
-                if (result == null) result = caseEquipmentContainer(substation);
-                if (result == null) result = casePowerSystemResource(substation);
-                if (result == null) result = caseLNodeContainer(substation);
-                if (result == null) result = caseNaming(substation);
-                if (result == null) result = caseBaseElement(substation);
-                if (result == null) result = caseAgDesc(substation);
-                if (result == null) result = caseSclObject(substation);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.TAP_CHANGER: {
-                TapChanger tapChanger = (TapChanger)theEObject;
-                T result = caseTapChanger(tapChanger);
-                if (result == null) result = casePowerSystemResource(tapChanger);
-                if (result == null) result = caseAgVirtual(tapChanger);
-                if (result == null) result = caseLNodeContainer(tapChanger);
-                if (result == null) result = caseNaming(tapChanger);
-                if (result == null) result = caseBaseElement(tapChanger);
-                if (result == null) result = caseAgDesc(tapChanger);
-                if (result == null) result = caseSclObject(tapChanger);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.TERMINAL: {
-                Terminal terminal = (Terminal)theEObject;
-                T result = caseTerminal(terminal);
-                if (result == null) result = caseUnNaming(terminal);
-                if (result == null) result = caseBaseElement(terminal);
-                if (result == null) result = caseAgDesc(terminal);
-                if (result == null) result = caseSclObject(terminal);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.TRANSFORMER_WINDING: {
-                TransformerWinding transformerWinding = (TransformerWinding)theEObject;
-                T result = caseTransformerWinding(transformerWinding);
-                if (result == null) result = caseAbstractConductingEquipment(transformerWinding);
-                if (result == null) result = caseEquipment(transformerWinding);
-                if (result == null) result = casePowerSystemResource(transformerWinding);
-                if (result == null) result = caseAgVirtual(transformerWinding);
-                if (result == null) result = caseLNodeContainer(transformerWinding);
-                if (result == null) result = caseNaming(transformerWinding);
-                if (result == null) result = caseBaseElement(transformerWinding);
-                if (result == null) result = caseAgDesc(transformerWinding);
-                if (result == null) result = caseSclObject(transformerWinding);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.VOLTAGE: {
-                Voltage voltage = (Voltage)theEObject;
-                T result = caseVoltage(voltage);
-                if (result == null) result = caseValueWithUnit(voltage);
-                if (result == null) result = caseSclObject(voltage);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.VOLTAGE_LEVEL: {
-                VoltageLevel voltageLevel = (VoltageLevel)theEObject;
-                T result = caseVoltageLevel(voltageLevel);
-                if (result == null) result = caseEquipmentContainer(voltageLevel);
-                if (result == null) result = casePowerSystemResource(voltageLevel);
-                if (result == null) result = caseLNodeContainer(voltageLevel);
-                if (result == null) result = caseNaming(voltageLevel);
-                if (result == null) result = caseBaseElement(voltageLevel);
-                if (result == null) result = caseAgDesc(voltageLevel);
-                if (result == null) result = caseSclObject(voltageLevel);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.ABSTRACT_DATA_OBJECT: {
-                AbstractDataObject abstractDataObject = (AbstractDataObject)theEObject;
-                T result = caseAbstractDataObject(abstractDataObject);
-                if (result == null) result = caseUnNaming(abstractDataObject);
-                if (result == null) result = caseBaseElement(abstractDataObject);
-                if (result == null) result = caseAgDesc(abstractDataObject);
-                if (result == null) result = caseSclObject(abstractDataObject);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SCL_OBJECT: {
-                SclObject sclObject = (SclObject)theEObject;
-                T result = caseSclObject(sclObject);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.UN_NAMING: {
-                UnNaming unNaming = (UnNaming)theEObject;
-                T result = caseUnNaming(unNaming);
-                if (result == null) result = caseBaseElement(unNaming);
-                if (result == null) result = caseAgDesc(unNaming);
-                if (result == null) result = caseSclObject(unNaming);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SERVICE_YES_NO: {
-                ServiceYesNo serviceYesNo = (ServiceYesNo)theEObject;
-                T result = caseServiceYesNo(serviceYesNo);
-                if (result == null) result = caseSclObject(serviceYesNo);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SERVICE_WITH_OPTIONAL_MAX: {
-                ServiceWithOptionalMax serviceWithOptionalMax = (ServiceWithOptionalMax)theEObject;
-                T result = caseServiceWithOptionalMax(serviceWithOptionalMax);
-                if (result == null) result = caseSclObject(serviceWithOptionalMax);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SERVICE_WITH_MAX_NON_ZERO: {
-                ServiceWithMaxNonZero serviceWithMaxNonZero = (ServiceWithMaxNonZero)theEObject;
-                T result = caseServiceWithMaxNonZero(serviceWithMaxNonZero);
-                if (result == null) result = caseSclObject(serviceWithMaxNonZero);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SERVICE_CONF_REPORT_CONTROL: {
-                ServiceConfReportControl serviceConfReportControl = (ServiceConfReportControl)theEObject;
-                T result = caseServiceConfReportControl(serviceConfReportControl);
-                if (result == null) result = caseServiceWithMax(serviceConfReportControl);
-                if (result == null) result = caseSclObject(serviceConfReportControl);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES: {
-                ServiceWithMaxAndMaxAttributes serviceWithMaxAndMaxAttributes = (ServiceWithMaxAndMaxAttributes)theEObject;
-                T result = caseServiceWithMaxAndMaxAttributes(serviceWithMaxAndMaxAttributes);
-                if (result == null) result = caseServiceWithMax(serviceWithMaxAndMaxAttributes);
-                if (result == null) result = caseSclObject(serviceWithMaxAndMaxAttributes);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SERVICE_WITH_MAX_AND_MODIFY: {
-                ServiceWithMaxAndModify serviceWithMaxAndModify = (ServiceWithMaxAndModify)theEObject;
-                T result = caseServiceWithMaxAndModify(serviceWithMaxAndModify);
-                if (result == null) result = caseServiceWithMax(serviceWithMaxAndModify);
-                if (result == null) result = caseSclObject(serviceWithMaxAndModify);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SERVICE_FOR_CONF_DATA_SET: {
-                ServiceForConfDataSet serviceForConfDataSet = (ServiceForConfDataSet)theEObject;
-                T result = caseServiceForConfDataSet(serviceForConfDataSet);
-                if (result == null) result = caseServiceWithMaxAndMaxAttributes(serviceForConfDataSet);
-                if (result == null) result = caseServiceWithMax(serviceForConfDataSet);
-                if (result == null) result = caseSclObject(serviceForConfDataSet);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.CERT: {
-                Cert cert = (Cert)theEObject;
-                T result = caseCert(cert);
-                if (result == null) result = caseSclObject(cert);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.VALUE_WITH_UNIT: {
-                ValueWithUnit valueWithUnit = (ValueWithUnit)theEObject;
-                T result = caseValueWithUnit(valueWithUnit);
-                if (result == null) result = caseSclObject(valueWithUnit);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.DURATION_IN_SEC: {
-                DurationInSec durationInSec = (DurationInSec)theEObject;
-                T result = caseDurationInSec(durationInSec);
-                if (result == null) result = caseValueWithUnit(durationInSec);
-                if (result == null) result = caseSclObject(durationInSec);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.DURATION_IN_MILLI_SEC: {
-                DurationInMilliSec durationInMilliSec = (DurationInMilliSec)theEObject;
-                T result = caseDurationInMilliSec(durationInMilliSec);
-                if (result == null) result = caseSclObject(durationInMilliSec);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.BIT_RATE_IN_MB_PER_SEC: {
-                BitRateInMbPerSec bitRateInMbPerSec = (BitRateInMbPerSec)theEObject;
-                T result = caseBitRateInMbPerSec(bitRateInMbPerSec);
-                if (result == null) result = caseSclObject(bitRateInMbPerSec);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.MIN_TIME: {
-                MinTime minTime = (MinTime)theEObject;
-                T result = caseMinTime(minTime);
-                if (result == null) result = caseDurationInMilliSec(minTime);
-                if (result == null) result = caseSclObject(minTime);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.MAX_TIME: {
-                MaxTime maxTime = (MaxTime)theEObject;
-                T result = caseMaxTime(maxTime);
-                if (result == null) result = caseDurationInMilliSec(maxTime);
-                if (result == null) result = caseSclObject(maxTime);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.BIT_RATE: {
-                BitRate bitRate = (BitRate)theEObject;
-                T result = caseBitRate(bitRate);
-                if (result == null) result = caseBitRateInMbPerSec(bitRate);
-                if (result == null) result = caseSclObject(bitRate);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SMP_RATE: {
-                SmpRate smpRate = (SmpRate)theEObject;
-                T result = caseSmpRate(smpRate);
-                if (result == null) result = caseSclObject(smpRate);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SAMPLES_PER_SEC: {
-                SamplesPerSec samplesPerSec = (SamplesPerSec)theEObject;
-                T result = caseSamplesPerSec(samplesPerSec);
-                if (result == null) result = caseSclObject(samplesPerSec);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.SEC_PER_SAMPLES: {
-                SecPerSamples secPerSamples = (SecPerSamples)theEObject;
-                T result = caseSecPerSamples(secPerSamples);
-                if (result == null) result = caseSclObject(secPerSamples);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.MC_SECURITY: {
-                McSecurity mcSecurity = (McSecurity)theEObject;
-                T result = caseMcSecurity(mcSecurity);
-                if (result == null) result = caseSclObject(mcSecurity);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.AG_AUTHENTICATION: {
-                AgAuthentication agAuthentication = (AgAuthentication)theEObject;
-                T result = caseAgAuthentication(agAuthentication);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.AG_SMV_OPTS: {
-                AgSmvOpts agSmvOpts = (AgSmvOpts)theEObject;
-                T result = caseAgSmvOpts(agSmvOpts);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.AG_OPT_FIELDS: {
-                AgOptFields agOptFields = (AgOptFields)theEObject;
-                T result = caseAgOptFields(agOptFields);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.AG_DESC: {
-                AgDesc agDesc = (AgDesc)theEObject;
-                T result = caseAgDesc(agDesc);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.AG_LD_REF: {
-                AgLDRef agLDRef = (AgLDRef)theEObject;
-                T result = caseAgLDRef(agLDRef);
-                if (result == null) result = caseAgDesc(agLDRef);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.AG_LN_REF: {
-                AgLNRef agLNRef = (AgLNRef)theEObject;
-                T result = caseAgLNRef(agLNRef);
-                if (result == null) result = caseAgLDRef(agLNRef);
-                if (result == null) result = caseAgDesc(agLNRef);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.AG_DA_TRG_OP: {
-                AgDATrgOp agDATrgOp = (AgDATrgOp)theEObject;
-                T result = caseAgDATrgOp(agDATrgOp);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.AG_VIRTUAL: {
-                AgVirtual agVirtual = (AgVirtual)theEObject;
-                T result = caseAgVirtual(agVirtual);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case SclPackage.IRISE_CLIPSE_CONSOLE: {
-                IRiseClipseConsole iRiseClipseConsole = (IRiseClipseConsole)theEObject;
-                T result = caseIRiseClipseConsole(iRiseClipseConsole);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            default: return defaultCase(theEObject);
+    protected T doSwitch( int classifierID, EObject theEObject ) {
+        switch( classifierID ) {
+        case SclPackage.ANY_CONTENT_FROM_OTHER_NAMESPACE: {
+            AnyContentFromOtherNamespace anyContentFromOtherNamespace = ( AnyContentFromOtherNamespace ) theEObject;
+            T result = caseAnyContentFromOtherNamespace( anyContentFromOtherNamespace );
+            if( result == null ) result = caseSclObject( anyContentFromOtherNamespace );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.BASE_ELEMENT: {
+            BaseElement baseElement = ( BaseElement ) theEObject;
+            T result = caseBaseElement( baseElement );
+            if( result == null ) result = caseSclObject( baseElement );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.HEADER: {
+            Header header = ( Header ) theEObject;
+            T result = caseHeader( header );
+            if( result == null ) result = caseSclObject( header );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.HISTORY: {
+            History history = ( History ) theEObject;
+            T result = caseHistory( history );
+            if( result == null ) result = caseSclObject( history );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.HITEM: {
+            Hitem hitem = ( Hitem ) theEObject;
+            T result = caseHitem( hitem );
+            if( result == null ) result = caseSclObject( hitem );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.ID_NAMING: {
+            IDNaming idNaming = ( IDNaming ) theEObject;
+            T result = caseIDNaming( idNaming );
+            if( result == null ) result = caseBaseElement( idNaming );
+            if( result == null ) result = caseAgDesc( idNaming );
+            if( result == null ) result = caseSclObject( idNaming );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.LINE: {
+            Line line = ( Line ) theEObject;
+            T result = caseLine( line );
+            if( result == null ) result = caseGeneralEquipmentContainer( line );
+            if( result == null ) result = casePowerSystemResource( line );
+            if( result == null ) result = caseLNodeContainer( line );
+            if( result == null ) result = caseNaming( line );
+            if( result == null ) result = caseBaseElement( line );
+            if( result == null ) result = caseAgDesc( line );
+            if( result == null ) result = caseSclObject( line );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.NAMING: {
+            Naming naming = ( Naming ) theEObject;
+            T result = caseNaming( naming );
+            if( result == null ) result = caseBaseElement( naming );
+            if( result == null ) result = caseAgDesc( naming );
+            if( result == null ) result = caseSclObject( naming );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.PRIVATE: {
+            Private private_ = ( Private ) theEObject;
+            T result = casePrivate( private_ );
+            if( result == null ) result = caseAnyContentFromOtherNamespace( private_ );
+            if( result == null ) result = caseSclObject( private_ );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.PROCESS: {
+            fr.centralesupelec.edf.riseclipse.iec61850.scl.Process process = ( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process ) theEObject;
+            T result = caseProcess( process );
+            if( result == null ) result = caseGeneralEquipmentContainer( process );
+            if( result == null ) result = casePowerSystemResource( process );
+            if( result == null ) result = caseLNodeContainer( process );
+            if( result == null ) result = caseNaming( process );
+            if( result == null ) result = caseBaseElement( process );
+            if( result == null ) result = caseAgDesc( process );
+            if( result == null ) result = caseSclObject( process );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SCL: {
+            SCL scl = ( SCL ) theEObject;
+            T result = caseSCL( scl );
+            if( result == null ) result = caseBaseElement( scl );
+            if( result == null ) result = caseSclObject( scl );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.TEXT: {
+            Text text = ( Text ) theEObject;
+            T result = caseText( text );
+            if( result == null ) result = caseSclObject( text );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.ADDRESS: {
+            Address address = ( Address ) theEObject;
+            T result = caseAddress( address );
+            if( result == null ) result = caseSclObject( address );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.COMMUNICATION: {
+            Communication communication = ( Communication ) theEObject;
+            T result = caseCommunication( communication );
+            if( result == null ) result = caseUnNaming( communication );
+            if( result == null ) result = caseBaseElement( communication );
+            if( result == null ) result = caseAgDesc( communication );
+            if( result == null ) result = caseSclObject( communication );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CONNECTED_AP: {
+            ConnectedAP connectedAP = ( ConnectedAP ) theEObject;
+            T result = caseConnectedAP( connectedAP );
+            if( result == null ) result = caseUnNaming( connectedAP );
+            if( result == null ) result = caseBaseElement( connectedAP );
+            if( result == null ) result = caseAgDesc( connectedAP );
+            if( result == null ) result = caseSclObject( connectedAP );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CONTROL_BLOCK: {
+            ControlBlock controlBlock = ( ControlBlock ) theEObject;
+            T result = caseControlBlock( controlBlock );
+            if( result == null ) result = caseUnNaming( controlBlock );
+            if( result == null ) result = caseBaseElement( controlBlock );
+            if( result == null ) result = caseAgDesc( controlBlock );
+            if( result == null ) result = caseSclObject( controlBlock );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.GSE: {
+            GSE gse = ( GSE ) theEObject;
+            T result = caseGSE( gse );
+            if( result == null ) result = caseControlBlock( gse );
+            if( result == null ) result = caseUnNaming( gse );
+            if( result == null ) result = caseBaseElement( gse );
+            if( result == null ) result = caseAgDesc( gse );
+            if( result == null ) result = caseSclObject( gse );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.P: {
+            P p = ( P ) theEObject;
+            T result = caseP( p );
+            if( result == null ) result = casePAddr( p );
+            if( result == null ) result = caseSclObject( p );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.PADDR: {
+            PAddr pAddr = ( PAddr ) theEObject;
+            T result = casePAddr( pAddr );
+            if( result == null ) result = caseSclObject( pAddr );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.PPHYS_CONN: {
+            P_PhysConn p_PhysConn = ( P_PhysConn ) theEObject;
+            T result = caseP_PhysConn( p_PhysConn );
+            if( result == null ) result = casePAddr( p_PhysConn );
+            if( result == null ) result = caseSclObject( p_PhysConn );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.PHYS_CONN: {
+            PhysConn physConn = ( PhysConn ) theEObject;
+            T result = casePhysConn( physConn );
+            if( result == null ) result = caseUnNaming( physConn );
+            if( result == null ) result = caseBaseElement( physConn );
+            if( result == null ) result = caseAgDesc( physConn );
+            if( result == null ) result = caseSclObject( physConn );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SMV: {
+            SMV smv = ( SMV ) theEObject;
+            T result = caseSMV( smv );
+            if( result == null ) result = caseControlBlock( smv );
+            if( result == null ) result = caseUnNaming( smv );
+            if( result == null ) result = caseBaseElement( smv );
+            if( result == null ) result = caseAgDesc( smv );
+            if( result == null ) result = caseSclObject( smv );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SUB_NETWORK: {
+            SubNetwork subNetwork = ( SubNetwork ) theEObject;
+            T result = caseSubNetwork( subNetwork );
+            if( result == null ) result = caseNaming( subNetwork );
+            if( result == null ) result = caseBaseElement( subNetwork );
+            if( result == null ) result = caseAgDesc( subNetwork );
+            if( result == null ) result = caseSclObject( subNetwork );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.ABSTRACT_DATA_ATTRIBUTE: {
+            AbstractDataAttribute abstractDataAttribute = ( AbstractDataAttribute ) theEObject;
+            T result = caseAbstractDataAttribute( abstractDataAttribute );
+            if( result == null ) result = caseUnNaming( abstractDataAttribute );
+            if( result == null ) result = caseBaseElement( abstractDataAttribute );
+            if( result == null ) result = caseAgDesc( abstractDataAttribute );
+            if( result == null ) result = caseSclObject( abstractDataAttribute );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.BDA: {
+            BDA bda = ( BDA ) theEObject;
+            T result = caseBDA( bda );
+            if( result == null ) result = caseAbstractDataAttribute( bda );
+            if( result == null ) result = caseUnNaming( bda );
+            if( result == null ) result = caseBaseElement( bda );
+            if( result == null ) result = caseAgDesc( bda );
+            if( result == null ) result = caseSclObject( bda );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.DA: {
+            DA da = ( DA ) theEObject;
+            T result = caseDA( da );
+            if( result == null ) result = caseAbstractDataAttribute( da );
+            if( result == null ) result = caseAgDATrgOp( da );
+            if( result == null ) result = caseUnNaming( da );
+            if( result == null ) result = caseBaseElement( da );
+            if( result == null ) result = caseAgDesc( da );
+            if( result == null ) result = caseSclObject( da );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.DA_TYPE: {
+            DAType daType = ( DAType ) theEObject;
+            T result = caseDAType( daType );
+            if( result == null ) result = caseIDNaming( daType );
+            if( result == null ) result = caseBaseElement( daType );
+            if( result == null ) result = caseAgDesc( daType );
+            if( result == null ) result = caseSclObject( daType );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.DO: {
+            DO do_ = ( DO ) theEObject;
+            T result = caseDO( do_ );
+            if( result == null ) result = caseAbstractDataObject( do_ );
+            if( result == null ) result = caseUnNaming( do_ );
+            if( result == null ) result = caseBaseElement( do_ );
+            if( result == null ) result = caseAgDesc( do_ );
+            if( result == null ) result = caseSclObject( do_ );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.DO_TYPE: {
+            DOType doType = ( DOType ) theEObject;
+            T result = caseDOType( doType );
+            if( result == null ) result = caseIDNaming( doType );
+            if( result == null ) result = caseBaseElement( doType );
+            if( result == null ) result = caseAgDesc( doType );
+            if( result == null ) result = caseSclObject( doType );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.DATA_TYPE_TEMPLATES: {
+            DataTypeTemplates dataTypeTemplates = ( DataTypeTemplates ) theEObject;
+            T result = caseDataTypeTemplates( dataTypeTemplates );
+            if( result == null ) result = caseSclObject( dataTypeTemplates );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.ENUM_TYPE: {
+            EnumType enumType = ( EnumType ) theEObject;
+            T result = caseEnumType( enumType );
+            if( result == null ) result = caseIDNaming( enumType );
+            if( result == null ) result = caseBaseElement( enumType );
+            if( result == null ) result = caseAgDesc( enumType );
+            if( result == null ) result = caseSclObject( enumType );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.ENUM_VAL: {
+            EnumVal enumVal = ( EnumVal ) theEObject;
+            T result = caseEnumVal( enumVal );
+            if( result == null ) result = caseSclObject( enumVal );
+            if( result == null ) result = caseAgDesc( enumVal );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.LNODE_TYPE: {
+            LNodeType lNodeType = ( LNodeType ) theEObject;
+            T result = caseLNodeType( lNodeType );
+            if( result == null ) result = caseIDNaming( lNodeType );
+            if( result == null ) result = caseBaseElement( lNodeType );
+            if( result == null ) result = caseAgDesc( lNodeType );
+            if( result == null ) result = caseSclObject( lNodeType );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.PROT_NS: {
+            ProtNs protNs = ( ProtNs ) theEObject;
+            T result = caseProtNs( protNs );
+            if( result == null ) result = caseSclObject( protNs );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SDO: {
+            SDO sdo = ( SDO ) theEObject;
+            T result = caseSDO( sdo );
+            if( result == null ) result = caseAbstractDataObject( sdo );
+            if( result == null ) result = caseUnNaming( sdo );
+            if( result == null ) result = caseBaseElement( sdo );
+            if( result == null ) result = caseAgDesc( sdo );
+            if( result == null ) result = caseSclObject( sdo );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.VAL: {
+            Val val = ( Val ) theEObject;
+            T result = caseVal( val );
+            if( result == null ) result = caseSclObject( val );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.ACCESS_CONTROL: {
+            AccessControl accessControl = ( AccessControl ) theEObject;
+            T result = caseAccessControl( accessControl );
+            if( result == null ) result = caseSclObject( accessControl );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.ACCESS_POINT: {
+            AccessPoint accessPoint = ( AccessPoint ) theEObject;
+            T result = caseAccessPoint( accessPoint );
+            if( result == null ) result = caseUnNaming( accessPoint );
+            if( result == null ) result = caseBaseElement( accessPoint );
+            if( result == null ) result = caseAgDesc( accessPoint );
+            if( result == null ) result = caseSclObject( accessPoint );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.ANY_LN: {
+            AnyLN anyLN = ( AnyLN ) theEObject;
+            T result = caseAnyLN( anyLN );
+            if( result == null ) result = caseUnNaming( anyLN );
+            if( result == null ) result = caseBaseElement( anyLN );
+            if( result == null ) result = caseAgDesc( anyLN );
+            if( result == null ) result = caseSclObject( anyLN );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.ASSOCIATION: {
+            Association association = ( Association ) theEObject;
+            T result = caseAssociation( association );
+            if( result == null ) result = caseBaseElement( association );
+            if( result == null ) result = caseAgLNRef( association );
+            if( result == null ) result = caseSclObject( association );
+            if( result == null ) result = caseAgLDRef( association );
+            if( result == null ) result = caseAgDesc( association );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.AUTHENTICATION: {
+            Authentication authentication = ( Authentication ) theEObject;
+            T result = caseAuthentication( authentication );
+            if( result == null ) result = caseSclObject( authentication );
+            if( result == null ) result = caseAgAuthentication( authentication );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CERTIFICATE: {
+            Certificate certificate = ( Certificate ) theEObject;
+            T result = caseCertificate( certificate );
+            if( result == null ) result = caseNaming( certificate );
+            if( result == null ) result = caseBaseElement( certificate );
+            if( result == null ) result = caseAgDesc( certificate );
+            if( result == null ) result = caseSclObject( certificate );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CLIENT_LN: {
+            ClientLN clientLN = ( ClientLN ) theEObject;
+            T result = caseClientLN( clientLN );
+            if( result == null ) result = caseSclObject( clientLN );
+            if( result == null ) result = caseAgLNRef( clientLN );
+            if( result == null ) result = caseAgLDRef( clientLN );
+            if( result == null ) result = caseAgDesc( clientLN );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CLIENT_SERVICES: {
+            ClientServices clientServices = ( ClientServices ) theEObject;
+            T result = caseClientServices( clientServices );
+            if( result == null ) result = caseSclObject( clientServices );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.COMM_PROT: {
+            CommProt commProt = ( CommProt ) theEObject;
+            T result = caseCommProt( commProt );
+            if( result == null ) result = caseSclObject( commProt );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CONF_DATA_SET: {
+            ConfDataSet confDataSet = ( ConfDataSet ) theEObject;
+            T result = caseConfDataSet( confDataSet );
+            if( result == null ) result = caseServiceForConfDataSet( confDataSet );
+            if( result == null ) result = caseServiceWithMaxAndMaxAttributes( confDataSet );
+            if( result == null ) result = caseServiceWithMax( confDataSet );
+            if( result == null ) result = caseSclObject( confDataSet );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CONF_LNS: {
+            ConfLNs confLNs = ( ConfLNs ) theEObject;
+            T result = caseConfLNs( confLNs );
+            if( result == null ) result = caseSclObject( confLNs );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CONF_LD_NAME: {
+            ConfLdName confLdName = ( ConfLdName ) theEObject;
+            T result = caseConfLdName( confLdName );
+            if( result == null ) result = caseServiceYesNo( confLdName );
+            if( result == null ) result = caseSclObject( confLdName );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CONF_LOG_CONTROL: {
+            ConfLogControl confLogControl = ( ConfLogControl ) theEObject;
+            T result = caseConfLogControl( confLogControl );
+            if( result == null ) result = caseServiceWithMaxNonZero( confLogControl );
+            if( result == null ) result = caseSclObject( confLogControl );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CONF_REPORT_CONTROL: {
+            ConfReportControl confReportControl = ( ConfReportControl ) theEObject;
+            T result = caseConfReportControl( confReportControl );
+            if( result == null ) result = caseServiceConfReportControl( confReportControl );
+            if( result == null ) result = caseServiceWithMax( confReportControl );
+            if( result == null ) result = caseSclObject( confReportControl );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CONF_SG: {
+            ConfSG confSG = ( ConfSG ) theEObject;
+            T result = caseConfSG( confSG );
+            if( result == null ) result = caseSclObject( confSG );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CONF_SIG_REF: {
+            ConfSigRef confSigRef = ( ConfSigRef ) theEObject;
+            T result = caseConfSigRef( confSigRef );
+            if( result == null ) result = caseServiceWithMaxNonZero( confSigRef );
+            if( result == null ) result = caseSclObject( confSigRef );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CONTROL: {
+            Control control = ( Control ) theEObject;
+            T result = caseControl( control );
+            if( result == null ) result = caseUnNaming( control );
+            if( result == null ) result = caseBaseElement( control );
+            if( result == null ) result = caseAgDesc( control );
+            if( result == null ) result = caseSclObject( control );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CONTROL_WITH_IED_NAME: {
+            ControlWithIEDName controlWithIEDName = ( ControlWithIEDName ) theEObject;
+            T result = caseControlWithIEDName( controlWithIEDName );
+            if( result == null ) result = caseControl( controlWithIEDName );
+            if( result == null ) result = caseUnNaming( controlWithIEDName );
+            if( result == null ) result = caseBaseElement( controlWithIEDName );
+            if( result == null ) result = caseAgDesc( controlWithIEDName );
+            if( result == null ) result = caseSclObject( controlWithIEDName );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CONTROL_WITH_TRIGGER_OPT: {
+            ControlWithTriggerOpt controlWithTriggerOpt = ( ControlWithTriggerOpt ) theEObject;
+            T result = caseControlWithTriggerOpt( controlWithTriggerOpt );
+            if( result == null ) result = caseControl( controlWithTriggerOpt );
+            if( result == null ) result = caseUnNaming( controlWithTriggerOpt );
+            if( result == null ) result = caseBaseElement( controlWithTriggerOpt );
+            if( result == null ) result = caseAgDesc( controlWithTriggerOpt );
+            if( result == null ) result = caseSclObject( controlWithTriggerOpt );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.DAI: {
+            DAI dai = ( DAI ) theEObject;
+            T result = caseDAI( dai );
+            if( result == null ) result = caseUnNaming( dai );
+            if( result == null ) result = caseBaseElement( dai );
+            if( result == null ) result = caseAgDesc( dai );
+            if( result == null ) result = caseSclObject( dai );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.DOI: {
+            DOI doi = ( DOI ) theEObject;
+            T result = caseDOI( doi );
+            if( result == null ) result = caseUnNaming( doi );
+            if( result == null ) result = caseBaseElement( doi );
+            if( result == null ) result = caseAgDesc( doi );
+            if( result == null ) result = caseSclObject( doi );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.DATA_OBJECT_DIRECTORY: {
+            DataObjectDirectory dataObjectDirectory = ( DataObjectDirectory ) theEObject;
+            T result = caseDataObjectDirectory( dataObjectDirectory );
+            if( result == null ) result = caseServiceYesNo( dataObjectDirectory );
+            if( result == null ) result = caseSclObject( dataObjectDirectory );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.DATA_SET: {
+            DataSet dataSet = ( DataSet ) theEObject;
+            T result = caseDataSet( dataSet );
+            if( result == null ) result = caseUnNaming( dataSet );
+            if( result == null ) result = caseBaseElement( dataSet );
+            if( result == null ) result = caseAgDesc( dataSet );
+            if( result == null ) result = caseSclObject( dataSet );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.DATA_SET_DIRECTORY: {
+            DataSetDirectory dataSetDirectory = ( DataSetDirectory ) theEObject;
+            T result = caseDataSetDirectory( dataSetDirectory );
+            if( result == null ) result = caseServiceYesNo( dataSetDirectory );
+            if( result == null ) result = caseSclObject( dataSetDirectory );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.DYN_ASSOCIATION: {
+            DynAssociation dynAssociation = ( DynAssociation ) theEObject;
+            T result = caseDynAssociation( dynAssociation );
+            if( result == null ) result = caseServiceWithOptionalMax( dynAssociation );
+            if( result == null ) result = caseSclObject( dynAssociation );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.DYN_DATA_SET: {
+            DynDataSet dynDataSet = ( DynDataSet ) theEObject;
+            T result = caseDynDataSet( dynDataSet );
+            if( result == null ) result = caseServiceWithMaxAndMaxAttributes( dynDataSet );
+            if( result == null ) result = caseServiceWithMax( dynDataSet );
+            if( result == null ) result = caseSclObject( dynDataSet );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.EXT_REF: {
+            ExtRef extRef = ( ExtRef ) theEObject;
+            T result = caseExtRef( extRef );
+            if( result == null ) result = caseBaseElement( extRef );
+            if( result == null ) result = caseAgDesc( extRef );
+            if( result == null ) result = caseSclObject( extRef );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.FCDA: {
+            FCDA fcda = ( FCDA ) theEObject;
+            T result = caseFCDA( fcda );
+            if( result == null ) result = caseSclObject( fcda );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.FILE_HANDLING: {
+            FileHandling fileHandling = ( FileHandling ) theEObject;
+            T result = caseFileHandling( fileHandling );
+            if( result == null ) result = caseSclObject( fileHandling );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.GOOSE: {
+            GOOSE goose = ( GOOSE ) theEObject;
+            T result = caseGOOSE( goose );
+            if( result == null ) result = caseServiceWithMax( goose );
+            if( result == null ) result = caseSclObject( goose );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.GOOSE_SECURITY: {
+            GOOSESecurity gooseSecurity = ( GOOSESecurity ) theEObject;
+            T result = caseGOOSESecurity( gooseSecurity );
+            if( result == null ) result = caseCertificate( gooseSecurity );
+            if( result == null ) result = caseNaming( gooseSecurity );
+            if( result == null ) result = caseBaseElement( gooseSecurity );
+            if( result == null ) result = caseAgDesc( gooseSecurity );
+            if( result == null ) result = caseSclObject( gooseSecurity );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.GSE_CONTROL: {
+            GSEControl gseControl = ( GSEControl ) theEObject;
+            T result = caseGSEControl( gseControl );
+            if( result == null ) result = caseControlWithIEDName( gseControl );
+            if( result == null ) result = caseControl( gseControl );
+            if( result == null ) result = caseUnNaming( gseControl );
+            if( result == null ) result = caseBaseElement( gseControl );
+            if( result == null ) result = caseAgDesc( gseControl );
+            if( result == null ) result = caseSclObject( gseControl );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.GSE_DIR: {
+            GSEDir gseDir = ( GSEDir ) theEObject;
+            T result = caseGSEDir( gseDir );
+            if( result == null ) result = caseServiceYesNo( gseDir );
+            if( result == null ) result = caseSclObject( gseDir );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.GSE_SETTINGS: {
+            GSESettings gseSettings = ( GSESettings ) theEObject;
+            T result = caseGSESettings( gseSettings );
+            if( result == null ) result = caseServiceSettings( gseSettings );
+            if( result == null ) result = caseSclObject( gseSettings );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.GSSE: {
+            GSSE gsse = ( GSSE ) theEObject;
+            T result = caseGSSE( gsse );
+            if( result == null ) result = caseServiceWithMax( gsse );
+            if( result == null ) result = caseSclObject( gsse );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.GET_CB_VALUES: {
+            GetCBValues getCBValues = ( GetCBValues ) theEObject;
+            T result = caseGetCBValues( getCBValues );
+            if( result == null ) result = caseServiceYesNo( getCBValues );
+            if( result == null ) result = caseSclObject( getCBValues );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.GET_DATA_OBJECT_DEFINITION: {
+            GetDataObjectDefinition getDataObjectDefinition = ( GetDataObjectDefinition ) theEObject;
+            T result = caseGetDataObjectDefinition( getDataObjectDefinition );
+            if( result == null ) result = caseServiceYesNo( getDataObjectDefinition );
+            if( result == null ) result = caseSclObject( getDataObjectDefinition );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.GET_DATA_SET_VALUE: {
+            GetDataSetValue getDataSetValue = ( GetDataSetValue ) theEObject;
+            T result = caseGetDataSetValue( getDataSetValue );
+            if( result == null ) result = caseServiceYesNo( getDataSetValue );
+            if( result == null ) result = caseSclObject( getDataSetValue );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.GET_DIRECTORY: {
+            GetDirectory getDirectory = ( GetDirectory ) theEObject;
+            T result = caseGetDirectory( getDirectory );
+            if( result == null ) result = caseServiceYesNo( getDirectory );
+            if( result == null ) result = caseSclObject( getDirectory );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.IED: {
+            IED ied = ( IED ) theEObject;
+            T result = caseIED( ied );
+            if( result == null ) result = caseUnNaming( ied );
+            if( result == null ) result = caseBaseElement( ied );
+            if( result == null ) result = caseAgDesc( ied );
+            if( result == null ) result = caseSclObject( ied );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.IED_NAME: {
+            IEDName iedName = ( IEDName ) theEObject;
+            T result = caseIEDName( iedName );
+            if( result == null ) result = caseSclObject( iedName );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.INPUTS: {
+            Inputs inputs = ( Inputs ) theEObject;
+            T result = caseInputs( inputs );
+            if( result == null ) result = caseUnNaming( inputs );
+            if( result == null ) result = caseBaseElement( inputs );
+            if( result == null ) result = caseAgDesc( inputs );
+            if( result == null ) result = caseSclObject( inputs );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.ISSUER_NAME: {
+            IssuerName issuerName = ( IssuerName ) theEObject;
+            T result = caseIssuerName( issuerName );
+            if( result == null ) result = caseCert( issuerName );
+            if( result == null ) result = caseSclObject( issuerName );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.KDC: {
+            KDC kdc = ( KDC ) theEObject;
+            T result = caseKDC( kdc );
+            if( result == null ) result = caseSclObject( kdc );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.LDEVICE: {
+            LDevice lDevice = ( LDevice ) theEObject;
+            T result = caseLDevice( lDevice );
+            if( result == null ) result = caseUnNaming( lDevice );
+            if( result == null ) result = caseBaseElement( lDevice );
+            if( result == null ) result = caseAgDesc( lDevice );
+            if( result == null ) result = caseSclObject( lDevice );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.LN: {
+            LN ln = ( LN ) theEObject;
+            T result = caseLN( ln );
+            if( result == null ) result = caseAnyLN( ln );
+            if( result == null ) result = caseUnNaming( ln );
+            if( result == null ) result = caseBaseElement( ln );
+            if( result == null ) result = caseAgDesc( ln );
+            if( result == null ) result = caseSclObject( ln );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.LN0: {
+            LN0 ln0 = ( LN0 ) theEObject;
+            T result = caseLN0( ln0 );
+            if( result == null ) result = caseAnyLN( ln0 );
+            if( result == null ) result = caseUnNaming( ln0 );
+            if( result == null ) result = caseBaseElement( ln0 );
+            if( result == null ) result = caseAgDesc( ln0 );
+            if( result == null ) result = caseSclObject( ln0 );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.LOG: {
+            Log log = ( Log ) theEObject;
+            T result = caseLog( log );
+            if( result == null ) result = caseUnNaming( log );
+            if( result == null ) result = caseBaseElement( log );
+            if( result == null ) result = caseAgDesc( log );
+            if( result == null ) result = caseSclObject( log );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.LOG_CONTROL: {
+            LogControl logControl = ( LogControl ) theEObject;
+            T result = caseLogControl( logControl );
+            if( result == null ) result = caseControlWithTriggerOpt( logControl );
+            if( result == null ) result = caseControl( logControl );
+            if( result == null ) result = caseUnNaming( logControl );
+            if( result == null ) result = caseBaseElement( logControl );
+            if( result == null ) result = caseAgDesc( logControl );
+            if( result == null ) result = caseSclObject( logControl );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.LOG_SETTINGS: {
+            LogSettings logSettings = ( LogSettings ) theEObject;
+            T result = caseLogSettings( logSettings );
+            if( result == null ) result = caseServiceSettings( logSettings );
+            if( result == null ) result = caseSclObject( logSettings );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.OPT_FIELDS: {
+            OptFields optFields = ( OptFields ) theEObject;
+            T result = caseOptFields( optFields );
+            if( result == null ) result = caseSclObject( optFields );
+            if( result == null ) result = caseAgOptFields( optFields );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.PROTOCOL: {
+            Protocol protocol = ( Protocol ) theEObject;
+            T result = caseProtocol( protocol );
+            if( result == null ) result = caseSclObject( protocol );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.READ_WRITE: {
+            ReadWrite readWrite = ( ReadWrite ) theEObject;
+            T result = caseReadWrite( readWrite );
+            if( result == null ) result = caseServiceYesNo( readWrite );
+            if( result == null ) result = caseSclObject( readWrite );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.RED_PROT: {
+            RedProt redProt = ( RedProt ) theEObject;
+            T result = caseRedProt( redProt );
+            if( result == null ) result = caseSclObject( redProt );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.REPORT_CONTROL: {
+            ReportControl reportControl = ( ReportControl ) theEObject;
+            T result = caseReportControl( reportControl );
+            if( result == null ) result = caseControlWithTriggerOpt( reportControl );
+            if( result == null ) result = caseControl( reportControl );
+            if( result == null ) result = caseUnNaming( reportControl );
+            if( result == null ) result = caseBaseElement( reportControl );
+            if( result == null ) result = caseAgDesc( reportControl );
+            if( result == null ) result = caseSclObject( reportControl );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.REPORT_SETTINGS: {
+            ReportSettings reportSettings = ( ReportSettings ) theEObject;
+            T result = caseReportSettings( reportSettings );
+            if( result == null ) result = caseServiceSettings( reportSettings );
+            if( result == null ) result = caseSclObject( reportSettings );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.RPT_ENABLED: {
+            RptEnabled rptEnabled = ( RptEnabled ) theEObject;
+            T result = caseRptEnabled( rptEnabled );
+            if( result == null ) result = caseUnNaming( rptEnabled );
+            if( result == null ) result = caseBaseElement( rptEnabled );
+            if( result == null ) result = caseAgDesc( rptEnabled );
+            if( result == null ) result = caseSclObject( rptEnabled );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SDI: {
+            SDI sdi = ( SDI ) theEObject;
+            T result = caseSDI( sdi );
+            if( result == null ) result = caseUnNaming( sdi );
+            if( result == null ) result = caseBaseElement( sdi );
+            if( result == null ) result = caseAgDesc( sdi );
+            if( result == null ) result = caseSclObject( sdi );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SG_EDIT: {
+            SGEdit sgEdit = ( SGEdit ) theEObject;
+            T result = caseSGEdit( sgEdit );
+            if( result == null ) result = caseSclObject( sgEdit );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SMV_SECURITY: {
+            SMVSecurity smvSecurity = ( SMVSecurity ) theEObject;
+            T result = caseSMVSecurity( smvSecurity );
+            if( result == null ) result = caseCertificate( smvSecurity );
+            if( result == null ) result = caseNaming( smvSecurity );
+            if( result == null ) result = caseBaseElement( smvSecurity );
+            if( result == null ) result = caseAgDesc( smvSecurity );
+            if( result == null ) result = caseSclObject( smvSecurity );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SMV_SETTINGS: {
+            SMVSettings smvSettings = ( SMVSettings ) theEObject;
+            T result = caseSMVSettings( smvSettings );
+            if( result == null ) result = caseServiceSettings( smvSettings );
+            if( result == null ) result = caseSclObject( smvSettings );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SM_VSC: {
+            SMVsc smVsc = ( SMVsc ) theEObject;
+            T result = caseSMVsc( smVsc );
+            if( result == null ) result = caseServiceWithMax( smVsc );
+            if( result == null ) result = caseSclObject( smVsc );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SAMPLED_VALUE_CONTROL: {
+            SampledValueControl sampledValueControl = ( SampledValueControl ) theEObject;
+            T result = caseSampledValueControl( sampledValueControl );
+            if( result == null ) result = caseControlWithIEDName( sampledValueControl );
+            if( result == null ) result = caseControl( sampledValueControl );
+            if( result == null ) result = caseUnNaming( sampledValueControl );
+            if( result == null ) result = caseBaseElement( sampledValueControl );
+            if( result == null ) result = caseAgDesc( sampledValueControl );
+            if( result == null ) result = caseSclObject( sampledValueControl );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SERVER: {
+            Server server = ( Server ) theEObject;
+            T result = caseServer( server );
+            if( result == null ) result = caseUnNaming( server );
+            if( result == null ) result = caseBaseElement( server );
+            if( result == null ) result = caseAgDesc( server );
+            if( result == null ) result = caseSclObject( server );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SERVER_AT: {
+            ServerAt serverAt = ( ServerAt ) theEObject;
+            T result = caseServerAt( serverAt );
+            if( result == null ) result = caseUnNaming( serverAt );
+            if( result == null ) result = caseBaseElement( serverAt );
+            if( result == null ) result = caseAgDesc( serverAt );
+            if( result == null ) result = caseSclObject( serverAt );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SERVICE_SETTINGS: {
+            ServiceSettings serviceSettings = ( ServiceSettings ) theEObject;
+            T result = caseServiceSettings( serviceSettings );
+            if( result == null ) result = caseSclObject( serviceSettings );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SERVICE_WITH_MAX: {
+            ServiceWithMax serviceWithMax = ( ServiceWithMax ) theEObject;
+            T result = caseServiceWithMax( serviceWithMax );
+            if( result == null ) result = caseSclObject( serviceWithMax );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SERVICES: {
+            Services services = ( Services ) theEObject;
+            T result = caseServices( services );
+            if( result == null ) result = caseSclObject( services );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SET_DATA_SET_VALUE: {
+            SetDataSetValue setDataSetValue = ( SetDataSetValue ) theEObject;
+            T result = caseSetDataSetValue( setDataSetValue );
+            if( result == null ) result = caseServiceYesNo( setDataSetValue );
+            if( result == null ) result = caseSclObject( setDataSetValue );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SETTING_CONTROL: {
+            SettingControl settingControl = ( SettingControl ) theEObject;
+            T result = caseSettingControl( settingControl );
+            if( result == null ) result = caseUnNaming( settingControl );
+            if( result == null ) result = caseBaseElement( settingControl );
+            if( result == null ) result = caseAgDesc( settingControl );
+            if( result == null ) result = caseSclObject( settingControl );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SETTING_GROUPS: {
+            SettingGroups settingGroups = ( SettingGroups ) theEObject;
+            T result = caseSettingGroups( settingGroups );
+            if( result == null ) result = caseSclObject( settingGroups );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SMV_OPTS: {
+            SmvOpts smvOpts = ( SmvOpts ) theEObject;
+            T result = caseSmvOpts( smvOpts );
+            if( result == null ) result = caseSclObject( smvOpts );
+            if( result == null ) result = caseAgSmvOpts( smvOpts );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SUBJECT: {
+            Subject subject = ( Subject ) theEObject;
+            T result = caseSubject( subject );
+            if( result == null ) result = caseCert( subject );
+            if( result == null ) result = caseSclObject( subject );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SUP_SUBSCRIPTION: {
+            SupSubscription supSubscription = ( SupSubscription ) theEObject;
+            T result = caseSupSubscription( supSubscription );
+            if( result == null ) result = caseSclObject( supSubscription );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.TIME_SYNC_PROT: {
+            TimeSyncProt timeSyncProt = ( TimeSyncProt ) theEObject;
+            T result = caseTimeSyncProt( timeSyncProt );
+            if( result == null ) result = caseSclObject( timeSyncProt );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.TIMER_ACTIVATED_CONTROL: {
+            TimerActivatedControl timerActivatedControl = ( TimerActivatedControl ) theEObject;
+            T result = caseTimerActivatedControl( timerActivatedControl );
+            if( result == null ) result = caseServiceYesNo( timerActivatedControl );
+            if( result == null ) result = caseSclObject( timerActivatedControl );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.TRG_OPS: {
+            TrgOps trgOps = ( TrgOps ) theEObject;
+            T result = caseTrgOps( trgOps );
+            if( result == null ) result = caseSclObject( trgOps );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.VALUE_HANDLING: {
+            ValueHandling valueHandling = ( ValueHandling ) theEObject;
+            T result = caseValueHandling( valueHandling );
+            if( result == null ) result = caseSclObject( valueHandling );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.ABSTRACT_CONDUCTING_EQUIPMENT: {
+            AbstractConductingEquipment abstractConductingEquipment = ( AbstractConductingEquipment ) theEObject;
+            T result = caseAbstractConductingEquipment( abstractConductingEquipment );
+            if( result == null ) result = caseEquipment( abstractConductingEquipment );
+            if( result == null ) result = casePowerSystemResource( abstractConductingEquipment );
+            if( result == null ) result = caseAgVirtual( abstractConductingEquipment );
+            if( result == null ) result = caseLNodeContainer( abstractConductingEquipment );
+            if( result == null ) result = caseNaming( abstractConductingEquipment );
+            if( result == null ) result = caseBaseElement( abstractConductingEquipment );
+            if( result == null ) result = caseAgDesc( abstractConductingEquipment );
+            if( result == null ) result = caseSclObject( abstractConductingEquipment );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.ABSTRACT_EQ_FUNC_SUB_FUNC: {
+            AbstractEqFuncSubFunc abstractEqFuncSubFunc = ( AbstractEqFuncSubFunc ) theEObject;
+            T result = caseAbstractEqFuncSubFunc( abstractEqFuncSubFunc );
+            if( result == null ) result = casePowerSystemResource( abstractEqFuncSubFunc );
+            if( result == null ) result = caseLNodeContainer( abstractEqFuncSubFunc );
+            if( result == null ) result = caseNaming( abstractEqFuncSubFunc );
+            if( result == null ) result = caseBaseElement( abstractEqFuncSubFunc );
+            if( result == null ) result = caseAgDesc( abstractEqFuncSubFunc );
+            if( result == null ) result = caseSclObject( abstractEqFuncSubFunc );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.BAY: {
+            Bay bay = ( Bay ) theEObject;
+            T result = caseBay( bay );
+            if( result == null ) result = caseEquipmentContainer( bay );
+            if( result == null ) result = casePowerSystemResource( bay );
+            if( result == null ) result = caseLNodeContainer( bay );
+            if( result == null ) result = caseNaming( bay );
+            if( result == null ) result = caseBaseElement( bay );
+            if( result == null ) result = caseAgDesc( bay );
+            if( result == null ) result = caseSclObject( bay );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CONDUCTING_EQUIPMENT: {
+            ConductingEquipment conductingEquipment = ( ConductingEquipment ) theEObject;
+            T result = caseConductingEquipment( conductingEquipment );
+            if( result == null ) result = caseAbstractConductingEquipment( conductingEquipment );
+            if( result == null ) result = caseEquipment( conductingEquipment );
+            if( result == null ) result = casePowerSystemResource( conductingEquipment );
+            if( result == null ) result = caseAgVirtual( conductingEquipment );
+            if( result == null ) result = caseLNodeContainer( conductingEquipment );
+            if( result == null ) result = caseNaming( conductingEquipment );
+            if( result == null ) result = caseBaseElement( conductingEquipment );
+            if( result == null ) result = caseAgDesc( conductingEquipment );
+            if( result == null ) result = caseSclObject( conductingEquipment );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CONNECTIVITY_NODE: {
+            ConnectivityNode connectivityNode = ( ConnectivityNode ) theEObject;
+            T result = caseConnectivityNode( connectivityNode );
+            if( result == null ) result = caseLNodeContainer( connectivityNode );
+            if( result == null ) result = caseNaming( connectivityNode );
+            if( result == null ) result = caseBaseElement( connectivityNode );
+            if( result == null ) result = caseAgDesc( connectivityNode );
+            if( result == null ) result = caseSclObject( connectivityNode );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.EQ_FUNCTION: {
+            EqFunction eqFunction = ( EqFunction ) theEObject;
+            T result = caseEqFunction( eqFunction );
+            if( result == null ) result = caseAbstractEqFuncSubFunc( eqFunction );
+            if( result == null ) result = casePowerSystemResource( eqFunction );
+            if( result == null ) result = caseLNodeContainer( eqFunction );
+            if( result == null ) result = caseNaming( eqFunction );
+            if( result == null ) result = caseBaseElement( eqFunction );
+            if( result == null ) result = caseAgDesc( eqFunction );
+            if( result == null ) result = caseSclObject( eqFunction );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.EQ_SUB_FUNCTION: {
+            EqSubFunction eqSubFunction = ( EqSubFunction ) theEObject;
+            T result = caseEqSubFunction( eqSubFunction );
+            if( result == null ) result = caseAbstractEqFuncSubFunc( eqSubFunction );
+            if( result == null ) result = casePowerSystemResource( eqSubFunction );
+            if( result == null ) result = caseLNodeContainer( eqSubFunction );
+            if( result == null ) result = caseNaming( eqSubFunction );
+            if( result == null ) result = caseBaseElement( eqSubFunction );
+            if( result == null ) result = caseAgDesc( eqSubFunction );
+            if( result == null ) result = caseSclObject( eqSubFunction );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.EQUIPMENT: {
+            Equipment equipment = ( Equipment ) theEObject;
+            T result = caseEquipment( equipment );
+            if( result == null ) result = casePowerSystemResource( equipment );
+            if( result == null ) result = caseAgVirtual( equipment );
+            if( result == null ) result = caseLNodeContainer( equipment );
+            if( result == null ) result = caseNaming( equipment );
+            if( result == null ) result = caseBaseElement( equipment );
+            if( result == null ) result = caseAgDesc( equipment );
+            if( result == null ) result = caseSclObject( equipment );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.EQUIPMENT_CONTAINER: {
+            EquipmentContainer equipmentContainer = ( EquipmentContainer ) theEObject;
+            T result = caseEquipmentContainer( equipmentContainer );
+            if( result == null ) result = casePowerSystemResource( equipmentContainer );
+            if( result == null ) result = caseLNodeContainer( equipmentContainer );
+            if( result == null ) result = caseNaming( equipmentContainer );
+            if( result == null ) result = caseBaseElement( equipmentContainer );
+            if( result == null ) result = caseAgDesc( equipmentContainer );
+            if( result == null ) result = caseSclObject( equipmentContainer );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.FUNCTION: {
+            Function function = ( Function ) theEObject;
+            T result = caseFunction( function );
+            if( result == null ) result = casePowerSystemResource( function );
+            if( result == null ) result = caseLNodeContainer( function );
+            if( result == null ) result = caseNaming( function );
+            if( result == null ) result = caseBaseElement( function );
+            if( result == null ) result = caseAgDesc( function );
+            if( result == null ) result = caseSclObject( function );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.GENERAL_EQUIPMENT: {
+            GeneralEquipment generalEquipment = ( GeneralEquipment ) theEObject;
+            T result = caseGeneralEquipment( generalEquipment );
+            if( result == null ) result = caseEquipment( generalEquipment );
+            if( result == null ) result = casePowerSystemResource( generalEquipment );
+            if( result == null ) result = caseAgVirtual( generalEquipment );
+            if( result == null ) result = caseLNodeContainer( generalEquipment );
+            if( result == null ) result = caseNaming( generalEquipment );
+            if( result == null ) result = caseBaseElement( generalEquipment );
+            if( result == null ) result = caseAgDesc( generalEquipment );
+            if( result == null ) result = caseSclObject( generalEquipment );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.GENERAL_EQUIPMENT_CONTAINER: {
+            GeneralEquipmentContainer generalEquipmentContainer = ( GeneralEquipmentContainer ) theEObject;
+            T result = caseGeneralEquipmentContainer( generalEquipmentContainer );
+            if( result == null ) result = casePowerSystemResource( generalEquipmentContainer );
+            if( result == null ) result = caseLNodeContainer( generalEquipmentContainer );
+            if( result == null ) result = caseNaming( generalEquipmentContainer );
+            if( result == null ) result = caseBaseElement( generalEquipmentContainer );
+            if( result == null ) result = caseAgDesc( generalEquipmentContainer );
+            if( result == null ) result = caseSclObject( generalEquipmentContainer );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.LNODE: {
+            LNode lNode = ( LNode ) theEObject;
+            T result = caseLNode( lNode );
+            if( result == null ) result = caseUnNaming( lNode );
+            if( result == null ) result = caseBaseElement( lNode );
+            if( result == null ) result = caseAgDesc( lNode );
+            if( result == null ) result = caseSclObject( lNode );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.LNODE_CONTAINER: {
+            LNodeContainer lNodeContainer = ( LNodeContainer ) theEObject;
+            T result = caseLNodeContainer( lNodeContainer );
+            if( result == null ) result = caseNaming( lNodeContainer );
+            if( result == null ) result = caseBaseElement( lNodeContainer );
+            if( result == null ) result = caseAgDesc( lNodeContainer );
+            if( result == null ) result = caseSclObject( lNodeContainer );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.NEUTRAL_POINT: {
+            NeutralPoint neutralPoint = ( NeutralPoint ) theEObject;
+            T result = caseNeutralPoint( neutralPoint );
+            if( result == null ) result = caseTerminal( neutralPoint );
+            if( result == null ) result = caseUnNaming( neutralPoint );
+            if( result == null ) result = caseBaseElement( neutralPoint );
+            if( result == null ) result = caseAgDesc( neutralPoint );
+            if( result == null ) result = caseSclObject( neutralPoint );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.POWER_SYSTEM_RESOURCE: {
+            PowerSystemResource powerSystemResource = ( PowerSystemResource ) theEObject;
+            T result = casePowerSystemResource( powerSystemResource );
+            if( result == null ) result = caseLNodeContainer( powerSystemResource );
+            if( result == null ) result = caseNaming( powerSystemResource );
+            if( result == null ) result = caseBaseElement( powerSystemResource );
+            if( result == null ) result = caseAgDesc( powerSystemResource );
+            if( result == null ) result = caseSclObject( powerSystemResource );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.POWER_TRANSFORMER: {
+            PowerTransformer powerTransformer = ( PowerTransformer ) theEObject;
+            T result = casePowerTransformer( powerTransformer );
+            if( result == null ) result = caseEquipment( powerTransformer );
+            if( result == null ) result = casePowerSystemResource( powerTransformer );
+            if( result == null ) result = caseAgVirtual( powerTransformer );
+            if( result == null ) result = caseLNodeContainer( powerTransformer );
+            if( result == null ) result = caseNaming( powerTransformer );
+            if( result == null ) result = caseBaseElement( powerTransformer );
+            if( result == null ) result = caseAgDesc( powerTransformer );
+            if( result == null ) result = caseSclObject( powerTransformer );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SUB_EQUIPMENT: {
+            SubEquipment subEquipment = ( SubEquipment ) theEObject;
+            T result = caseSubEquipment( subEquipment );
+            if( result == null ) result = casePowerSystemResource( subEquipment );
+            if( result == null ) result = caseAgVirtual( subEquipment );
+            if( result == null ) result = caseLNodeContainer( subEquipment );
+            if( result == null ) result = caseNaming( subEquipment );
+            if( result == null ) result = caseBaseElement( subEquipment );
+            if( result == null ) result = caseAgDesc( subEquipment );
+            if( result == null ) result = caseSclObject( subEquipment );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SUB_FUNCTION: {
+            SubFunction subFunction = ( SubFunction ) theEObject;
+            T result = caseSubFunction( subFunction );
+            if( result == null ) result = casePowerSystemResource( subFunction );
+            if( result == null ) result = caseLNodeContainer( subFunction );
+            if( result == null ) result = caseNaming( subFunction );
+            if( result == null ) result = caseBaseElement( subFunction );
+            if( result == null ) result = caseAgDesc( subFunction );
+            if( result == null ) result = caseSclObject( subFunction );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SUBSTATION: {
+            Substation substation = ( Substation ) theEObject;
+            T result = caseSubstation( substation );
+            if( result == null ) result = caseEquipmentContainer( substation );
+            if( result == null ) result = casePowerSystemResource( substation );
+            if( result == null ) result = caseLNodeContainer( substation );
+            if( result == null ) result = caseNaming( substation );
+            if( result == null ) result = caseBaseElement( substation );
+            if( result == null ) result = caseAgDesc( substation );
+            if( result == null ) result = caseSclObject( substation );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.TAP_CHANGER: {
+            TapChanger tapChanger = ( TapChanger ) theEObject;
+            T result = caseTapChanger( tapChanger );
+            if( result == null ) result = casePowerSystemResource( tapChanger );
+            if( result == null ) result = caseAgVirtual( tapChanger );
+            if( result == null ) result = caseLNodeContainer( tapChanger );
+            if( result == null ) result = caseNaming( tapChanger );
+            if( result == null ) result = caseBaseElement( tapChanger );
+            if( result == null ) result = caseAgDesc( tapChanger );
+            if( result == null ) result = caseSclObject( tapChanger );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.TERMINAL: {
+            Terminal terminal = ( Terminal ) theEObject;
+            T result = caseTerminal( terminal );
+            if( result == null ) result = caseUnNaming( terminal );
+            if( result == null ) result = caseBaseElement( terminal );
+            if( result == null ) result = caseAgDesc( terminal );
+            if( result == null ) result = caseSclObject( terminal );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.TRANSFORMER_WINDING: {
+            TransformerWinding transformerWinding = ( TransformerWinding ) theEObject;
+            T result = caseTransformerWinding( transformerWinding );
+            if( result == null ) result = caseAbstractConductingEquipment( transformerWinding );
+            if( result == null ) result = caseEquipment( transformerWinding );
+            if( result == null ) result = casePowerSystemResource( transformerWinding );
+            if( result == null ) result = caseAgVirtual( transformerWinding );
+            if( result == null ) result = caseLNodeContainer( transformerWinding );
+            if( result == null ) result = caseNaming( transformerWinding );
+            if( result == null ) result = caseBaseElement( transformerWinding );
+            if( result == null ) result = caseAgDesc( transformerWinding );
+            if( result == null ) result = caseSclObject( transformerWinding );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.VOLTAGE: {
+            Voltage voltage = ( Voltage ) theEObject;
+            T result = caseVoltage( voltage );
+            if( result == null ) result = caseValueWithUnit( voltage );
+            if( result == null ) result = caseSclObject( voltage );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.VOLTAGE_LEVEL: {
+            VoltageLevel voltageLevel = ( VoltageLevel ) theEObject;
+            T result = caseVoltageLevel( voltageLevel );
+            if( result == null ) result = caseEquipmentContainer( voltageLevel );
+            if( result == null ) result = casePowerSystemResource( voltageLevel );
+            if( result == null ) result = caseLNodeContainer( voltageLevel );
+            if( result == null ) result = caseNaming( voltageLevel );
+            if( result == null ) result = caseBaseElement( voltageLevel );
+            if( result == null ) result = caseAgDesc( voltageLevel );
+            if( result == null ) result = caseSclObject( voltageLevel );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.ABSTRACT_DATA_OBJECT: {
+            AbstractDataObject abstractDataObject = ( AbstractDataObject ) theEObject;
+            T result = caseAbstractDataObject( abstractDataObject );
+            if( result == null ) result = caseUnNaming( abstractDataObject );
+            if( result == null ) result = caseBaseElement( abstractDataObject );
+            if( result == null ) result = caseAgDesc( abstractDataObject );
+            if( result == null ) result = caseSclObject( abstractDataObject );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SCL_OBJECT: {
+            SclObject sclObject = ( SclObject ) theEObject;
+            T result = caseSclObject( sclObject );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.UN_NAMING: {
+            UnNaming unNaming = ( UnNaming ) theEObject;
+            T result = caseUnNaming( unNaming );
+            if( result == null ) result = caseBaseElement( unNaming );
+            if( result == null ) result = caseAgDesc( unNaming );
+            if( result == null ) result = caseSclObject( unNaming );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SERVICE_YES_NO: {
+            ServiceYesNo serviceYesNo = ( ServiceYesNo ) theEObject;
+            T result = caseServiceYesNo( serviceYesNo );
+            if( result == null ) result = caseSclObject( serviceYesNo );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SERVICE_WITH_OPTIONAL_MAX: {
+            ServiceWithOptionalMax serviceWithOptionalMax = ( ServiceWithOptionalMax ) theEObject;
+            T result = caseServiceWithOptionalMax( serviceWithOptionalMax );
+            if( result == null ) result = caseSclObject( serviceWithOptionalMax );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SERVICE_WITH_MAX_NON_ZERO: {
+            ServiceWithMaxNonZero serviceWithMaxNonZero = ( ServiceWithMaxNonZero ) theEObject;
+            T result = caseServiceWithMaxNonZero( serviceWithMaxNonZero );
+            if( result == null ) result = caseSclObject( serviceWithMaxNonZero );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SERVICE_CONF_REPORT_CONTROL: {
+            ServiceConfReportControl serviceConfReportControl = ( ServiceConfReportControl ) theEObject;
+            T result = caseServiceConfReportControl( serviceConfReportControl );
+            if( result == null ) result = caseServiceWithMax( serviceConfReportControl );
+            if( result == null ) result = caseSclObject( serviceConfReportControl );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES: {
+            ServiceWithMaxAndMaxAttributes serviceWithMaxAndMaxAttributes = ( ServiceWithMaxAndMaxAttributes ) theEObject;
+            T result = caseServiceWithMaxAndMaxAttributes( serviceWithMaxAndMaxAttributes );
+            if( result == null ) result = caseServiceWithMax( serviceWithMaxAndMaxAttributes );
+            if( result == null ) result = caseSclObject( serviceWithMaxAndMaxAttributes );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SERVICE_WITH_MAX_AND_MODIFY: {
+            ServiceWithMaxAndModify serviceWithMaxAndModify = ( ServiceWithMaxAndModify ) theEObject;
+            T result = caseServiceWithMaxAndModify( serviceWithMaxAndModify );
+            if( result == null ) result = caseServiceWithMax( serviceWithMaxAndModify );
+            if( result == null ) result = caseSclObject( serviceWithMaxAndModify );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SERVICE_FOR_CONF_DATA_SET: {
+            ServiceForConfDataSet serviceForConfDataSet = ( ServiceForConfDataSet ) theEObject;
+            T result = caseServiceForConfDataSet( serviceForConfDataSet );
+            if( result == null ) result = caseServiceWithMaxAndMaxAttributes( serviceForConfDataSet );
+            if( result == null ) result = caseServiceWithMax( serviceForConfDataSet );
+            if( result == null ) result = caseSclObject( serviceForConfDataSet );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.CERT: {
+            Cert cert = ( Cert ) theEObject;
+            T result = caseCert( cert );
+            if( result == null ) result = caseSclObject( cert );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.VALUE_WITH_UNIT: {
+            ValueWithUnit valueWithUnit = ( ValueWithUnit ) theEObject;
+            T result = caseValueWithUnit( valueWithUnit );
+            if( result == null ) result = caseSclObject( valueWithUnit );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.DURATION_IN_SEC: {
+            DurationInSec durationInSec = ( DurationInSec ) theEObject;
+            T result = caseDurationInSec( durationInSec );
+            if( result == null ) result = caseValueWithUnit( durationInSec );
+            if( result == null ) result = caseSclObject( durationInSec );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.DURATION_IN_MILLI_SEC: {
+            DurationInMilliSec durationInMilliSec = ( DurationInMilliSec ) theEObject;
+            T result = caseDurationInMilliSec( durationInMilliSec );
+            if( result == null ) result = caseSclObject( durationInMilliSec );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.BIT_RATE_IN_MB_PER_SEC: {
+            BitRateInMbPerSec bitRateInMbPerSec = ( BitRateInMbPerSec ) theEObject;
+            T result = caseBitRateInMbPerSec( bitRateInMbPerSec );
+            if( result == null ) result = caseSclObject( bitRateInMbPerSec );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.MIN_TIME: {
+            MinTime minTime = ( MinTime ) theEObject;
+            T result = caseMinTime( minTime );
+            if( result == null ) result = caseDurationInMilliSec( minTime );
+            if( result == null ) result = caseSclObject( minTime );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.MAX_TIME: {
+            MaxTime maxTime = ( MaxTime ) theEObject;
+            T result = caseMaxTime( maxTime );
+            if( result == null ) result = caseDurationInMilliSec( maxTime );
+            if( result == null ) result = caseSclObject( maxTime );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.BIT_RATE: {
+            BitRate bitRate = ( BitRate ) theEObject;
+            T result = caseBitRate( bitRate );
+            if( result == null ) result = caseBitRateInMbPerSec( bitRate );
+            if( result == null ) result = caseSclObject( bitRate );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SMP_RATE: {
+            SmpRate smpRate = ( SmpRate ) theEObject;
+            T result = caseSmpRate( smpRate );
+            if( result == null ) result = caseSclObject( smpRate );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SAMPLES_PER_SEC: {
+            SamplesPerSec samplesPerSec = ( SamplesPerSec ) theEObject;
+            T result = caseSamplesPerSec( samplesPerSec );
+            if( result == null ) result = caseSclObject( samplesPerSec );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.SEC_PER_SAMPLES: {
+            SecPerSamples secPerSamples = ( SecPerSamples ) theEObject;
+            T result = caseSecPerSamples( secPerSamples );
+            if( result == null ) result = caseSclObject( secPerSamples );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.MC_SECURITY: {
+            McSecurity mcSecurity = ( McSecurity ) theEObject;
+            T result = caseMcSecurity( mcSecurity );
+            if( result == null ) result = caseSclObject( mcSecurity );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.AG_AUTHENTICATION: {
+            AgAuthentication agAuthentication = ( AgAuthentication ) theEObject;
+            T result = caseAgAuthentication( agAuthentication );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.AG_SMV_OPTS: {
+            AgSmvOpts agSmvOpts = ( AgSmvOpts ) theEObject;
+            T result = caseAgSmvOpts( agSmvOpts );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.AG_OPT_FIELDS: {
+            AgOptFields agOptFields = ( AgOptFields ) theEObject;
+            T result = caseAgOptFields( agOptFields );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.AG_DESC: {
+            AgDesc agDesc = ( AgDesc ) theEObject;
+            T result = caseAgDesc( agDesc );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.AG_LD_REF: {
+            AgLDRef agLDRef = ( AgLDRef ) theEObject;
+            T result = caseAgLDRef( agLDRef );
+            if( result == null ) result = caseAgDesc( agLDRef );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.AG_LN_REF: {
+            AgLNRef agLNRef = ( AgLNRef ) theEObject;
+            T result = caseAgLNRef( agLNRef );
+            if( result == null ) result = caseAgLDRef( agLNRef );
+            if( result == null ) result = caseAgDesc( agLNRef );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.AG_DA_TRG_OP: {
+            AgDATrgOp agDATrgOp = ( AgDATrgOp ) theEObject;
+            T result = caseAgDATrgOp( agDATrgOp );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.AG_VIRTUAL: {
+            AgVirtual agVirtual = ( AgVirtual ) theEObject;
+            T result = caseAgVirtual( agVirtual );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        case SclPackage.IRISE_CLIPSE_CONSOLE: {
+            IRiseClipseConsole iRiseClipseConsole = ( IRiseClipseConsole ) theEObject;
+            T result = caseIRiseClipseConsole( iRiseClipseConsole );
+            if( result == null ) result = defaultCase( theEObject );
+            return result;
+        }
+        default:
+            return defaultCase( theEObject );
         }
     }
 
@@ -1639,7 +1808,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAnyContentFromOtherNamespace(AnyContentFromOtherNamespace object) {
+    public T caseAnyContentFromOtherNamespace( AnyContentFromOtherNamespace object ) {
         return null;
     }
 
@@ -1654,7 +1823,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseBaseElement(BaseElement object) {
+    public T caseBaseElement( BaseElement object ) {
         return null;
     }
 
@@ -1669,7 +1838,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseHeader(Header object) {
+    public T caseHeader( Header object ) {
         return null;
     }
 
@@ -1684,7 +1853,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseHistory(History object) {
+    public T caseHistory( History object ) {
         return null;
     }
 
@@ -1699,7 +1868,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseHitem(Hitem object) {
+    public T caseHitem( Hitem object ) {
         return null;
     }
 
@@ -1714,7 +1883,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseIDNaming(IDNaming object) {
+    public T caseIDNaming( IDNaming object ) {
         return null;
     }
 
@@ -1729,7 +1898,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseLine(Line object) {
+    public T caseLine( Line object ) {
         return null;
     }
 
@@ -1744,7 +1913,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseNaming(Naming object) {
+    public T caseNaming( Naming object ) {
         return null;
     }
 
@@ -1759,7 +1928,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T casePrivate(Private object) {
+    public T casePrivate( Private object ) {
         return null;
     }
 
@@ -1774,7 +1943,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseProcess(fr.centralesupelec.edf.riseclipse.iec61850.scl.Process object) {
+    public T caseProcess( fr.centralesupelec.edf.riseclipse.iec61850.scl.Process object ) {
         return null;
     }
 
@@ -1789,7 +1958,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSCL(SCL object) {
+    public T caseSCL( SCL object ) {
         return null;
     }
 
@@ -1804,7 +1973,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseText(Text object) {
+    public T caseText( Text object ) {
         return null;
     }
 
@@ -1819,7 +1988,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAddress(Address object) {
+    public T caseAddress( Address object ) {
         return null;
     }
 
@@ -1834,7 +2003,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseCommunication(Communication object) {
+    public T caseCommunication( Communication object ) {
         return null;
     }
 
@@ -1849,7 +2018,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseConnectedAP(ConnectedAP object) {
+    public T caseConnectedAP( ConnectedAP object ) {
         return null;
     }
 
@@ -1864,7 +2033,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseControlBlock(ControlBlock object) {
+    public T caseControlBlock( ControlBlock object ) {
         return null;
     }
 
@@ -1879,7 +2048,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseGSE(GSE object) {
+    public T caseGSE( GSE object ) {
         return null;
     }
 
@@ -1894,7 +2063,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseP(P object) {
+    public T caseP( P object ) {
         return null;
     }
 
@@ -1909,7 +2078,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T casePAddr(PAddr object) {
+    public T casePAddr( PAddr object ) {
         return null;
     }
 
@@ -1924,7 +2093,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseP_PhysConn(P_PhysConn object) {
+    public T caseP_PhysConn( P_PhysConn object ) {
         return null;
     }
 
@@ -1939,7 +2108,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T casePhysConn(PhysConn object) {
+    public T casePhysConn( PhysConn object ) {
         return null;
     }
 
@@ -1954,7 +2123,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSMV(SMV object) {
+    public T caseSMV( SMV object ) {
         return null;
     }
 
@@ -1969,7 +2138,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSubNetwork(SubNetwork object) {
+    public T caseSubNetwork( SubNetwork object ) {
         return null;
     }
 
@@ -1984,7 +2153,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAbstractDataAttribute(AbstractDataAttribute object) {
+    public T caseAbstractDataAttribute( AbstractDataAttribute object ) {
         return null;
     }
 
@@ -1999,7 +2168,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseBDA(BDA object) {
+    public T caseBDA( BDA object ) {
         return null;
     }
 
@@ -2014,7 +2183,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseDA(DA object) {
+    public T caseDA( DA object ) {
         return null;
     }
 
@@ -2029,7 +2198,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseDAType(DAType object) {
+    public T caseDAType( DAType object ) {
         return null;
     }
 
@@ -2044,7 +2213,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseDO(DO object) {
+    public T caseDO( DO object ) {
         return null;
     }
 
@@ -2059,7 +2228,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseDOType(DOType object) {
+    public T caseDOType( DOType object ) {
         return null;
     }
 
@@ -2074,7 +2243,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseDataTypeTemplates(DataTypeTemplates object) {
+    public T caseDataTypeTemplates( DataTypeTemplates object ) {
         return null;
     }
 
@@ -2089,7 +2258,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseEnumType(EnumType object) {
+    public T caseEnumType( EnumType object ) {
         return null;
     }
 
@@ -2104,7 +2273,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseEnumVal(EnumVal object) {
+    public T caseEnumVal( EnumVal object ) {
         return null;
     }
 
@@ -2119,7 +2288,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseLNodeType(LNodeType object) {
+    public T caseLNodeType( LNodeType object ) {
         return null;
     }
 
@@ -2134,7 +2303,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseProtNs(ProtNs object) {
+    public T caseProtNs( ProtNs object ) {
         return null;
     }
 
@@ -2149,7 +2318,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSDO(SDO object) {
+    public T caseSDO( SDO object ) {
         return null;
     }
 
@@ -2164,7 +2333,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseVal(Val object) {
+    public T caseVal( Val object ) {
         return null;
     }
 
@@ -2179,7 +2348,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAccessControl(AccessControl object) {
+    public T caseAccessControl( AccessControl object ) {
         return null;
     }
 
@@ -2194,7 +2363,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAccessPoint(AccessPoint object) {
+    public T caseAccessPoint( AccessPoint object ) {
         return null;
     }
 
@@ -2209,7 +2378,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAnyLN(AnyLN object) {
+    public T caseAnyLN( AnyLN object ) {
         return null;
     }
 
@@ -2224,7 +2393,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAssociation(Association object) {
+    public T caseAssociation( Association object ) {
         return null;
     }
 
@@ -2239,7 +2408,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAuthentication(Authentication object) {
+    public T caseAuthentication( Authentication object ) {
         return null;
     }
 
@@ -2254,7 +2423,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseCertificate(Certificate object) {
+    public T caseCertificate( Certificate object ) {
         return null;
     }
 
@@ -2269,7 +2438,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseClientLN(ClientLN object) {
+    public T caseClientLN( ClientLN object ) {
         return null;
     }
 
@@ -2284,7 +2453,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseClientServices(ClientServices object) {
+    public T caseClientServices( ClientServices object ) {
         return null;
     }
 
@@ -2299,7 +2468,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseCommProt(CommProt object) {
+    public T caseCommProt( CommProt object ) {
         return null;
     }
 
@@ -2314,7 +2483,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseConfDataSet(ConfDataSet object) {
+    public T caseConfDataSet( ConfDataSet object ) {
         return null;
     }
 
@@ -2329,7 +2498,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseConfLNs(ConfLNs object) {
+    public T caseConfLNs( ConfLNs object ) {
         return null;
     }
 
@@ -2344,7 +2513,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseConfLdName(ConfLdName object) {
+    public T caseConfLdName( ConfLdName object ) {
         return null;
     }
 
@@ -2359,7 +2528,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseConfLogControl(ConfLogControl object) {
+    public T caseConfLogControl( ConfLogControl object ) {
         return null;
     }
 
@@ -2374,7 +2543,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseConfReportControl(ConfReportControl object) {
+    public T caseConfReportControl( ConfReportControl object ) {
         return null;
     }
 
@@ -2389,7 +2558,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseConfSG(ConfSG object) {
+    public T caseConfSG( ConfSG object ) {
         return null;
     }
 
@@ -2404,7 +2573,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseConfSigRef(ConfSigRef object) {
+    public T caseConfSigRef( ConfSigRef object ) {
         return null;
     }
 
@@ -2419,7 +2588,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseControl(Control object) {
+    public T caseControl( Control object ) {
         return null;
     }
 
@@ -2434,7 +2603,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseControlWithIEDName(ControlWithIEDName object) {
+    public T caseControlWithIEDName( ControlWithIEDName object ) {
         return null;
     }
 
@@ -2449,7 +2618,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseControlWithTriggerOpt(ControlWithTriggerOpt object) {
+    public T caseControlWithTriggerOpt( ControlWithTriggerOpt object ) {
         return null;
     }
 
@@ -2464,7 +2633,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseDAI(DAI object) {
+    public T caseDAI( DAI object ) {
         return null;
     }
 
@@ -2479,7 +2648,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseDOI(DOI object) {
+    public T caseDOI( DOI object ) {
         return null;
     }
 
@@ -2494,7 +2663,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseDataObjectDirectory(DataObjectDirectory object) {
+    public T caseDataObjectDirectory( DataObjectDirectory object ) {
         return null;
     }
 
@@ -2509,7 +2678,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseDataSet(DataSet object) {
+    public T caseDataSet( DataSet object ) {
         return null;
     }
 
@@ -2524,7 +2693,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseDataSetDirectory(DataSetDirectory object) {
+    public T caseDataSetDirectory( DataSetDirectory object ) {
         return null;
     }
 
@@ -2539,7 +2708,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseDynAssociation(DynAssociation object) {
+    public T caseDynAssociation( DynAssociation object ) {
         return null;
     }
 
@@ -2554,7 +2723,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseDynDataSet(DynDataSet object) {
+    public T caseDynDataSet( DynDataSet object ) {
         return null;
     }
 
@@ -2569,7 +2738,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseExtRef(ExtRef object) {
+    public T caseExtRef( ExtRef object ) {
         return null;
     }
 
@@ -2584,7 +2753,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseFCDA(FCDA object) {
+    public T caseFCDA( FCDA object ) {
         return null;
     }
 
@@ -2599,7 +2768,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseFileHandling(FileHandling object) {
+    public T caseFileHandling( FileHandling object ) {
         return null;
     }
 
@@ -2614,7 +2783,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseGOOSE(GOOSE object) {
+    public T caseGOOSE( GOOSE object ) {
         return null;
     }
 
@@ -2629,7 +2798,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseGOOSESecurity(GOOSESecurity object) {
+    public T caseGOOSESecurity( GOOSESecurity object ) {
         return null;
     }
 
@@ -2644,7 +2813,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseGSEControl(GSEControl object) {
+    public T caseGSEControl( GSEControl object ) {
         return null;
     }
 
@@ -2659,7 +2828,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseGSEDir(GSEDir object) {
+    public T caseGSEDir( GSEDir object ) {
         return null;
     }
 
@@ -2674,7 +2843,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseGSESettings(GSESettings object) {
+    public T caseGSESettings( GSESettings object ) {
         return null;
     }
 
@@ -2689,7 +2858,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseGSSE(GSSE object) {
+    public T caseGSSE( GSSE object ) {
         return null;
     }
 
@@ -2704,7 +2873,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseGetCBValues(GetCBValues object) {
+    public T caseGetCBValues( GetCBValues object ) {
         return null;
     }
 
@@ -2719,7 +2888,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseGetDataObjectDefinition(GetDataObjectDefinition object) {
+    public T caseGetDataObjectDefinition( GetDataObjectDefinition object ) {
         return null;
     }
 
@@ -2734,7 +2903,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseGetDataSetValue(GetDataSetValue object) {
+    public T caseGetDataSetValue( GetDataSetValue object ) {
         return null;
     }
 
@@ -2749,7 +2918,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseGetDirectory(GetDirectory object) {
+    public T caseGetDirectory( GetDirectory object ) {
         return null;
     }
 
@@ -2764,7 +2933,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseIED(IED object) {
+    public T caseIED( IED object ) {
         return null;
     }
 
@@ -2779,7 +2948,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseIEDName(IEDName object) {
+    public T caseIEDName( IEDName object ) {
         return null;
     }
 
@@ -2794,7 +2963,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseInputs(Inputs object) {
+    public T caseInputs( Inputs object ) {
         return null;
     }
 
@@ -2809,7 +2978,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseIssuerName(IssuerName object) {
+    public T caseIssuerName( IssuerName object ) {
         return null;
     }
 
@@ -2824,7 +2993,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseKDC(KDC object) {
+    public T caseKDC( KDC object ) {
         return null;
     }
 
@@ -2839,7 +3008,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseLDevice(LDevice object) {
+    public T caseLDevice( LDevice object ) {
         return null;
     }
 
@@ -2854,7 +3023,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseLN(LN object) {
+    public T caseLN( LN object ) {
         return null;
     }
 
@@ -2869,7 +3038,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseLN0(LN0 object) {
+    public T caseLN0( LN0 object ) {
         return null;
     }
 
@@ -2884,7 +3053,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseLog(Log object) {
+    public T caseLog( Log object ) {
         return null;
     }
 
@@ -2899,7 +3068,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseLogControl(LogControl object) {
+    public T caseLogControl( LogControl object ) {
         return null;
     }
 
@@ -2914,7 +3083,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseLogSettings(LogSettings object) {
+    public T caseLogSettings( LogSettings object ) {
         return null;
     }
 
@@ -2929,7 +3098,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseOptFields(OptFields object) {
+    public T caseOptFields( OptFields object ) {
         return null;
     }
 
@@ -2944,7 +3113,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseProtocol(Protocol object) {
+    public T caseProtocol( Protocol object ) {
         return null;
     }
 
@@ -2959,7 +3128,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseReadWrite(ReadWrite object) {
+    public T caseReadWrite( ReadWrite object ) {
         return null;
     }
 
@@ -2974,7 +3143,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseRedProt(RedProt object) {
+    public T caseRedProt( RedProt object ) {
         return null;
     }
 
@@ -2989,7 +3158,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseReportControl(ReportControl object) {
+    public T caseReportControl( ReportControl object ) {
         return null;
     }
 
@@ -3004,7 +3173,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseReportSettings(ReportSettings object) {
+    public T caseReportSettings( ReportSettings object ) {
         return null;
     }
 
@@ -3019,7 +3188,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseRptEnabled(RptEnabled object) {
+    public T caseRptEnabled( RptEnabled object ) {
         return null;
     }
 
@@ -3034,7 +3203,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSDI(SDI object) {
+    public T caseSDI( SDI object ) {
         return null;
     }
 
@@ -3049,7 +3218,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSGEdit(SGEdit object) {
+    public T caseSGEdit( SGEdit object ) {
         return null;
     }
 
@@ -3064,7 +3233,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSMVSecurity(SMVSecurity object) {
+    public T caseSMVSecurity( SMVSecurity object ) {
         return null;
     }
 
@@ -3079,7 +3248,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSMVSettings(SMVSettings object) {
+    public T caseSMVSettings( SMVSettings object ) {
         return null;
     }
 
@@ -3094,7 +3263,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSMVsc(SMVsc object) {
+    public T caseSMVsc( SMVsc object ) {
         return null;
     }
 
@@ -3109,7 +3278,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSampledValueControl(SampledValueControl object) {
+    public T caseSampledValueControl( SampledValueControl object ) {
         return null;
     }
 
@@ -3124,7 +3293,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseServer(Server object) {
+    public T caseServer( Server object ) {
         return null;
     }
 
@@ -3139,7 +3308,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseServerAt(ServerAt object) {
+    public T caseServerAt( ServerAt object ) {
         return null;
     }
 
@@ -3154,7 +3323,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseServiceSettings(ServiceSettings object) {
+    public T caseServiceSettings( ServiceSettings object ) {
         return null;
     }
 
@@ -3169,7 +3338,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseServiceWithMax(ServiceWithMax object) {
+    public T caseServiceWithMax( ServiceWithMax object ) {
         return null;
     }
 
@@ -3184,7 +3353,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseServices(Services object) {
+    public T caseServices( Services object ) {
         return null;
     }
 
@@ -3199,7 +3368,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSetDataSetValue(SetDataSetValue object) {
+    public T caseSetDataSetValue( SetDataSetValue object ) {
         return null;
     }
 
@@ -3214,7 +3383,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSettingControl(SettingControl object) {
+    public T caseSettingControl( SettingControl object ) {
         return null;
     }
 
@@ -3229,7 +3398,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSettingGroups(SettingGroups object) {
+    public T caseSettingGroups( SettingGroups object ) {
         return null;
     }
 
@@ -3244,7 +3413,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSmvOpts(SmvOpts object) {
+    public T caseSmvOpts( SmvOpts object ) {
         return null;
     }
 
@@ -3259,7 +3428,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSubject(Subject object) {
+    public T caseSubject( Subject object ) {
         return null;
     }
 
@@ -3274,7 +3443,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSupSubscription(SupSubscription object) {
+    public T caseSupSubscription( SupSubscription object ) {
         return null;
     }
 
@@ -3289,7 +3458,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTimeSyncProt(TimeSyncProt object) {
+    public T caseTimeSyncProt( TimeSyncProt object ) {
         return null;
     }
 
@@ -3304,7 +3473,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTimerActivatedControl(TimerActivatedControl object) {
+    public T caseTimerActivatedControl( TimerActivatedControl object ) {
         return null;
     }
 
@@ -3319,7 +3488,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTrgOps(TrgOps object) {
+    public T caseTrgOps( TrgOps object ) {
         return null;
     }
 
@@ -3334,7 +3503,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseValueHandling(ValueHandling object) {
+    public T caseValueHandling( ValueHandling object ) {
         return null;
     }
 
@@ -3349,7 +3518,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAbstractConductingEquipment(AbstractConductingEquipment object) {
+    public T caseAbstractConductingEquipment( AbstractConductingEquipment object ) {
         return null;
     }
 
@@ -3364,7 +3533,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAbstractEqFuncSubFunc(AbstractEqFuncSubFunc object) {
+    public T caseAbstractEqFuncSubFunc( AbstractEqFuncSubFunc object ) {
         return null;
     }
 
@@ -3379,7 +3548,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseBay(Bay object) {
+    public T caseBay( Bay object ) {
         return null;
     }
 
@@ -3394,7 +3563,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseConductingEquipment(ConductingEquipment object) {
+    public T caseConductingEquipment( ConductingEquipment object ) {
         return null;
     }
 
@@ -3409,7 +3578,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseConnectivityNode(ConnectivityNode object) {
+    public T caseConnectivityNode( ConnectivityNode object ) {
         return null;
     }
 
@@ -3424,7 +3593,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseEqFunction(EqFunction object) {
+    public T caseEqFunction( EqFunction object ) {
         return null;
     }
 
@@ -3439,7 +3608,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseEqSubFunction(EqSubFunction object) {
+    public T caseEqSubFunction( EqSubFunction object ) {
         return null;
     }
 
@@ -3454,7 +3623,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseEquipment(Equipment object) {
+    public T caseEquipment( Equipment object ) {
         return null;
     }
 
@@ -3469,7 +3638,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseEquipmentContainer(EquipmentContainer object) {
+    public T caseEquipmentContainer( EquipmentContainer object ) {
         return null;
     }
 
@@ -3484,7 +3653,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseFunction(Function object) {
+    public T caseFunction( Function object ) {
         return null;
     }
 
@@ -3499,7 +3668,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseGeneralEquipment(GeneralEquipment object) {
+    public T caseGeneralEquipment( GeneralEquipment object ) {
         return null;
     }
 
@@ -3514,7 +3683,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseGeneralEquipmentContainer(GeneralEquipmentContainer object) {
+    public T caseGeneralEquipmentContainer( GeneralEquipmentContainer object ) {
         return null;
     }
 
@@ -3529,7 +3698,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseLNode(LNode object) {
+    public T caseLNode( LNode object ) {
         return null;
     }
 
@@ -3544,7 +3713,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseLNodeContainer(LNodeContainer object) {
+    public T caseLNodeContainer( LNodeContainer object ) {
         return null;
     }
 
@@ -3559,7 +3728,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseNeutralPoint(NeutralPoint object) {
+    public T caseNeutralPoint( NeutralPoint object ) {
         return null;
     }
 
@@ -3574,7 +3743,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T casePowerSystemResource(PowerSystemResource object) {
+    public T casePowerSystemResource( PowerSystemResource object ) {
         return null;
     }
 
@@ -3589,7 +3758,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T casePowerTransformer(PowerTransformer object) {
+    public T casePowerTransformer( PowerTransformer object ) {
         return null;
     }
 
@@ -3604,7 +3773,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSubEquipment(SubEquipment object) {
+    public T caseSubEquipment( SubEquipment object ) {
         return null;
     }
 
@@ -3619,7 +3788,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSubFunction(SubFunction object) {
+    public T caseSubFunction( SubFunction object ) {
         return null;
     }
 
@@ -3634,7 +3803,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSubstation(Substation object) {
+    public T caseSubstation( Substation object ) {
         return null;
     }
 
@@ -3649,7 +3818,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTapChanger(TapChanger object) {
+    public T caseTapChanger( TapChanger object ) {
         return null;
     }
 
@@ -3664,7 +3833,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTerminal(Terminal object) {
+    public T caseTerminal( Terminal object ) {
         return null;
     }
 
@@ -3679,7 +3848,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTransformerWinding(TransformerWinding object) {
+    public T caseTransformerWinding( TransformerWinding object ) {
         return null;
     }
 
@@ -3694,7 +3863,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseVoltage(Voltage object) {
+    public T caseVoltage( Voltage object ) {
         return null;
     }
 
@@ -3709,7 +3878,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseVoltageLevel(VoltageLevel object) {
+    public T caseVoltageLevel( VoltageLevel object ) {
         return null;
     }
 
@@ -3724,7 +3893,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAbstractDataObject(AbstractDataObject object) {
+    public T caseAbstractDataObject( AbstractDataObject object ) {
         return null;
     }
 
@@ -3739,7 +3908,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSclObject(SclObject object) {
+    public T caseSclObject( SclObject object ) {
         return null;
     }
 
@@ -3754,7 +3923,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseUnNaming(UnNaming object) {
+    public T caseUnNaming( UnNaming object ) {
         return null;
     }
 
@@ -3769,7 +3938,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseServiceYesNo(ServiceYesNo object) {
+    public T caseServiceYesNo( ServiceYesNo object ) {
         return null;
     }
 
@@ -3784,7 +3953,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseServiceWithOptionalMax(ServiceWithOptionalMax object) {
+    public T caseServiceWithOptionalMax( ServiceWithOptionalMax object ) {
         return null;
     }
 
@@ -3799,7 +3968,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseServiceWithMaxNonZero(ServiceWithMaxNonZero object) {
+    public T caseServiceWithMaxNonZero( ServiceWithMaxNonZero object ) {
         return null;
     }
 
@@ -3814,7 +3983,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseServiceConfReportControl(ServiceConfReportControl object) {
+    public T caseServiceConfReportControl( ServiceConfReportControl object ) {
         return null;
     }
 
@@ -3829,7 +3998,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseServiceWithMaxAndMaxAttributes(ServiceWithMaxAndMaxAttributes object) {
+    public T caseServiceWithMaxAndMaxAttributes( ServiceWithMaxAndMaxAttributes object ) {
         return null;
     }
 
@@ -3844,7 +4013,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseServiceWithMaxAndModify(ServiceWithMaxAndModify object) {
+    public T caseServiceWithMaxAndModify( ServiceWithMaxAndModify object ) {
         return null;
     }
 
@@ -3859,7 +4028,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseServiceForConfDataSet(ServiceForConfDataSet object) {
+    public T caseServiceForConfDataSet( ServiceForConfDataSet object ) {
         return null;
     }
 
@@ -3874,7 +4043,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseCert(Cert object) {
+    public T caseCert( Cert object ) {
         return null;
     }
 
@@ -3889,7 +4058,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseValueWithUnit(ValueWithUnit object) {
+    public T caseValueWithUnit( ValueWithUnit object ) {
         return null;
     }
 
@@ -3904,7 +4073,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseDurationInSec(DurationInSec object) {
+    public T caseDurationInSec( DurationInSec object ) {
         return null;
     }
 
@@ -3919,7 +4088,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseDurationInMilliSec(DurationInMilliSec object) {
+    public T caseDurationInMilliSec( DurationInMilliSec object ) {
         return null;
     }
 
@@ -3934,7 +4103,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseBitRateInMbPerSec(BitRateInMbPerSec object) {
+    public T caseBitRateInMbPerSec( BitRateInMbPerSec object ) {
         return null;
     }
 
@@ -3949,7 +4118,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseMinTime(MinTime object) {
+    public T caseMinTime( MinTime object ) {
         return null;
     }
 
@@ -3964,7 +4133,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseMaxTime(MaxTime object) {
+    public T caseMaxTime( MaxTime object ) {
         return null;
     }
 
@@ -3979,7 +4148,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseBitRate(BitRate object) {
+    public T caseBitRate( BitRate object ) {
         return null;
     }
 
@@ -3994,7 +4163,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSmpRate(SmpRate object) {
+    public T caseSmpRate( SmpRate object ) {
         return null;
     }
 
@@ -4009,7 +4178,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSamplesPerSec(SamplesPerSec object) {
+    public T caseSamplesPerSec( SamplesPerSec object ) {
         return null;
     }
 
@@ -4024,7 +4193,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseSecPerSamples(SecPerSamples object) {
+    public T caseSecPerSamples( SecPerSamples object ) {
         return null;
     }
 
@@ -4039,7 +4208,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseMcSecurity(McSecurity object) {
+    public T caseMcSecurity( McSecurity object ) {
         return null;
     }
 
@@ -4054,7 +4223,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAgAuthentication(AgAuthentication object) {
+    public T caseAgAuthentication( AgAuthentication object ) {
         return null;
     }
 
@@ -4069,7 +4238,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAgSmvOpts(AgSmvOpts object) {
+    public T caseAgSmvOpts( AgSmvOpts object ) {
         return null;
     }
 
@@ -4084,7 +4253,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAgOptFields(AgOptFields object) {
+    public T caseAgOptFields( AgOptFields object ) {
         return null;
     }
 
@@ -4099,7 +4268,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAgDesc(AgDesc object) {
+    public T caseAgDesc( AgDesc object ) {
         return null;
     }
 
@@ -4114,7 +4283,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAgLDRef(AgLDRef object) {
+    public T caseAgLDRef( AgLDRef object ) {
         return null;
     }
 
@@ -4129,7 +4298,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAgLNRef(AgLNRef object) {
+    public T caseAgLNRef( AgLNRef object ) {
         return null;
     }
 
@@ -4144,7 +4313,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAgDATrgOp(AgDATrgOp object) {
+    public T caseAgDATrgOp( AgDATrgOp object ) {
         return null;
     }
 
@@ -4159,7 +4328,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseAgVirtual(AgVirtual object) {
+    public T caseAgVirtual( AgVirtual object ) {
         return null;
     }
 
@@ -4174,7 +4343,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseIRiseClipseConsole(IRiseClipseConsole object) {
+    public T caseIRiseClipseConsole( IRiseClipseConsole object ) {
         return null;
     }
 
@@ -4190,7 +4359,7 @@ public class SclSwitch<T> extends Switch<T> {
      * @generated
      */
     @Override
-    public T defaultCase(EObject object) {
+    public T defaultCase( EObject object ) {
         return null;
     }
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclXMLProcessor.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclXMLProcessor.java
index 939a303..9c1a04b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclXMLProcessor.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclXMLProcessor.java
@@ -44,7 +44,7 @@ public class SclXMLProcessor extends XMLProcessor {
      * @generated
      */
     public SclXMLProcessor() {
-        super((EPackage.Registry.INSTANCE));
+        super( ( EPackage.Registry.INSTANCE ) );
         SclPackage.eINSTANCE.eClass();
     }
 
@@ -54,11 +54,11 @@ public class SclXMLProcessor extends XMLProcessor {
      * @generated
      */
     @Override
-    protected Map<String, Resource.Factory> getRegistrations() {
-        if (registrations == null) {
+    protected Map< String, Resource.Factory > getRegistrations() {
+        if( registrations == null ) {
             super.getRegistrations();
-            registrations.put(XML_EXTENSION, new SclResourceFactoryImpl());
-            registrations.put(STAR_EXTENSION, new SclResourceFactoryImpl());
+            registrations.put( XML_EXTENSION, new SclResourceFactoryImpl() );
+            registrations.put( STAR_EXTENSION, new SclResourceFactoryImpl() );
         }
         return registrations;
     }
-- 
GitLab